Incorporate PR 639 updates to button styles