Fixed warnings about conversions.
Added icon to the button. Added some niceties to selecting the button.