Tweaks to button layout and reducing to one color theme, refs #9421