Some extended font-size fixes
Merge branch 'feature/fontsize'