Fixing icon_template issues before upgrading

Upgraded to 0.96 but had to correct a bunch of icon_template issues first.