diff --git a/image/wireshark.ico b/image/wireshark.ico
index 3a99e3a2ee..8dc8fe86e3 100644
Binary files a/image/wireshark.ico and b/image/wireshark.ico differ
diff --git a/image/wireshark.rc.in b/image/wireshark.rc.in
index 3ab164f733..5b5770c905 100644
--- a/image/wireshark.rc.in
+++ b/image/wireshark.rc.in
@@ -2,7 +2,8 @@
 
 #include "win32-file-dlg.rc"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON1		ICON			"wireshark.ico"
+WIRESHARK_ICON2	ICON			"wiresharkdoc.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@,0
diff --git a/image/wiresharkdoc.ico b/image/wiresharkdoc.ico
new file mode 100755
index 0000000000..c10c4f6a54
Binary files /dev/null and b/image/wiresharkdoc.ico differ
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 84ecb23c97..588bb51897 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -534,7 +534,7 @@ ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State"
 StrCmp $0 "0" SecRequired_skip_FileExtensions
 WriteRegStr HKCR ${WIRESHARK_ASSOC} "" "Wireshark file"
 WriteRegStr HKCR "${WIRESHARK_ASSOC}\Shell\open\command" "" '"$INSTDIR\wireshark.exe" "%1"'
-WriteRegStr HKCR "${WIRESHARK_ASSOC}\DefaultIcon" "" '"$INSTDIR\wireshark.exe",0'
+WriteRegStr HKCR "${WIRESHARK_ASSOC}\DefaultIcon" "" '"$INSTDIR\wireshark.exe",1'
 push $R0
 	StrCpy $R0 ".5vw"
   	Call Associate