More fixes for mouse glyph calculations (Bug#16647).