diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index 5748d17ff..e9bdce7c6 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-05  Jens Granseuer  <jensgr@gmx.net>
+
+	* accessibility-keyboard.c: (setup_images):
+	* gnome-accessibility-keyboard-properties.glade: set button images
+	via code instead of relying on glade, so they respect the
+	gtk-button-images xsetting (bug #362880)
+
 2007-04-27  Rodrigo Moya <rodrigo@gnome-db.org>
 
 	* accessibility-keyboard.desktop.in.in: renamed Bugzilla product.
diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c
index cb3263e39..f7561a6f0 100644
--- a/capplets/accessibility/keyboard/accessibility-keyboard.c
+++ b/capplets/accessibility/keyboard/accessibility-keyboard.c
@@ -225,12 +225,20 @@ setup_ranges (GladeXML *dialog, GConfChangeSet *changeset)
 static void
 setup_images (GladeXML *dialog)
 {
+	GtkWidget *image;
 	int i = G_N_ELEMENTS (features);
+
 	while (i-- > 0)
-		if (features [i].image != NULL) 
-			gtk_image_set_from_stock (GTK_IMAGE (WID (features [i].image)),	
-						  features [i].image_file, 
+		if (features [i].image != NULL)
+			gtk_image_set_from_stock (GTK_IMAGE (WID (features [i].image)),
+						  features [i].image_file,
 						  keyboard_capplet_icon_get_size ());
+
+	image = gtk_image_new_from_stock (GTK_STOCK_REVERT_TO_SAVED, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image (GTK_BUTTON (WID ("load_CDE_file")), image);
+
+	image = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image (GTK_BUTTON (WID ("launch_mouse_capplet")), image);
 }
 
 static void
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
index 9730e16d2..c06a578b9 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
@@ -311,62 +311,8 @@
 				      <property name="can_default">True</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment4">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">0</property>
-					  <property name="yscale">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox4">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">2</property>
-
-					      <child>
-						<widget class="GtkImage" id="image2">
-						  <property name="visible">True</property>
-						  <property name="stock">gtk-revert-to-saved</property>
-						  <property name="icon_size">4</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label35">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">_Import Feature Settings...</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
+				      <property name="label" translatable="yes">_Import Feature Settings...</property>
+				      <property name="use_underline">True</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1987,62 +1933,8 @@
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment6">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox16">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image5">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-jump-to</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label73">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Mouse _Preferences...</property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
+			      <property name="label" translatable="yes">Mouse _Preferences...</property>
+			      <property name="use_underline">True</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>