Handle mutating symbolic icons
Previously we appended words onto the end of the icon name to handle various conditions, which no longer works properly with icons that must end in -symbolic. Handle this with some fancier logic.
BUG: 487761 FIXED-IN: 6.1