Merge branch 'hotfix/icons'
Remove other icon code for now.
Merge branch 'hotfix/icons2' into develop