diff --git a/lib/configuration.sh b/lib/configuration.sh
index fb9a4e700c..3c1e3dcfd9 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -135,7 +135,7 @@ PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-f
 	x11-xserver-utils xfce4 lxtask xfce4-terminal thunar-volman gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf \
 	libgtk2.0-bin libgnome2-perl network-manager-gnome xfce4-notifyd gnome-keyring gcr libgck-1-0 p11-kit pasystray pavucontrol \
 	pulseaudio pavumeter pulseaudio-module-gconf bluez bluez-tools pulseaudio-module-bluetooth blueman libpam-gnome-keyring \
-	libgl1-mesa-dri policykit-1 profile-sync-daemon gnome-orca numix-gtk-theme numix-icon-theme"
+	libgl1-mesa-dri policykit-1 profile-sync-daemon gnome-orca numix-gtk-theme"
 
 
 # Recommended desktop packages
@@ -164,13 +164,13 @@ case $RELEASE in
 
 	jessie)
 		PACKAGE_LIST_RELEASE="less kbd gnupg2 dirmngr"
-		PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless policykit-1-gnome eject"
+		PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless policykit-1-gnome eject numix-icon-theme"
 		PACKAGE_LIST_DESKTOP_RECOMMENDS+=" iceweasel pluma system-config-printer"
 	;;
 
 	xenial)
 		PACKAGE_LIST_RELEASE="man-db wget nano"
-		PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless paprefs"
+		PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless paprefs numix-icon-theme"
 		PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium-browser language-selector-gnome system-config-printer-common system-config-printer-gnome"
 	;;
 
diff --git a/lib/desktop.sh b/lib/desktop.sh
index 73ac08a623..c6fb646d1b 100644
--- a/lib/desktop.sh
+++ b/lib/desktop.sh
@@ -85,6 +85,13 @@ create_desktop_package ()
 	mkdir -p $destination/etc/skel
 	cp -R $SRC/packages/blobs/desktop/skel/. $destination/etc/skel
 
+
+	# using different icon pack. Workaround due to this bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867779
+	if [[ ${RELEASE} == bionic || ${RELEASE} == stretch ]]; then
+	sed -i 's/<property name="IconThemeName" type="string" value=".*$/<property name="IconThemeName" type="string" value="Humanity-Dark">/g' \
+	$destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+	fi
+
 	# install dedicated startup icons
 	mkdir -p $destination/usr/share/pixmaps $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
 	cp $SRC/packages/blobs/desktop/icons/${DISTRIBUTION,,}.png $destination/usr/share/pixmaps