Code

Added code to deal with changed icon names. Fixes bug #360964