add icon border
Merge branch 'master' into gh-pages