diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 3ec1fb319..9abc7161d 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-19  Alexander Gottwald  <ago@freedesktop.org>
+	
+	* winmultiwindowicons.c (winInitGlobalIcons): Load the small default
+	icon too
+	* winprefs.h, winprefs.c (winOverrideDefaultIcon): Takes the iconsize
+	as parameter
+
 2004-05-19  Alexander Gottwald  <ago@freedesktop.org>
 
 	* win.h, winmultiwindowicons.c (winXIconToHICON): Takes iconsize
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
index 9865f0e58..34151a46c 100755
--- a/hw/xwin/winmultiwindowicons.c
+++ b/hw/xwin/winmultiwindowicons.c
@@ -403,11 +403,13 @@ winUpdateIcon (Window id)
 
 void winInitGlobalIcons (void)
 {
+  int sm_cx = GetSystemMetrics(SM_CXICON);
+  int sm_cxsm = GetSystemMetrics(SM_CXSMICON);
   /* Load default X icon in case it's not ready yet */
   if (!g_hIconX) 
     {  
-      g_hIconX = (HICON)winOverrideDefaultIcon();
-      g_hSmallIconX = NULL;
+      g_hIconX = (HICON)winOverrideDefaultIcon(sm_cx);
+      g_hSmallIconX = (HICON)winOverrideDefaultIcon(sm_cxsm);
     }
   
   if (!g_hIconX)
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index 83adf173e..ea36dd9b8 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -497,13 +497,13 @@ SetupRootMenu (unsigned long hmenuRoot)
  * Check for and return an overridden default ICON specified in the prefs
  */
 unsigned long
-winOverrideDefaultIcon()
+winOverrideDefaultIcon(int size)
 {
   HICON hicon;
   
   if (pref.defaultIconName[0])
     {
-      hicon = LoadImageComma (pref.defaultIconName, 0, 0, LR_DEFAULTSIZE);
+      hicon = LoadImageComma (pref.defaultIconName, size, size, 0);
       if (hicon==NULL)
         ErrorF ("winOverrideDefaultIcon: LoadImageComma(%s) failed\n",
 		pref.defaultIconName);
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index ef9c412c6..eb8867907 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -157,5 +157,5 @@ unsigned long
 winTaskbarIcon(void);
 
 unsigned long
-winOverrideDefaultIcon(void);
+winOverrideDefaultIcon(int size);
 #endif