[branding] Branding improvements