diff --git a/Contrib/Makensisw/Readme.txt b/Contrib/Makensisw/Readme.txt
index 219f09e0..f397da0c 100644
--- a/Contrib/Makensisw/Readme.txt
+++ b/Contrib/Makensisw/Readme.txt
@@ -197,6 +197,7 @@ Version History
 
 2.3.3
 - Update check switched from JNetLib to WinInet
+- New file type icons
 
 
 Copyright Information
diff --git a/Contrib/Makensisw/SConscript b/Contrib/Makensisw/SConscript
index 0c484d19..b82ab211 100644
--- a/Contrib/Makensisw/SConscript
+++ b/Contrib/Makensisw/SConscript
@@ -13,8 +13,9 @@ res = Split("""
 """)
 
 resources = Split("""
-	shell.ico
 	icon.ico
+	assoc_nsi.ico
+	assoc_nsh.ico
 	makensisw.xml
 	logo.bmp
 	toolbar.bmp
diff --git a/Contrib/Makensisw/assoc_nsh.ico b/Contrib/Makensisw/assoc_nsh.ico
new file mode 100644
index 00000000..7994c782
Binary files /dev/null and b/Contrib/Makensisw/assoc_nsh.ico differ
diff --git a/Contrib/Makensisw/assoc_nsi.ico b/Contrib/Makensisw/assoc_nsi.ico
new file mode 100644
index 00000000..b33c0b86
Binary files /dev/null and b/Contrib/Makensisw/assoc_nsi.ico differ
diff --git a/Contrib/Makensisw/resource.h b/Contrib/Makensisw/resource.h
index fc3d3598..b4734a33 100644
--- a/Contrib/Makensisw/resource.h
+++ b/Contrib/Makensisw/resource.h
@@ -32,7 +32,8 @@
 #define DLG_ABOUT                       103
 #define IDM_MENU                        104
 #define IDK_ACCEL                       105
-#define IDI_SHELL                       112
+#define IDI_ASSOC_NSI                   112
+#define IDI_ASSOC_NSH                   113
 #define IDB_LOGO                        115
 #define DLG_SETTINGS                    116
 #define IDB_BITMAP1                     120
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index d050eada..52c1a9ba 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -55,7 +55,8 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_ICON                ICON                    "icon.ico"
-IDI_SHELL               ICON                    "shell.ico"
+IDI_ASSOC_NSI           ICON                    "assoc_nsi.ico"
+IDI_ASSOC_NSH           ICON                    "assoc_nsh.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/Contrib/Makensisw/shell.ico b/Contrib/Makensisw/shell.ico
deleted file mode 100644
index dffb927c..00000000
Binary files a/Contrib/Makensisw/shell.ico and /dev/null differ
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 73ab8885..62578f65 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -264,7 +264,7 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
   WriteRegStr HKCR ".nsh" "" "NSIS.Header"
   WriteRegStr HKCR ".nsh" "PerceivedType" "text"
   WriteRegStr HKCR "NSIS.Header" "" "NSIS Header File"
-  WriteRegStr HKCR "NSIS.Header\DefaultIcon" "" "$INSTDIR\makensisw.exe,1"
+  WriteRegStr HKCR "NSIS.Header\DefaultIcon" "" "$INSTDIR\makensisw.exe,2"
   ReadRegStr $R0 HKCR "NSIS.Header\shell\open\command" ""
   ${If} $R0 == ""
     WriteRegStr HKCR "NSIS.Header\shell" "" "open"