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