icon styling and template cleanup