[ros-diffs] [janderwald] 36296: - Fix several bugs in icon changing code