diff --git a/ChangeLog b/ChangeLog
index 8c8c51c085..80a2c7dea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-27  Sven Neumann  <sven@gimp.org>
+
+	* libgimp/gimpbrushmenu.c
+	* libgimp/gimppatternmenu.c: attempt to make the brush and pattern
+	selectors look less like buttons (supposed to fix bug #147777).
+
 2004-07-27  Sven Neumann  <sven@gimp.org>
 
 	* libgimpwidgets/gimpcolorhexentry.c (gimp_color_hex_entry_events):
diff --git a/libgimp/gimpbrushmenu.c b/libgimp/gimpbrushmenu.c
index 07cb5fff6c..2e604bfcd2 100644
--- a/libgimp/gimpbrushmenu.c
+++ b/libgimp/gimpbrushmenu.c
@@ -137,11 +137,11 @@ gimp_brush_select_widget_new (const gchar          *title,
   brush_sel->callback = callback;
   brush_sel->data     = data;
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_hbox_new (FALSE, 6);
 
   frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_OUT);
-  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+  gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
   brush_sel->preview = gtk_preview_new (GTK_PREVIEW_GRAYSCALE);
@@ -159,7 +159,7 @@ gimp_brush_select_widget_new (const gchar          *title,
                     brush_sel);
 
   brush_sel->button = gtk_button_new_with_mnemonic (_("_Browse..."));
-  gtk_box_pack_end (GTK_BOX (hbox), brush_sel->button, FALSE, FALSE, 0);
+  gtk_box_pack_end (GTK_BOX (hbox), brush_sel->button, TRUE, TRUE, 0);
   gtk_widget_show (brush_sel->button);
 
   g_signal_connect (brush_sel->button, "clicked",
diff --git a/libgimp/gimppatternmenu.c b/libgimp/gimppatternmenu.c
index edca4577e0..3bc46bc1e3 100644
--- a/libgimp/gimppatternmenu.c
+++ b/libgimp/gimppatternmenu.c
@@ -120,11 +120,11 @@ gimp_pattern_select_widget_new (const gchar            *title,
   pattern_sel->callback = callback;
   pattern_sel->data     = data;
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_hbox_new (FALSE, 6);
 
   frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+  gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
   pattern_sel->preview = gtk_preview_new (GTK_PREVIEW_COLOR);
@@ -142,7 +142,7 @@ gimp_pattern_select_widget_new (const gchar            *title,
                     pattern_sel);
 
   pattern_sel->button = gtk_button_new_with_mnemonic (_("_Browse..."));
-  gtk_box_pack_start (GTK_BOX (hbox), pattern_sel->button, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), pattern_sel->button, TRUE, TRUE, 0);
   gtk_widget_show (pattern_sel->button);
 
   g_signal_connect (pattern_sel->button, "clicked",