Change button styles

Styles for buttons are changed to match user expectations.

Fixes #2004

See merge request !1580