New icon
Merge branch 'newIcon'