trying to point to icons
Merge branch 'dev'