Merge branch 'hotfix/icon'
Merge branch 'develop'
Temp fix..
Merge branch 'hotfix/hotfix' into develop