Merge "Make the DND icon look a little less completely broken." into sc-dev