Fix selection in icons and buttons