Even more icon removal.

I can't help but feel this should have been done a long time ago.