diff --git a/ChangeLog b/ChangeLog
index d7ca83727..92f8ca265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
+2011-03-14  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSSavePanel.m (-_initWithoutGModel): Use an image view
+	instead of a button to display the application icon. That way
+	icons get scaled correctly.
+	Patch by Philippe Roussel <p.o.roussel@free.fr>.
+
 2011-03-14  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* Resources/GNUmakefile
 	(gui-resources_RESOURCE_FILES_INSTALL_DIR): Removed.
 	* Source/GNUmakefile
 	(libgui-resources_RESOURCE_FILES_INSTALL_DIR): Removed.
-	
+
 2011-03-14  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/NSLayoutManager.m: Don't draw spelling underlines
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index e854d817a..2e9c15150 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -181,6 +181,7 @@ setPath(NSBrowser *browser, NSString *path)
   NSBox *bar;
   NSButton *button;
   NSImage *image;
+  NSImageView *imageView;
   NSRect r;
   id lastKeyView;
 
@@ -342,17 +343,13 @@ setPath(NSBrowser *browser, NSString *path)
   [_browser setTarget: _okButton];
 
   r = NSMakeRect (8, 261, 48, 48);
-  button = [[NSButton alloc] initWithFrame: r]; 
   image = [[NSApplication sharedApplication] applicationIconImage];
-  [button setImage: image];
-  [button setBordered: NO];
-  [button setEnabled: NO];
-  [[button cell] setImageDimsWhenDisabled: NO];
-  [button setImagePosition: NSImageOnly];
-  [button setAutoresizingMask: NSViewMinYMargin];
-  [button setTag: NSFileHandlingPanelImageButton];
-  [_topView addSubview: button];
-  [button release];
+  imageView = [[NSImageView alloc] initWithFrame: r];
+  [imageView setAutoresizingMask: NSViewMinYMargin];
+  [imageView setImage:image];
+  [imageView setTag: NSFileHandlingPanelImageButton];
+  [_topView addSubview: imageView];
+  [imageView release];
 
   r = NSMakeRect (67, 276, 200, 14);
   _titleField = [[NSTextField alloc] initWithFrame: r];