New icons, template changes