desktop launcher now uses proper icon
Merge remote-tracking branch 'origin/devjason' into devjason