Merge "Style guide: Visually separate buttons"