Add icons to tabs
locateControl notes
Merge branch 'master' into gh-pages