diff -up gnome-screensaver-2.27.0/data/gnome-screensaver-preferences.ui.button-images gnome-screensaver-2.27.0/data/gnome-screensaver-preferences.ui
--- gnome-screensaver-2.27.0/data/gnome-screensaver-preferences.ui.button-images	2009-07-16 15:30:41.194368588 -0400
+++ gnome-screensaver-2.27.0/data/gnome-screensaver-preferences.ui	2009-07-16 15:29:57.822583091 -0400
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="preview_image">
+    <property name="stock">gtk-fullscreen</property>
+    <property name="icon_size">4</property>
+  </object>
+  <object class="GtkImage" id="power_image">
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">120</property>
     <property name="lower">1</property>
@@ -55,66 +63,9 @@
                 <property name="can_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <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>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox11">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image6">
-                            <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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label16">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Power _Management</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>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">power_image</property>
+                <property name="label" translatable="yes">Power _Management</property>
+                <property name="use_underline">True</property>
               </object>
             </child>
             <child>
@@ -244,66 +195,9 @@
                                     <property name="can_focus">True</property>
                                     <property name="relief">GTK_RELIEF_NORMAL</property>
                                     <property name="focus_on_click">True</property>
-                                    <child>
-                                      <object class="GtkAlignment" id="alignment1">
-                                        <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>
-                                        <property name="top_padding">0</property>
-                                        <property name="bottom_padding">0</property>
-                                        <property name="left_padding">0</property>
-                                        <property name="right_padding">0</property>
-                                        <child>
-                                          <object class="GtkHBox" id="hbox10">
-                                            <property name="visible">True</property>
-                                            <property name="homogeneous">False</property>
-                                            <property name="spacing">2</property>
-                                            <child>
-                                              <object class="GtkImage" id="image3">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-fullscreen</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>
-                                              </object>
-                                              <packing>
-                                                <property name="padding">0</property>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="preview_button_label">
-                                                <property name="visible">True</property>
-                                                <property name="label" translatable="yes">_Preview</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>
-                                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                                <property name="width_chars">-1</property>
-                                                <property name="single_line_mode">False</property>
-                                                <property name="angle">0</property>
-                                              </object>
-                                              <packing>
-                                                <property name="padding">0</property>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
+                                    <property name="image">preview_image</property>
+                                    <property name="label" translatable="yes">_Preview</property>
+                                    <property name="use_underline">True</property>
                                   </object>
                                 </child>
                               </object>