Merge pull request #30 from Chorus/fix-81892840

[Fixes #81892840]
Merge branch 'master' into mm-newicons