Merge pull request #1038 from Arantor/release-2.1

! Hopefully clarified a language string.
Merge pull request #1041 from Arantor/release-2.1

Some icon cleanups