Icons
Merge branch 'hotfix/icon'