new icon and new ui
Merge branch 'master' into gh-pages
new icon and new UI