fix toolbar spacing for safari
Merge branch 'master' into production