Cleanup and add icomoon glyphs