Fix right topbar icons
Merge branch 'master' into production