diff --git a/Contrib/Makensisw/resource.h b/Contrib/Makensisw/resource.h
index d2959c19..98eb439f 100644
--- a/Contrib/Makensisw/resource.h
+++ b/Contrib/Makensisw/resource.h
@@ -10,6 +10,7 @@
 #define IDR_DEFAULT1                    108
 #define IDI_ABOUT                       110
 #define IDM_LOGWIN                      111
+#define IDI_SHELL                       112
 #define IDC_LOGWIN                      402
 #define IDC_VERSION                     405
 #define IDC_CLOSE                       406
@@ -35,7 +36,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        112
+#define _APS_NEXT_RESOURCE_VALUE        113
 #define _APS_NEXT_COMMAND_VALUE         40008
 #define _APS_NEXT_CONTROL_VALUE         1009
 #define _APS_NEXT_SYMED_VALUE           101
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index 6a310d5f..10556ddd 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -55,6 +55,7 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_ICON                ICON    DISCARDABLE     "..\\..\\contrib\\icons\\adni18-installer-C-no48xp.ico"
+IDI_SHELL               ICON    DISCARDABLE     "shell.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -66,7 +67,7 @@ BEGIN
     POPUP "&File"
     BEGIN
         MENUITEM "&Recompile\tCtrl+R",          IDM_RECOMPILE
-        MENUITEM "&Test Installer\tCtrl+T",               IDM_TEST
+        MENUITEM "&Test Installer\tCtrl+T",     IDM_TEST
         MENUITEM "&Save Output...",             IDM_SAVE
         MENUITEM SEPARATOR
         MENUITEM "&Load Script...",             IDM_LOADSCRIPT
diff --git a/Contrib/Makensisw/shell.ico b/Contrib/Makensisw/shell.ico
new file mode 100644
index 00000000..b1f13afd
Binary files /dev/null and b/Contrib/Makensisw/shell.ico differ
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index d10fad3c..942da669 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -104,12 +104,12 @@ Section "NSI Development Shell Extensions" SecExtention
   WriteRegStr HKCR ".nsh" "" "NSHFile"
   WriteRegStr HKCR "NSHFile" "" "NSI Script File"
   WriteRegStr HKCR "NSHFile\shell" "" "open"
-  WriteRegStr HKCR "NSHFile\DefaultIcon" "" $INSTDIR\makensis.exe,0
+  WriteRegStr HKCR "NSHFile\DefaultIcon" "" $INSTDIR\makensisw.exe,1
   WriteRegStr HKCR "NSHFile\shell\open\command" "" 'notepad.exe "%1"'
   WriteRegStr HKCR ".nsi" "" "NSISFile"
   WriteRegStr HKCR "NSISFile" "" "NSI Script File"
   WriteRegStr HKCR "NSISFile\shell" "" "open"
-  WriteRegStr HKCR "NSISFile\DefaultIcon" "" $INSTDIR\makensis.exe,0
+  WriteRegStr HKCR "NSISFile\DefaultIcon" "" $INSTDIR\makensisw.exe,1
   WriteRegStr HKCR "NSISFile\shell\open\command" "" 'notepad.exe "%1"'
   WriteRegStr HKCR "NSISFile\shell\compile" "" "Compile NSI"
   WriteRegStr HKCR "NSISFile\shell\compile\command" "" '"$INSTDIR\makensisw.exe" /CD "%1"'