Make grey border of image match buttons.
Simplified buttons.