diff --git a/ChangeLog b/ChangeLog
index 331c13802..4ef1d9c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-01 20:17-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSApplication.m: Fix bug #24643.   Application icon is no
+	stored correctly.
+
 2009-03-01 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Resources/English.lproj/Localizable.strings: Regenerate this file.
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 5d6269d7b..0d09a3f87 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -955,11 +955,13 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
     {
       image = [NSImage imageNamed: @"GNUstep"];
     }
+
+  [self setApplicationIconImage: image];
+
   if (![defs boolForKey: @"GSSuppressAppIcon"])
     {
       [self _appIconInit];
     }
-  [self setApplicationIconImage: image];
 
   mainModelFile = [infoDict objectForKey: @"NSMainNibFile"];
   if (mainModelFile != nil && [mainModelFile isEqual: @""] == NO)
@@ -2179,7 +2181,7 @@ image.</p><p>See Also: -applicationIconImage</p>
   NSEnumerator	*iterator = [[self windows] objectEnumerator];
   NSWindow	*current;
   NSImage	*old_app_icon = _app_icon;
-  NSSize        miniWindowSize;
+  NSSize        miniWindowSize = [GSCurrentServer() iconSize];
   NSSize        imageSize = [anImage size];
 
   RETAIN(old_app_icon);
@@ -2187,18 +2189,10 @@ image.</p><p>See Also: -applicationIconImage</p>
   [anImage setName: @"NSApplicationIcon"];
   [anImage setScalesWhenResized: YES];
 
-  if (_app_icon_window == nil)
+  if (miniWindowSize.width <= 0 || miniWindowSize.height <= 0) 
     {
       miniWindowSize = NSMakeSize(48, 48);
     }
-  else
-    {
-      miniWindowSize = [_app_icon_window frame].size;
-      if (miniWindowSize.width <= 0 || miniWindowSize.height <= 0) 
-	{
-	  miniWindowSize = NSMakeSize(48, 48);
-	}
-    }
 
   // restrict size when the icon is larger than the mini window.
   if (imageSize.width > miniWindowSize.width