Fix icon installation to work with xfce tray based on unity indicator
Merge remote-tracking branch 'origin/master' into ubuntu-package