tweaks to header bar for themes
Merge branch 'ui3' into ui3-stable