Merge "Clean up button bar styles"