fixed problems with .icon elements
Merge branch 'hotfix/1.5.2'