Fix selection of icons and buttons