Cherry pick edits from gh-pages branch
Add icons