Adding select button to the sidebar and reducing the size of the buttons, may introduce issues on some systems. Fixes issue 7815
Merge changes from selenium