diff --git a/Makefile.am b/Makefile.am
index 57299fef70..538d04b491 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ export PYTHONPATH
 
 BITCOIND_BIN=$(top_builddir)/src/$(GRIDCOIN_DAEMON_NAME)$(EXEEXT)
 BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(GRIDCOIN_GUI_NAME)$(EXEEXT)
-#BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
+BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
 
 empty :=
 space := $(empty) $(empty)
diff --git a/share/pixmaps/bitcoin-bc.ico b/share/pixmaps/gridcoin-bc.ico
similarity index 100%
rename from share/pixmaps/bitcoin-bc.ico
rename to share/pixmaps/gridcoin-bc.ico
diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/gridcoin.ico
similarity index 100%
rename from share/pixmaps/bitcoin.ico
rename to share/pixmaps/gridcoin.ico
diff --git a/share/pixmaps/bitcoin.png b/share/pixmaps/gridcoin.png
similarity index 100%
rename from share/pixmaps/bitcoin.png
rename to share/pixmaps/gridcoin.png
diff --git a/share/pixmaps/bitcoin128.png b/share/pixmaps/gridcoin128.png
similarity index 100%
rename from share/pixmaps/bitcoin128.png
rename to share/pixmaps/gridcoin128.png
diff --git a/share/pixmaps/bitcoin16.ico b/share/pixmaps/gridcoin16.ico
similarity index 100%
rename from share/pixmaps/bitcoin16.ico
rename to share/pixmaps/gridcoin16.ico
diff --git a/share/pixmaps/bitcoin256.png b/share/pixmaps/gridcoin256.png
similarity index 100%
rename from share/pixmaps/bitcoin256.png
rename to share/pixmaps/gridcoin256.png
diff --git a/share/pixmaps/bitcoin32.ico b/share/pixmaps/gridcoin32.ico
similarity index 100%
rename from share/pixmaps/bitcoin32.ico
rename to share/pixmaps/gridcoin32.ico
diff --git a/share/pixmaps/bitcoin32.png b/share/pixmaps/gridcoin32.png
similarity index 100%
rename from share/pixmaps/bitcoin32.png
rename to share/pixmaps/gridcoin32.png
diff --git a/share/pixmaps/bitcoin64.ico b/share/pixmaps/gridcoin64.ico
similarity index 100%
rename from share/pixmaps/bitcoin64.ico
rename to share/pixmaps/gridcoin64.ico
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index dd42085a27..0e7b6ea433 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -8,21 +8,22 @@ SetCompressor /SOLID lzma
 !define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@
 !define COMPANY "@PACKAGE_NAME@ project"
 !define URL @PACKAGE_URL@
+!define ICONDIR "@abs_top_srcdir@/share/pixmaps"
 
 # MUI Symbol Definitions
-!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico"
-!define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
+!define MUI_ICON "${ICONDIR}\gridcoin.ico"
+!define MUI_UNICON "${ICONDIR}\gridcoin.ico"
+!define MUI_WELCOMEFINISHPAGE_UNICON "${ICONDIR}\gridcoin.ico"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
-!define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${ICONDIR}\nsis-header.bmp"
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER "@PACKAGE_NAME@"
-!define MUI_FINISHPAGE_RUN $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
+!define MUI_FINISHPAGE_RUN $INSTDIR\@GRIDCOIN_GUI_NAME@@EXEEXT@
+!define MUI_UNWELCOMEFINISHPAGE_UNICON "${ICONDIR}\gridcoin.ico"
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
 
 # Included files
@@ -50,9 +51,9 @@ Var StartMenuGroup
 # Installer attributes
 OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-${VERSION}-win@WINDOWS_BITS@-setup.exe
 !if "@WINDOWS_BITS@" == "64"
-InstallDir $PROGRAMFILES64\Bitcoin
+InstallDir $PROGRAMFILES64\GridcoinResearch
 !else
-InstallDir $PROGRAMFILES\Bitcoin
+InstallDir $PROGRAMFILES\GridcoinResearch
 !endif
 CRCCheck on
 XPStyle on
@@ -73,12 +74,11 @@ ShowUninstDetails show
 Section -Main SEC0000
     SetOutPath $INSTDIR
     SetOverwrite on
-    File @abs_top_srcdir@/release/@BITCOIN_GUI_NAME@@EXEEXT@
+    File @abs_top_srcdir@/release/@GRIDCOIN_GUI_NAME@@EXEEXT@
     File /oname=COPYING.txt @abs_top_srcdir@/COPYING
-    File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
+    #File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
     SetOutPath $INSTDIR\daemon
-    File @abs_top_srcdir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
-    File @abs_top_srcdir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
+    File @abs_top_srcdir@/release/@GRIDCOIN_DAEMON_NAME@@EXEEXT@
     SetOutPath $INSTDIR\doc
     File /r @abs_top_srcdir@/doc\*.*
     SetOutPath $INSTDIR
@@ -91,8 +91,8 @@ Section -post SEC0001
     WriteUninstaller $INSTDIR\uninstall.exe
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory $SMPROGRAMS\$StartMenuGroup
-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@GRIDCOIN_GUI_NAME@@EXEEXT@
+    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" "$INSTDIR\@GRIDCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@GRIDCOIN_GUI_NAME@@EXEEXT@" 1
     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
     !insertmacro MUI_STARTMENU_WRITE_END
     WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -105,8 +105,8 @@ Section -post SEC0001
     WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
     WriteRegStr HKCR "@PACKAGE_TARNAME@" "URL Protocol" ""
     WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:Bitcoin"
-    WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
-    WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "%1"'
+    WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@GRIDCOIN_GUI_NAME@@EXEEXT@
+    WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@GRIDCOIN_GUI_NAME@@EXEEXT@" "%1"'
 SectionEnd
 
 # Macro for selecting uninstaller sections
@@ -124,7 +124,7 @@ done${UNSECTION_ID}:
 
 # Uninstaller sections
 Section /o -un.Main UNSEC0000
-    Delete /REBOOTOK $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
+    Delete /REBOOTOK $INSTDIR\@GRIDCOIN_GUI_NAME@@EXEEXT@
     Delete /REBOOTOK $INSTDIR\COPYING.txt
     Delete /REBOOTOK $INSTDIR\readme.txt
     RMDir /r /REBOOTOK $INSTDIR\daemon
@@ -167,6 +167,8 @@ Function .onInit
       Abort
     ${EndIf}
 !endif
+    Exec $INSTDIR\uninst.exe
+    Delete $INSTDIR\*"
 FunctionEnd
 
 # Uninstaller functions