Ticket #970: Branding UI