diff --git a/config/sources/sun50iw1.conf b/config/sources/sun50iw1.conf
index e7c76076ef..dc4bdbadb7 100644
--- a/config/sources/sun50iw1.conf
+++ b/config/sources/sun50iw1.conf
@@ -87,10 +87,9 @@ family_tweaks_s()
 			# enable services installed from BSP
 			chroot $SDCARD /bin/bash -c "systemctl --no-reload enable pinebook-bluetooth.service >/dev/null 2>&1"
 		fi
-
-		# power manager
-		[[ $BUILD_DESKTOP == yes && $BOARD == pinebook-a64 ]] && chroot $SDCARD /bin/bash -c "apt-get -qq -y install xfce4-power-manager bluetooth >/dev/null 2>&1"
 	fi
+	# power manager
+	[[ $BUILD_DESKTOP == yes && $BOARD == pinebook-a64 ]] && chroot $SDCARD /bin/bash -c "apt-get -qq -y install xfce4-power-manager bluetooth >/dev/null 2>&1"
 }
 
 family_tweaks_bsp()
diff --git a/lib/configuration.sh b/lib/configuration.sh
index 06a0cc8905..4113bdbc3c 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"
+	libgl1-mesa-dri policykit-1 profile-sync-daemon gnome-orca numix-gtk-theme numix-icon-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 numix-icon-theme"
+		PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless policykit-1-gnome eject"
 		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 numix-icon-theme"
+		PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless paprefs"
 		PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium-browser language-selector-gnome system-config-printer-common system-config-printer-gnome"
 	;;
 
diff --git a/lib/debootstrap-ng.sh b/lib/debootstrap-ng.sh
index 2b3313267b..384ea3e14f 100644
--- a/lib/debootstrap-ng.sh
+++ b/lib/debootstrap-ng.sh
@@ -521,7 +521,7 @@ create_image()
 	[[ $(type -t post_build_image) == function ]] && post_build_image "$DEST/images/${version}.img"
 
 	# write image to SD card
-	if [[ -e "$CARD_DEVICE" && -f $DEST/images/${version}.img ]]; then
+	if [[ -e "$CARD_DEVICE" && -f $DEST/images/${version}.img && $COMPRESS_OUTPUTIMAGE != yes ]]; then
 		display_alert "Writing image" "$CARD_DEVICE" "info"
 		etcher $DEST/images/${version}.img -d $CARD_DEVICE -y
 		if [ $? -eq 0 ]; then
diff --git a/lib/desktop.sh b/lib/desktop.sh
index 3fd31a00d7..de01625fd0 100644
--- a/lib/desktop.sh
+++ b/lib/desktop.sh
@@ -85,12 +85,6 @@ 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
diff --git a/lib/general.sh b/lib/general.sh
index 8f50f9f13a..5f1807888e 100644
--- a/lib/general.sh
+++ b/lib/general.sh
@@ -743,7 +743,9 @@ download_toolchain()
 
 download_etcher_cli()
 {
-        local url=$(curl -s https://api.github.com/repos/resin-io/etcher/releases | grep etcher-cli | grep linux-x64 | grep browser_download_url | head -1 | cut -d \" -f 4)
+        local url="https://github.com/resin-io/etcher/releases/download/v1.4.4/etcher-cli-1.4.4-linux-x64.tar.gz"
+	local hash="54709ad34ac304d2686130c7d22a3bc13b4f491387d987274eeca4f6eea34dce"
+
         local filename=${url##*/}
         local dirname=${filename/.tar.gz/-dist}
 
@@ -759,13 +761,11 @@ download_etcher_cli()
         curl -Lf --progress-bar $url -o $filename
 
         local verified=false
+	local b=$(sha256sum $filename)
 
         display_alert "Verifying"
 
-        local a=$(curl -sL $(curl -s https://api.github.com/repos/resin-io/etcher/releases | grep SHA | grep browser_download_url | head -1 | cut -d \" -f 4) | grep etcher-cli | grep linux-x64)
-        local b=$(sha256sum $filename)
-
-        [[ -n $a && -n $b && "$a" == "$b" ]] && verified=true
+        [[ "$hash" == "$(sha256sum $filename | cut -d ' ' -f 1)" ]] && verified=true
 
         if [[ $verified == true ]]; then
                 display_alert "Extracting"