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