diff --git a/desktop/package/linux/32bitBuild.sh b/desktop/package/linux/32bitBuild.sh
deleted file mode 100644
index cf9183cfd3..0000000000
--- a/desktop/package/linux/32bitBuild.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-cd ../../
-mkdir -p deploy
-
-set -e
-
-# Edit version
-version=0.9.0
-
-dir="/media/sf_vm_shared_ubuntu14_32bit"
-
-# Note: fakeroot needs to be installed on Linux
-$JAVA_HOME/bin/javapackager \
-    -deploy \
-    -Bruntime="$JAVA_HOME/jre" \
-    -BappVersion=$version \
-    -Bcategory=Network \
-    -Bemail=contact@bisq.network \
-    -BlicenseType=GPLv3 \
-    -BlicenseFile=LICENSE \
-    -Bicon=package/linux/icon.png \
-    -native deb \
-    -name Bisq \
-    -title Bisq \
-    -vendor Bisq \
-    -outdir deploy \
-    -srcfiles "$dir/Bisq-$version.jar" \
-    -srcfiles package/linux/LICENSE \
-    -appclass bisq.desktop.app.BisqAppMain \
-    -BjvmOptions=-Xss1280k \
-    -outfile Bisq
-
-
-# sudo alien -r -c -k deploy/bundles/bisq-$version.deb
-
-cp "deploy/bundles/bisq-$version.deb" "/home/$USER/Desktop/Bisq-32bit-$version.deb"
-mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.deb"
-
-# mv "bisq-$version-1.i386.rpm" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.rpm"
-rm -r deploy/
-
-cd package/linux
diff --git a/desktop/package/linux/64bitBuild.sh b/desktop/package/linux/64bitBuild.sh
index 34c33b7d18..69d0c93147 100644
--- a/desktop/package/linux/64bitBuild.sh
+++ b/desktop/package/linux/64bitBuild.sh
@@ -11,6 +11,11 @@ version=0.9.0
 dir="/media/sf_vm_shared_ubuntu"
 
 # Note: fakeroot needs to be installed on Linux
+
+# TODO: need to add the licenses back again as soon as it is working with our build setup
+#-BlicenseFile=LICENSE \
+#-srcfiles package/linux/LICENSE \
+
 $JAVA_HOME/bin/javapackager \
     -deploy \
     -Bruntime="$JAVA_HOME/jre" \
@@ -18,25 +23,24 @@ $JAVA_HOME/bin/javapackager \
     -Bcategory=Network \
     -Bemail=contact@bisq.network \
     -BlicenseType=GPLv3 \
-    -BlicenseFile=LICENSE \
     -Bicon=package/linux/icon.png \
     -native deb \
     -name Bisq \
     -title Bisq \
     -vendor Bisq \
     -outdir deploy \
-    -srcfiles "$dir/Bisq-$version.jar" \
-    -srcfiles package/linux/LICENSE \
+    -srcdir $dir \
+    -srcfiles "Bisq-$version.jar" \
     -appclass bisq.desktop.app.BisqAppMain \
     -BjvmOptions=-Xss1280k \
-    -outfile Bisq
+    -outfile Bisq \
+    -v
 
 # uncomment because the build VM does not support alien
 #sudo alien -r -c -k deploy/bundles/bisq-$version.deb
 
 cp "deploy/bundles/bisq-$version.deb" "/home/$USER/Desktop/Bisq-64bit-$version.deb"
 mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.deb"
-#mv "bisq-$version-1.x86_64.rpm" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.rpm"
 rm -r deploy/
 
 cd package/linux
diff --git a/desktop/package/linux/icon.png b/desktop/package/linux/icon.png
index bed6628d48..84b00ccbea 100644
Binary files a/desktop/package/linux/icon.png and b/desktop/package/linux/icon.png differ
diff --git a/desktop/package/linux/prepare-system.sh b/desktop/package/linux/prepare-system.sh
index 7b7ce7fd94..e9f48bfbaa 100644
--- a/desktop/package/linux/prepare-system.sh
+++ b/desktop/package/linux/prepare-system.sh
@@ -10,40 +10,4 @@ sudo apt-get update
 sudo apt-get upgrade
 sudo apt-get dist-upgrade
 
-if [ ! -f "${JAVA_HOME}/jre/lib/security/local_policy.jar" ]; then
-    echo "Enabling strong crypto support for Java.."
-
-    wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" https://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip
-
-    checksum=f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 # see https://github.com/jonathancross/jc-docs/blob/master/java-strong-crypto-test/README.md
-
-    if ! echo "${checksum} jce_policy-8.zip" | sha256sum -c -; then
-        echo "Bad checksum for ${jce_policy-8.zip}." >&2
-        exit 1
-    fi
-
-    unzip jce_policy-8.zip
-    sudo cp UnlimitedJCEPolicyJDK8/{US_export_policy.jar,local_policy.jar} ${JAVA_HOME}/jre/lib/security/
-    sudo chmod 664 ${JAVA_HOME}/jre/lib/security/{US_export_policy.jar,local_policy.jar}
-    sudo rm -rf UnlimitedJCEPolicyJDK8 jce_policy-8.zip
-else
-    echo "Strong Crypto support for Java already available."
-fi
-
-bouncyCastleJar=bcprov-jdk15on-1.56.jar
-
-if [ ! -f "${JAVA_HOME}/jre/lib/ext/${bouncyCastleJar}" ]; then
-    echo "Configuring Bouncy Castle.."
-    checksum="963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349"
-    wget "http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/${bouncyCastleJar}"
-    if ! echo "${checksum} ${bouncyCastleJar}" | sha256sum -c -; then
-        echo "Bad checksum for ${bouncyCastleJar}." >&2
-        exit 1
-    fi
-    sudo mv ${bouncyCastleJar} ${JAVA_HOME}/jre/lib/ext/
-    sudo chmod 777 "${JAVA_HOME}/jre/lib/ext/${bouncyCastleJar}"
-else
-    echo "Bouncy Castle already configured."
-fi
-
 echo "Done."
diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh
index 4dbdf3e650..71bf732e3e 100755
--- a/desktop/package/macosx/create_app.sh
+++ b/desktop/package/macosx/create_app.sh
@@ -38,51 +38,28 @@ java -jar ./package/macosx/tools-1.0.jar $EXE_JAR
 echo SHA 256 after stripping jar file to get a deterministic jar:
 shasum -a256 $EXE_JAR | awk '{print $1}' | tee deploy/Bisq-$version.jar.txt
 
-# vmPath=/Volumes
-vmPath=/Users/dev
-linux32=$vmPath/vm_shared_ubuntu14_32bit
+#vmPath=/Users/christoph/Documents/Workspaces/Java
+vmPath=/Volumes
 linux64=$vmPath/vm_shared_ubuntu
-win32=$vmPath/vm_shared_windows_32bit
 win64=$vmPath/vm_shared_windows
 
-mkdir -p $linux32 $linux64 $win32 $win64
+mkdir -p $linux64 $win64
 
 cp $EXE_JAR "deploy/Bisq-$version.jar"
 
 # copy app jar to VM shared folders
-cp $EXE_JAR "$linux32/Bisq-$version.jar"
 cp $EXE_JAR "$linux64/Bisq-$version.jar"
 # At windows we don't add the version nr as it would keep multiple versions of jar files in app dir
-cp $EXE_JAR "$win32/Bisq.jar"
 cp $EXE_JAR "$win64/Bisq.jar"
 
-# copy bouncycastle jars to VM shared folders
-# bc_lib1=bcpg-jdk15on-1.56.jar
-# cp build/app/lib/$bc_lib1 "$linux32/$bc_lib1"
-# cp build/app/lib/$bc_lib1 "$linux64/$bc_lib1"
-# cp build/app/lib/$bc_lib1 "$win32/$bc_lib1"
-# cp build/app/lib/$bc_lib1 "$win64/$bc_lib1"
-
-# bc_lib2=bcprov-jdk15on-1.56.jar
-# cp build/app/lib/$bc_lib2 "$linux32/$bc_lib2"
-# cp build/app/lib/$bc_lib2 "$linux64/$bc_lib2"
-# cp build/app/lib/$bc_lib2 "$win32/$bc_lib2"
-# cp build/app/lib/$bc_lib2 "$win64/$bc_lib2"
-
 # Copy packager scripts to VM. No need to checkout the source as we only are interested in the build scripts.
-rm -rf "$linux32/package"
 rm -rf "$linux64/package"
-rm -rf "$win32/package"
 rm -rf "$win64/package"
 
-mkdir -p "$linux32/package"
 mkdir -p "$linux64/package"
-mkdir -p "$win32/package"
 mkdir -p "$win64/package"
 
-cp -r package/linux "$linux32/package"
 cp -r package/linux "$linux64/package"
-cp -r package/windows "$win32/package"
 cp -r package/windows "$win64/package"
 
 
@@ -110,7 +87,8 @@ $JAVA_HOME/bin/javapackager \
     -srcdir deploy \
     -srcfiles "Bisq-$version.jar" \
     -appclass bisq.desktop.app.BisqAppMain \
-    -outfile Bisq
+    -outfile Bisq \
+    -v
 
 open deploy
 
diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh
index 88f3f8b544..0e279e7ba7 100755
--- a/desktop/package/macosx/finalize.sh
+++ b/desktop/package/macosx/finalize.sh
@@ -6,12 +6,11 @@ version="0.9.0"
 
 target_dir="releases/$version"
 
-linux32=/Volumes/vm_shared_ubuntu14_32bit
-linux64=/Volumes/vm_shared_ubuntu
-win32=/Volumes/vm_shared_windows_32bit
-win64=/Volumes/vm_shared_windows
+#vmPath=/Users/christoph/Documents/Workspaces/Java
+vmPath=/Volumes
+linux64=$vmPath/vm_shared_ubuntu
+win64=$vmPath/vm_shared_windows
 
-#macOS=build/vm/vm_shared_macosx
 macOS=deploy
 
 # Set BISQ_GPG_USER as environment var to the email address used for gpg signing. e.g. BISQ_GPG_USER=manfred@bitsquare.io
@@ -34,43 +33,26 @@ cp "deploy/Bisq-$version.jar.txt" "$target_dir/"
 dmg="Bisq-$version.dmg"
 cp "$macOS/$dmg" "$target_dir/"
 
-deb32="Bisq-32bit-$version.deb"
-cp "$linux32/$deb32" "$target_dir/"
-
 deb64="Bisq-64bit-$version.deb"
 cp "$linux64/$deb64" "$target_dir/"
 
-#rpm32="Bisq-32bit-$version.rpm"
-#cp "/Users/dev/vm_shared_ubuntu14_32bit/$rpm32" "$target_dir/"
-
-#rpm64="Bisq-64bit-$version.rpm"
-#cp "/Users/dev/vm_shared_ubuntu/$rpm64" "$target_dir/"
-
-
 exe="Bisq-$version.exe"
-exe32="Bisq-32bit-$version.exe"
-cp "$win32/bundles/$exe" "$target_dir/$exe32"
 exe64="Bisq-64bit-$version.exe"
 cp "$win64/bundles/$exe" "$target_dir/$exe64"
-#cp "/Users/dev/vm_shared_windows/bundles/$exe" "/Users/dev/vm_shared_win10/$win64"
 
 cd "$target_dir"
 
 echo Create signatures
 gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $dmg.asc --detach-sig --armor $dmg
 gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $deb64.asc --detach-sig --armor $deb64
-gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $deb32.asc --detach-sig --armor $deb32
 gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $exe64.asc --detach-sig --armor $exe64
-gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $exe32.asc --detach-sig --armor $exe32
 
 echo Verify signatures
 gpg --digest-algo SHA256 --verify $dmg{.asc*,}
 gpg --digest-algo SHA256 --verify $deb64{.asc*,}
-gpg --digest-algo SHA256 --verify $deb32{.asc*,}
 gpg --digest-algo SHA256 --verify $exe64{.asc*,}
-gpg --digest-algo SHA256 --verify $exe32{.asc*,}
 
 #mkdir ../../build/vm/vm_shared_windows_32bit/$version
-cp -r . $win32/$version
+cp -r . $win64/$version
 
 open "."
diff --git a/desktop/package/windows/32bitBuild.bat b/desktop/package/windows/32bitBuild.bat
deleted file mode 100644
index 5cb37ec5ac..0000000000
--- a/desktop/package/windows/32bitBuild.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-:: Invoke from Bisq home directory
-:: edit iss file -> AppVersion
-:: edit -> -BappVersion and -srcfiles
-
-:: 32 bit build
-:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
-
-SET version=0.9.0
-
-:: Private setup
-SET outdir=\\VBOXSVR\vm_shared_windows_32bit
-:: Others might use the following
-:: SET outdir=.
-
-call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
--BappVersion="%version%" ^
--native exe ^
--name Bisq ^
--title Bisq ^
--vendor Bisq ^
--outdir %outdir% ^
--appclass bisq.desktop.app.BisqAppMain ^
--srcfiles %outdir%\Bisq.jar ^
--outfile Bisq ^
--Bruntime="%JAVA_HOME%\jre"
diff --git a/desktop/package/windows/64bitBuild.bat b/desktop/package/windows/64bitBuild.bat
index 56ee879ae9..409173d8ef 100644
--- a/desktop/package/windows/64bitBuild.bat
+++ b/desktop/package/windows/64bitBuild.bat
@@ -20,6 +20,8 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
 -vendor Bisq ^
 -outdir %outdir% ^
 -appclass bisq.desktop.app.BisqAppMain ^
--srcfiles %outdir%\Bisq.jar ^
+-srcdir %outdir% ^
+-srcfiles Bisq.jar ^
 -outfile Bisq ^
--Bruntime="%JAVA_HOME%\jre"
+-Bruntime="%JAVA_HOME%\jre" ^
+-v
diff --git a/desktop/package/windows/Bisq.ico b/desktop/package/windows/Bisq.ico
index 8033522955..160f4a5162 100644
Binary files a/desktop/package/windows/Bisq.ico and b/desktop/package/windows/Bisq.ico differ