Updated icons and template