Make the selectionchange dictate whether to update the icon.
This way arrow keys to change the icon will work too!