Changed icon to 'desktop-effects'.
Merge branch 'master' into debian
1.1.1-1