diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico
index 2d22409eef..de5dd37974 100644
Binary files a/share/pixmaps/bitcoin.ico and b/share/pixmaps/bitcoin.ico differ
diff --git a/share/pixmaps/nsis-header.bmp b/share/pixmaps/nsis-header.bmp
index 0432b1627e..a8b98895c0 100644
Binary files a/share/pixmaps/nsis-header.bmp and b/share/pixmaps/nsis-header.bmp differ
diff --git a/share/pixmaps/nsis-wizard.bmp b/share/pixmaps/nsis-wizard.bmp
index 8b7e01f68c..578bf17c58 100644
Binary files a/share/pixmaps/nsis-wizard.bmp and b/share/pixmaps/nsis-wizard.bmp differ
diff --git a/src/omnicore/res/omnicore-setup-win.nsi.in b/src/omnicore/res/omnicore-setup-win.nsi.in
index 2bdd184052..6350aa031e 100644
--- a/src/omnicore/res/omnicore-setup-win.nsi.in
+++ b/src/omnicore/res/omnicore-setup-win.nsi.in
@@ -1,4 +1,4 @@
-Name "@PACKAGE_NAME@ (@WINDOWS_BITS@-bit)"
+Name "@PACKAGE_NAME@ (64-bit)"
 
 RequestExecutionLevel highest
 SetCompressor /SOLID lzma
@@ -6,7 +6,7 @@ SetCompressor /SOLID lzma
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
 !define PRODUCTVERSION @OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@.@OMNICORE_VERSION_BUILD@
-!define VERSION @OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@.@OMNICORE_VERSION_BUILD@
+!define VERSION @OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@
 !define COMPANY "Omni Foundation"
 !define URL http://www.omnilayer.org/
 
@@ -29,9 +29,7 @@ SetCompressor /SOLID lzma
 # Included files
 !include Sections.nsh
 !include MUI2.nsh
-!if "@WINDOWS_BITS@" == "64"
 !include x64.nsh
-!endif
 
 # Variables
 Var StartMenuGroup
@@ -49,12 +47,8 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English
 
 # Installer attributes
-OutFile @abs_top_srcdir@/omnifeather-${VERSION}-win@WINDOWS_BITS@-setup.exe
-!if "@WINDOWS_BITS@" == "64"
+OutFile @abs_top_srcdir@/omnifeather-${VERSION}-win64-setup.exe
 InstallDir "$PROGRAMFILES64\OmniFeather"
-!else
-InstallDir "$PROGRAMFILES\OmniFeather"
-!endif
 CRCCheck on
 XPStyle on
 BrandingText " "
@@ -156,7 +150,6 @@ SectionEnd
 # Installer functions
 Function .onInit
     InitPluginsDir
-!if "@WINDOWS_BITS@" == "64"
     ${If} ${RunningX64}
       ; disable registry redirection (enable access to 64-bit portion of registry)
       SetRegView 64
@@ -164,7 +157,6 @@ Function .onInit
       MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system."
       Abort
     ${EndIf}
-!endif
 FunctionEnd
 
 # Uninstaller functions