(g2-RUI6-E03F): Apply new conventions for glyph granularity for