diff --git a/ChangeLog b/ChangeLog
index 316f70108a..8a1a647ce7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar  7 22:24:28 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkbutton.c (_gtk_button_paint): Don't use xthickness in the
+	height calculation.
+
 Sun Mar  7 14:34:04 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkfilechooserdefault.c (trap_activate_cb): stop activate
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 316f70108a..8a1a647ce7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Mar  7 22:24:28 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkbutton.c (_gtk_button_paint): Don't use xthickness in the
+	height calculation.
+
 Sun Mar  7 14:34:04 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkfilechooserdefault.c (trap_activate_cb): stop activate
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 316f70108a..8a1a647ce7 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Mar  7 22:24:28 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkbutton.c (_gtk_button_paint): Don't use xthickness in the
+	height calculation.
+
 Sun Mar  7 14:34:04 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkfilechooserdefault.c (trap_activate_cb): stop activate
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 316f70108a..8a1a647ce7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Mar  7 22:24:28 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkbutton.c (_gtk_button_paint): Don't use xthickness in the
+	height calculation.
+
 Sun Mar  7 14:34:04 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkfilechooserdefault.c (trap_activate_cb): stop activate
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 316f70108a..8a1a647ce7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Mar  7 22:24:28 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkbutton.c (_gtk_button_paint): Don't use xthickness in the
+	height calculation.
+
 Sun Mar  7 14:34:04 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/gtkfilechooserdefault.c (trap_activate_cb): stop activate
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 9a992ab8d4..c800d9d8da 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1042,7 +1042,7 @@ _gtk_button_paint (GtkButton    *button,
 	      x += widget->style->xthickness + focus_pad;
 	      y += widget->style->ythickness + focus_pad;
 	      width -= 2 * (widget->style->xthickness + focus_pad);
-	      height -=  2 * (widget->style->xthickness + focus_pad);
+	      height -=  2 * (widget->style->ythickness + focus_pad);
 	    }
 	  else
 	    {