Bug 1098168 - BaseIcon

Looking at this being implemented I think this is starting to get a little messy. It feels just like another global namespace to put things. I don't think you need to do anything to address this, but I do think it's something we should think about - I think this is going to get out of control very quickly.