diff --git a/bin/jessie-desktop.tgz b/bin/jessie-desktop.tgz
index d7d709b28a..d9eeab6ae1 100644
Binary files a/bin/jessie-desktop.tgz and b/bin/jessie-desktop.tgz differ
diff --git a/bin/xenial-desktop.tgz b/bin/xenial-desktop.tgz
index 16dc9e2f29..2757450d0d 100644
Binary files a/bin/xenial-desktop.tgz and b/bin/xenial-desktop.tgz differ
diff --git a/configuration.sh b/configuration.sh
index 74fb63bc7e..840b5f6e32 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -141,7 +141,7 @@ PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-f
 	gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl gksu bluetooth \
 	network-manager-gnome xfce4-notifyd gnome-keyring gcr libgck-1-0 libgcr-3-common p11-kit pasystray pavucontrol pulseaudio \
 	paman pavumeter pulseaudio-module-gconf pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri mpv \
-	libreoffice-writer libreoffice-style-tango libreoffice-gtk policykit-1 mate-utils ubuntu-mate-welcome mate-settings-daemon"
+	libreoffice-writer libreoffice-style-tango libreoffice-gtk policykit-1"
 
 PACKAGE_LIST_EXCLUDE="xfce4-mixer"
 
@@ -153,7 +153,7 @@ case $RELEASE in
 	;;
 	xenial)
 	PACKAGE_LIST_RELEASE="man-db wget nano"
-	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP thunderbird firefox gnome-icon-theme-full tango-icon-theme language-selector-gnome paprefs"
+	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP thunderbird firefox gnome-icon-theme-full tango-icon-theme language-selector-gnome paprefs mate-utils ubuntu-mate-welcome mate-settings-daemon"
 	;;
 esac
 
diff --git a/desktop.sh b/desktop.sh
index e870dc0110..62c8fae860 100644
--- a/desktop.sh
+++ b/desktop.sh
@@ -16,9 +16,10 @@ install_desktop ()
 	mkdir -p $CACHEDIR/$SDCARD/tmp/bin
 	mount --bind $SRC/lib/bin/ $CACHEDIR/$SDCARD/tmp/bin
 
-	# install optimized firefox configuration
-	cp $SRC/lib/config/firefox.conf $CACHEDIR/$SDCARD/etc/firefox/syspref.js
-
+	if [[ $RELEASE == xenial ]]; then
+		# install optimized firefox configuration
+		cp $SRC/lib/config/firefox.conf $CACHEDIR/$SDCARD/etc/firefox/syspref.js
+	fi
 	# install dedicated startup icons
 	cp $SRC/lib/bin/icons/${RELEASE}.png $CACHEDIR/$SDCARD/usr/share/pixmaps
 
@@ -32,10 +33,6 @@ install_desktop ()
 	mkdir -p $CACHEDIR/$SDCARD/etc/polkit-1/localauthority/50-local.d
 	cp $SRC/lib/config/polkit-jessie/*.pkla $CACHEDIR/$SDCARD/etc/polkit-1/localauthority/50-local.d/
 
-	# set default wallpaper
-	sed -i 's/\(backgrounds\/xfce\/*\)[^ ]*/\1armbian06-1430-very-dark-3840x2160.jpg\"\/>/' $CACHEDIR/$SDCARD/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
-	sed -i 's/\(backgrounds\/xfce\/*\)[^ ]*/\1armbian06-1430-very-dark-3840x2160.jpg\"\/>/' $CACHEDIR/$SDCARD/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
-
 	# Install custom icons and theme
 	chroot $CACHEDIR/$SDCARD /bin/bash -c "dpkg -i /tmp/bin/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb >/dev/null 2>&1"
 	chroot $CACHEDIR/$SDCARD /bin/bash -c "unzip -qq /tmp/bin/NumixHolo.zip -d /usr/share/themes"