Fix custom fonts

Change-Id: I0fa3d0a556ee99332351fcfc73ebafc59bd94abf