Another policy nitpick
Consolidating icon code into it's own class.