Merge branch 'hotfix/icons'
Changed Iconset
Merge branch 'refs/heads/master' into develop