Merge pull request #1075 from Arantor/release-2.1

More fixes
Merge pull request #1076 from Arantor/release-2.1

! Should be it for those icons, too.
Merge pull request #1077 from Arantor/release-2.1

Some cleanup and now a new notification type
Merge pull request #1078 from Arantor/release-2.1

More notifications goodness