Bug 1098168 - BaseIcon

I'm not sure about adding another level of abstraction something we use only once.
But maybe it could be extended to fix the dom ordering issue.