Merge "Update colored button styling"