smaller icon
Merge branch 'Eamyne-branch2.1' into gh-pages