Updated fonts placement.

Change-Id: Ic33f5bccbd5ddbdda13c6b72360dc7d1d99b6947