Update fonts for navbar and brandbar
Prepare better font size
Update font settings and merge with upstream