remove some icons
some changes and fixes
Merge branch 'master' into gh-pages