19969 - font issue fixes