Rework main toolbar layout, apply correct branding styles