Merge "Fix drop target icons being truncated." into sc-dev