[branding] Windows fixes for new branding