This is a continuation of #1464, where we'll adjust the button styles to match the design. 
