Updated (most) icons to template spec