Add missing icons
Merge branch 'dev'
Fix duplicated icons
Fix icons filename