refactor ata icons++
Merge branch 'master' into gh-pages