Removing unused template
Merge branch 'master' into new-icon