Remove or comment out unused icons.
Fix icons.  Was a little too aggressive about removing.