white icon instead of black
small black icon
Merge branch 'master' into gh-pages