Merge branch 'hotfix/1.4.1.4_3.1'
Icon fix.
Merge branch 'hotfix/1.4.1.5_3.1' into Development