improvements to icon placement
Merge branch 'master' into gh-pages