Part 2
Merge pull request #1853 from ussuri/normalize-fonts

Normalize fonts (part 2)