refactoring of branding

Change-Id: I794d38cd28939e94fdf2179d4c77bac8385459bc