more icon tweaks - this could be going on for some time; try to get icon code (and all theme stuff) out of main code and into templates, but on the short term provide both so nothing breaks.