Safety checks around DOM icon manipulation
Merge branch 'master' into gh-pages