Merge "Fix overlapping importance icons"