#1435 simplification + improve text font mapping