Modified icons and removed redundant template