One line icons
Merge branch 'dev'