new icons
Merge branch 'master' into alex
delete icons
delete icon