Icons
Merge branch 'hotfix/icons'