Remove template comments constant. Icon changes