7630: refactor Fonts