diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index 4f656cbf7690..f8b8c86eb79e 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -16,7 +16,7 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): 
+# Contributor(s): Jeremy Morton (jez9999@runbox.com)
 #
 
 DEPTH		= ../..
@@ -243,6 +243,9 @@ else
 ICON_DIR=$(MOZ_WIDGET_TOOLKIT)
 endif
 
+# Include icons based on widget toolkit; not all platforms need the same set.
+
+# All-platform icons
 DESKTOP_ICONS = \
 	abcardWindow \
 	addressbookWindow \
@@ -263,6 +266,20 @@ DESKTOP_ICONS = \
 	winInspectorMain \
 	$(NULL) 
 
+ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
+# Windows icons
+DESKTOP_ICONS += \
+	gif-file \
+	html-file \
+	misc-file \
+	image-file \
+	jpeg-file \
+	script-file \
+	xml-file \
+	xul-file \
+	$(NULL)
+endif
+
 ifeq ($(ICON_DIR),gtk)
 DESKTOP_ICONS_SMALL=$(patsubst %,%16,$(DESKTOP_ICONS))
 endif
diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win
index f15ff19adcce..854a11808bf4 100644
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@@ -189,6 +189,14 @@ bin\chrome\icons\default\findHistoryWindow.ico
 bin\chrome\icons\default\history-window.ico
 bin\chrome\icons\default\jsconsoleWindow.ico
 bin\chrome\icons\default\main-window.ico
+bin\chrome\icons\default\gif-file.ico
+bin\chrome\icons\default\html-file.ico
+bin\chrome\icons\default\misc-file.ico
+bin\chrome\icons\default\image-file.ico
+bin\chrome\icons\default\jpeg-file.ico
+bin\chrome\icons\default\script-file.ico
+bin\chrome\icons\default\xml-file.ico
+bin\chrome\icons\default\xul-file.ico
 ;-bin\chrome\comm\content\editor\EditorInitPage.html
 ;-bin\chrome\comm\editor\content\EditorInitPagePlain.html
 ;Include this for "debug" testing - remove for actual beta release: