Consistently use the term 'icon' instead of 'glyph'.
Introduce GlyphSet and add more unit tests.