Merge pull request #504 from Maaack/fix-crash-with-icon-installer