diff --git a/ChangeLog b/ChangeLog
index 41753e361f..ef3b3419fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-12  Sven Neumann  <sven@gimp.org>
+
+	* app/widgets/gimpaction.c (gimp_action_set_proxy): use a larger
+	icon size for GimpImagefile views.
+
+	* themes/Default/images/stock-frame-64.png: removed the 1 pixel
+	wide empty border around the frame.
+
+	* app/widgets/gimpviewrenderer-frame.c: adjusted the hardcoded values.
+
 2004-10-12  Sven Neumann  <sven@gimp.org>
 
 	* Makefile.am: defined DISTCHECK_CONFIGURE_FLAGS with the
diff --git a/app/widgets/gimpaction.c b/app/widgets/gimpaction.c
index 78ba31e2c5..62a2f126e3 100644
--- a/app/widgets/gimpaction.c
+++ b/app/widgets/gimpaction.c
@@ -275,16 +275,14 @@ gimp_action_set_proxy (GimpAction *action,
 
       if (! area)
         {
-          GdkScreen   *screen;
-          GtkSettings *settings;
+          GdkScreen   *screen   = gtk_widget_get_screen (proxy);
+          GtkSettings *settings = gtk_settings_get_for_screen (screen);
           gint         width, height;
 
           area = gimp_color_area_new (action->color,
                                       GIMP_COLOR_AREA_SMALL_CHECKS, 0);
           gimp_color_area_set_draw_border (GIMP_COLOR_AREA (area), TRUE);
 
-          screen = gtk_widget_get_screen (area);
-          settings = gtk_settings_get_for_screen (screen);
           gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
                                              &width, &height);
 
@@ -311,20 +309,27 @@ gimp_action_set_proxy (GimpAction *action,
 
       if (! view)
         {
-          GdkScreen *screen;
-          gint       width, height;
-          gint       border_width;
+          GdkScreen   *screen   = gtk_widget_get_screen (proxy);
+          GtkSettings *settings = gtk_settings_get_for_screen (screen);
+          GtkIconSize  size;
+          gint         width, height;
+          gint         border_width;
 
-          screen = gtk_widget_get_screen (proxy);
-          gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
-                                             GTK_ICON_SIZE_MENU,
-                                             &width, &height);
+          if (GIMP_IS_IMAGEFILE (action->viewable))
+            {
+              size         = GTK_ICON_SIZE_LARGE_TOOLBAR;
+              border_width = 0;
+            }
+          else
+            {
+              size         = GTK_ICON_SIZE_MENU;
+              border_width = 1;
+            }
 
-          /*  FIXME: remove this hack  */
-          border_width = GIMP_IS_IMAGEFILE (action->viewable) ? 0 : 1;
+          gtk_icon_size_lookup_for_settings (settings, size, &width, &height);
 
           view = gimp_view_new_full (action->viewable,
-                                     width - 2, height - 2, border_width,
+                                     width, height, border_width,
                                      FALSE, FALSE, FALSE);
           gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), view);
           gtk_widget_show (view);
diff --git a/app/widgets/gimpviewrenderer-frame.c b/app/widgets/gimpviewrenderer-frame.c
index c666a51775..b5a644d785 100644
--- a/app/widgets/gimpviewrenderer-frame.c
+++ b/app/widgets/gimpviewrenderer-frame.c
@@ -205,10 +205,10 @@ gimp_view_renderer_ensure_frame (GimpViewRenderer *renderer,
                                              GTK_ICON_SIZE_DIALOG, NULL);
 
       /*  FIXME: shouldn't be hardcoded  */
-      class->frame_left   = 3;
-      class->frame_top    = 3;
-      class->frame_right  = 5;
-      class->frame_bottom = 5;
+      class->frame_left   = 2;
+      class->frame_top    = 2;
+      class->frame_right  = 4;
+      class->frame_bottom = 4;
     }
 }
 
diff --git a/themes/Default/images/stock-frame-64.png b/themes/Default/images/stock-frame-64.png
index 747a3dad1a..71513d74c2 100644
Binary files a/themes/Default/images/stock-frame-64.png and b/themes/Default/images/stock-frame-64.png differ