removed some icons
update from master
fix merge conflict