Improve look of buttons.

[Finishes #68076568]