Use 16px appicons in xfwm4's decorations (Issue #115)
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'