Merge pull request #1064 from Arantor/release-2.1

Even more icon removal.