diff --git a/MANIFEST.in b/MANIFEST.in
index 9e1765824b5c..0954edadefd2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,8 +8,8 @@ include contrib/requirements/requirements-hw.txt
 recursive-include packages *.py
 recursive-include packages cacert.pem
 
-graft electrum
-prune electrum/tests
+graft electrum_xzc
+prune electrum_xzc/tests
 
 global-exclude __pycache__
 global-exclude *.py[co~]
diff --git a/contrib/build-linux/appimage/apprun.sh b/contrib/build-linux/appimage/apprun.sh
index 6000c7c9166c..98e3ce4b3c6b 100755
--- a/contrib/build-linux/appimage/apprun.sh
+++ b/contrib/build-linux/appimage/apprun.sh
@@ -8,4 +8,4 @@ export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${APPDIR}/usr/lib/x86_64-linux-gnu${L
 export PATH="${APPDIR}/usr/bin:${PATH}"
 export LDFLAGS="-L${APPDIR}/usr/lib/x86_64-linux-gnu -L${APPDIR}/usr/lib"
 
-exec "${APPDIR}/usr/bin/python3.6" -s "${APPDIR}/usr/bin/electrum" "$@"
+exec "${APPDIR}/usr/bin/python3.6" -s "${APPDIR}/usr/bin/electrum-xzc" "$@"
diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh
index 7ca307f36978..6c33985129ba 100755
--- a/contrib/build-linux/appimage/build.sh
+++ b/contrib/build-linux/appimage/build.sh
@@ -7,7 +7,7 @@ CONTRIB="$PROJECT_ROOT/contrib"
 CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage"
 DISTDIR="$PROJECT_ROOT/dist"
 BUILDDIR="$CONTRIB_APPIMAGE/build/appimage"
-APPDIR="$BUILDDIR/electrum.AppDir"
+APPDIR="$BUILDDIR/electrum_xzc.AppDir"
 CACHEDIR="$CONTRIB_APPIMAGE/.cache/appimage"
 
 # pinned versions
@@ -18,7 +18,7 @@ SQUASHFSKIT_COMMIT="ae0d656efa2d0df2fcac795b6823b44462f19386"
 
 
 VERSION=`git describe --tags --dirty --always`
-APPIMAGE="$DISTDIR/electrum-$VERSION-x86_64.AppImage"
+APPIMAGE="$DISTDIR/electrum_xzc-$VERSION-x86_64.AppImage"
 
 rm -rf "$BUILDDIR"
 mkdir -p "$APPDIR" "$CACHEDIR" "$DISTDIR"
@@ -122,7 +122,7 @@ info "preparing electrum-locale."
         fail "Please install gettext"
     fi
     for i in ./locale/*; do
-        dir="$PROJECT_ROOT/electrum/$i/LC_MESSAGES"
+        dir="$PROJECT_ROOT/electrum_xzc/$i/LC_MESSAGES"
         mkdir -p $dir
         msgfmt --output-file="$dir/electrum.mo" "$i/electrum.po" || true
     done
diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh
index 94a190d23810..bf226fa2a966 100755
--- a/contrib/build-wine/build-electrum-git.sh
+++ b/contrib/build-wine/build-electrum-git.sh
@@ -2,6 +2,8 @@
 
 NAME_ROOT=electrum-xzc
 
+set -x
+
 # These settings probably don't need any change
 export WINEPREFIX=/opt/wine64
 export WINEDEBUG=-all
@@ -19,7 +21,7 @@ here="$(dirname "$(readlink -e "$0")")"
 
 . "$CONTRIB"/build_tools_util.sh
 
-pushd $WINEPREFIX/drive_c/electrum-xzc
+pushd $WINEPREFIX/drive_c/electrum
 
 VERSION=`git describe --tags --dirty --always`
 info "Last commit: $VERSION"
@@ -47,7 +49,7 @@ $PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-bui
 
 $PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-hw.txt
 
-pushd $WINEPREFIX/drive_c/electrum-xzc
+pushd $WINEPREFIX/drive_c/electrum
 # see https://github.com/pypa/pip/issues/2195 -- pip makes a copy of the entire directory
 info "Pip installing Electrum. This might take a long time if the project folder is large."
 $PYTHON -m pip install --no-warn-script-location .
@@ -115,4 +117,4 @@ EOF
     done
 )
 
-sha256sum dist/electrum*.exe
+sha256sum dist/electrum-xzc*.exe
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
index 69d60dd07e0a..c24bce795d1a 100644
--- a/contrib/build-wine/deterministic.spec
+++ b/contrib/build-wine/deterministic.spec
@@ -12,7 +12,7 @@ else:
 
 PYHOME = 'c:/python3'
 
-home = 'C:\\electrum-xzc\\'
+home = 'C:\\electrum\\'
 
 # see https://github.com/pyinstaller/pyinstaller/issues/2005
 hiddenimports = []
diff --git a/contrib/build-wine/electrum.nsi b/contrib/build-wine/electrum.nsi
index c76b75a13215..67c3052e5f88 100644
--- a/contrib/build-wine/electrum.nsi
+++ b/contrib/build-wine/electrum.nsi
@@ -72,7 +72,7 @@
   !define MUI_ABORTWARNING
   !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
   
-  !define MUI_ICON "c:\electrum-xzc\electrum_xzc\gui\icons\electrum.ico"
+  !define MUI_ICON "c:\electrum\electrum_xzc\gui\icons\electrum.ico"
   
 ;--------------------------------
 ;Pages
@@ -111,7 +111,7 @@ Section
   
   ;Files to pack into the installer
   File /r "dist\electrum-xzc\*.*"
-  File "c:\electrum-xzc\electrum_xzc\gui\icons\electrum.ico"
+  File "c:\electrum\electrum_xzc\gui\icons\electrum.ico"
 
   ;Store installation folder
   WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR
@@ -122,7 +122,7 @@ Section
 
   ;Create desktop shortcut
   DetailPrint "Creating desktop shortcut..."
-  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" ""
+  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-xzc-${PRODUCT_VERSION}.exe" ""
 
   ;Create start-menu items
   DetailPrint "Creating start-menu items..."
diff --git a/contrib/make_tgz b/contrib/make_tgz
index 3b5e59dc3e78..e88c428aef54 100755
--- a/contrib/make_tgz
+++ b/contrib/make_tgz
@@ -22,10 +22,10 @@ git submodule update --init
         exit 1
     fi
     for i in ./locale/*; do
-        dir="$ROOT_FOLDER"/electrum-xzc/$i/LC_MESSAGES
+        dir="$ROOT_FOLDER"/electrum_xzc/$i/LC_MESSAGES
         mkdir -p $dir
         msgfmt --output-file=$dir/electrum.mo $i/electrum.po || true
-        cp $i/electrum.po "$ROOT_FOLDER"/electrum-xzc/$i/electrum.po
+        cp $i/electrum.po "$ROOT_FOLDER"/electrum_xzc/$i/electrum.po
     done
 )
 
diff --git a/contrib/pull_locale b/contrib/pull_locale
index 0efa8c99f0b8..ca3c38b8b41f 100755
--- a/contrib/pull_locale
+++ b/contrib/pull_locale
@@ -13,7 +13,7 @@ except ImportError as e:
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
 os.chdir('..')
 
-cmd = "find electrum-xzc -type f -name '*.py' -o -name '*.kv'"
+cmd = "find electrum_xzc -type f -name '*.py' -o -name '*.kv'"
 
 files = subprocess.check_output(cmd, shell=True)
 
@@ -23,13 +23,13 @@ with open("app.fil", "wb") as f:
 print("Found {} files to translate".format(len(files.splitlines())))
 
 # Generate fresh translation template
-if not os.path.exists('electrum-xzc/locale'):
-    os.mkdir('electrum-xzc/locale')
-cmd = 'xgettext -s --from-code UTF-8 --language Python --no-wrap -f app.fil --output=electrum-xzc/locale/messages.pot'
+if not os.path.exists('electrum_xzc/locale'):
+    os.mkdir('electrum_xzc/locale')
+cmd = 'xgettext -s --from-code UTF-8 --language Python --no-wrap -f app.fil --output=electrum_xzc/locale/messages.pot'
 print('Generate template')
 os.system(cmd)
 
-os.chdir('electrum')
+os.chdir('electrum_xzc')
 
 crowdin_identifier = 'electrum'
 crowdin_file_name = 'files[electrum-client/messages.pot]'
diff --git a/contrib/push_locale b/contrib/push_locale
index 56e267368408..33e6a159e32f 100755
--- a/contrib/push_locale
+++ b/contrib/push_locale
@@ -13,7 +13,7 @@ except ImportError as e:
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
 os.chdir('..')
 
-cmd = "find electrum-xzc -type f -name '*.py' -o -name '*.kv'"
+cmd = "find electrum_xzc -type f -name '*.py' -o -name '*.kv'"
 
 files = subprocess.check_output(cmd, shell=True)
 
@@ -23,9 +23,9 @@ with open("app.fil", "wb") as f:
 print("Found {} files to translate".format(len(files.splitlines())))
 
 # Generate fresh translation template
-if not os.path.exists('electrum-xzc/locale'):
-    os.mkdir('electrum-xzc/locale')
-cmd = 'xgettext -s --from-code UTF-8 --language Python --no-wrap -f app.fil --output=electrum-xzc/locale/messages.pot'
+if not os.path.exists('electrum_xzc/locale'):
+    os.mkdir('electrum_xzc/locale')
+cmd = 'xgettext -s --from-code UTF-8 --language Python --no-wrap -f app.fil --output=electrum_xzc/locale/messages.pot'
 print('Generate template')
 os.system(cmd)
 
diff --git a/electrum/gui/icons/electrum.icns b/electrum/gui/icons/electrum.icns
index 977b124d0d26..8a759b8cb6cd 100644
Binary files a/electrum/gui/icons/electrum.icns and b/electrum/gui/icons/electrum.icns differ
diff --git a/electrum/gui/icons/electrum.ico b/electrum/gui/icons/electrum.ico
index 3baebbce3c64..4071ae98e6b7 100644
Binary files a/electrum/gui/icons/electrum.ico and b/electrum/gui/icons/electrum.ico differ
diff --git a/electrum/gui/icons/electrum_dark_icon.png b/electrum/gui/icons/electrum_dark_icon.png
index 6fee7de9f74c..bc28065279b3 100644
Binary files a/electrum/gui/icons/electrum_dark_icon.png and b/electrum/gui/icons/electrum_dark_icon.png differ
diff --git a/electrum/gui/icons/electrum_launcher.png b/electrum/gui/icons/electrum_launcher.png
index 37af81ca9f9b..57552974fcdc 100644
Binary files a/electrum/gui/icons/electrum_launcher.png and b/electrum/gui/icons/electrum_launcher.png differ
diff --git a/electrum/gui/icons/electrum_light_icon.png b/electrum/gui/icons/electrum_light_icon.png
index da52cb3c17b0..cd239eb0fa62 100644
Binary files a/electrum/gui/icons/electrum_light_icon.png and b/electrum/gui/icons/electrum_light_icon.png differ
diff --git a/electrum/gui/icons/electrum_presplash.png b/electrum/gui/icons/electrum_presplash.png
index 8d7b414db8b0..3c34baab9384 100644
Binary files a/electrum/gui/icons/electrum_presplash.png and b/electrum/gui/icons/electrum_presplash.png differ
diff --git a/electrum/gui/icons/electrumb.png b/electrum/gui/icons/electrumb.png
index efa26486e495..1fe4feb974ae 100644
Binary files a/electrum/gui/icons/electrumb.png and b/electrum/gui/icons/electrumb.png differ