Add prepare state and add custom icon
Merge branch 'master' into gh-pages