Fix button styling for style guide conformance

@alex-deaconu please review