Merge branch 'hotfix/hotfix'
Icons
Merge branch 'hotfix/icons' into develop