more icons
Merge branch 'master' into template-tweaks