Remove unused glyphs from the icon font

We now only have one of each icon type where possible.
Update icons in template to reflect new classes