Addendum to prior commit

Fix for icon highlighting