diff --git a/ChangeLog b/ChangeLog
index 2f4008c876..ec8842a295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-09-13  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkexpander.c: 
+	* gtk/gtktreeview.c: Change the default expander size to 12 to compensate 
+	for the recent change to gtk_default_draw_expander().
+
+	* gtk/gtkstyle.c (gtk_default_draw_expander): Use a linewidth of one
+	for expander sizes up to 16.
+
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_get_model): Resize the
 	popup if the model is replaced.  (#152333)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2f4008c876..ec8842a295 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2004-09-13  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkexpander.c: 
+	* gtk/gtktreeview.c: Change the default expander size to 12 to compensate 
+	for the recent change to gtk_default_draw_expander().
+
+	* gtk/gtkstyle.c (gtk_default_draw_expander): Use a linewidth of one
+	for expander sizes up to 16.
+
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_get_model): Resize the
 	popup if the model is replaced.  (#152333)
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2f4008c876..ec8842a295 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,12 @@
 2004-09-13  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkexpander.c: 
+	* gtk/gtktreeview.c: Change the default expander size to 12 to compensate 
+	for the recent change to gtk_default_draw_expander().
+
+	* gtk/gtkstyle.c (gtk_default_draw_expander): Use a linewidth of one
+	for expander sizes up to 16.
+
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_get_model): Resize the
 	popup if the model is replaced.  (#152333)
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2f4008c876..ec8842a295 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,12 @@
 2004-09-13  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkexpander.c: 
+	* gtk/gtktreeview.c: Change the default expander size to 12 to compensate 
+	for the recent change to gtk_default_draw_expander().
+
+	* gtk/gtkstyle.c (gtk_default_draw_expander): Use a linewidth of one
+	for expander sizes up to 16.
+
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_get_model): Resize the
 	popup if the model is replaced.  (#152333)
 
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index c64dc312be..4a6964090c 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -5040,7 +5040,7 @@ gtk_default_draw_expander (GtkStyle        *style,
   gtk_widget_style_get (widget,
 			"expander-size", &expander_size,
 			NULL);
-  line_width = MAX (1, expander_size/7);
+  line_width = MAX (1, expander_size/9);
 
   if (area)
     {
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 3746ad5632..2f401ebaeb 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -692,7 +692,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                            G_PARAM_READWRITE));
 
   /* Style properties */
-#define _TREE_VIEW_EXPANDER_SIZE 10
+#define _TREE_VIEW_EXPANDER_SIZE 12
 #define _TREE_VIEW_VERTICAL_SEPARATOR 2
 #define _TREE_VIEW_HORIZONTAL_SEPARATOR 2