99584a6
diff -up seahorse-2.27.90/pgp/seahorse-pgp-generate.xml.button-images seahorse-2.27.90/pgp/seahorse-pgp-generate.xml
99584a6
--- seahorse-2.27.90/pgp/seahorse-pgp-generate.xml.button-images	2009-08-26 21:39:37.422275977 -0400
99584a6
+++ seahorse-2.27.90/pgp/seahorse-pgp-generate.xml	2009-08-26 21:40:45.744025040 -0400
99584a6
@@ -2,6 +2,10 @@
99584a6
 <interface>
99584a6
   <requires lib="gtk+" version="2.16"/>
99584a6
   
99584a6
+  <object class="GtkImage" id="create-image">
99584a6
+    <property name="stock">gtk-ok</property>
99584a6
+    <property name="icon-size">4</property>
99584a6
+  </object>
99584a6
   <object class="GtkAdjustment" id="adjustment1">
99584a6
     <property name="value">2048</property>
99584a6
     <property name="lower">512</property>
99584a6
@@ -390,43 +394,9 @@
99584a6
                 <property name="has_default">True</property>
99584a6
                 <property name="receives_default">False</property>
99584a6
                 <property name="tooltip_text" translatable="yes">Generate a new key</property>
99584a6
-                <child>
99584a6
-                  <object class="GtkAlignment" id="alignment1">
99584a6
-                    <property name="visible">True</property>
99584a6
-                    <property name="xscale">0</property>
99584a6
-                    <property name="yscale">0</property>
99584a6
-                    <child>
99584a6
-                      <object class="GtkHBox" id="hbox1">
99584a6
-                        <property name="visible">True</property>
99584a6
-                        <property name="spacing">2</property>
99584a6
-                        <child>
99584a6
-                          <object class="GtkImage" id="image1">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="stock">gtk-ok</property>
99584a6
-                            <property name="icon-size">4</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                            <property name="position">0</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                        <child>
99584a6
-                          <object class="GtkLabel" id="label44">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="label" translatable="yes">C_reate</property>
99584a6
-                            <property name="use_underline">True</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                            <property name="position">1</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                      </object>
99584a6
-                    </child>
99584a6
-                  </object>
99584a6
-                </child>
99584a6
+                <property name="image">create-image</property>
99584a6
+                <property name="label" translatable="yes">C_reate</property>
99584a6
+                <property name="use_underline">True</property>
99584a6
               </object>
99584a6
               <packing>
99584a6
                 <property name="expand">False</property>
99584a6
diff -up seahorse-2.27.90/src/seahorse-generate-select.xml.button-images seahorse-2.27.90/src/seahorse-generate-select.xml
99584a6
--- seahorse-2.27.90/src/seahorse-generate-select.xml.button-images	2009-08-26 21:36:47.399038000 -0400
99584a6
+++ seahorse-2.27.90/src/seahorse-generate-select.xml	2009-08-26 21:38:14.801034610 -0400
99584a6
@@ -1,6 +1,10 @@
99584a6
 
99584a6
 
99584a6
 <interface>
99584a6
+  <object class="GtkImage" id="continue-image">
99584a6
+    <property name="stock">gtk-go-forward</property>
99584a6
+    <property name="icon_size">4</property>
99584a6
+  </object>
99584a6
   <object class="GtkDialog" id="generate-select">
99584a6
     <property name="border_width">6</property>
99584a6
     <property name="visible">True</property>
99584a6
@@ -47,66 +51,9 @@
99584a6
                 <property name="can_focus">True</property>
99584a6
                 <property name="relief">GTK_RELIEF_NORMAL</property>
99584a6
                 <property name="focus_on_click">True</property>
99584a6
-                <child>
99584a6
-                  <object class="GtkAlignment" id="alignment2">
99584a6
-                    <property name="visible">True</property>
99584a6
-                    <property name="xalign">0.5</property>
99584a6
-                    <property name="yalign">0.5</property>
99584a6
-                    <property name="xscale">0</property>
99584a6
-                    <property name="yscale">0</property>
99584a6
-                    <property name="top_padding">0</property>
99584a6
-                    <property name="bottom_padding">0</property>
99584a6
-                    <property name="left_padding">0</property>
99584a6
-                    <property name="right_padding">0</property>
99584a6
-                    <child>
99584a6
-                      <object class="GtkHBox" id="hbox2">
99584a6
-                        <property name="visible">True</property>
99584a6
-                        <property name="homogeneous">False</property>
99584a6
-                        <property name="spacing">2</property>
99584a6
-                        <child>
99584a6
-                          <object class="GtkImage" id="image2">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="stock">gtk-go-forward</property>
99584a6
-                            <property name="icon_size">4</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                        <child>
99584a6
-                          <object class="GtkLabel" id="label3">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="label" translatable="yes">C_ontinue</property>
99584a6
-                            <property name="use_underline">True</property>
99584a6
-                            <property name="use_markup">False</property>
99584a6
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
99584a6
-                            <property name="wrap">False</property>
99584a6
-                            <property name="selectable">False</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
99584a6
-                            <property name="width_chars">-1</property>
99584a6
-                            <property name="single_line_mode">False</property>
99584a6
-                            <property name="angle">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                      </object>
99584a6
-                    </child>
99584a6
-                  </object>
99584a6
-                </child>
99584a6
+                <property name="image">continue-image</property>
99584a6
+                <property name="label" translatable="yes">C_ontinue</property>
99584a6
+                <property name="use_underline">True</property>
99584a6
               </object>
99584a6
             </child>
99584a6
           </object>
99584a6
diff -up seahorse-2.27.90/src/seahorse-keyserver-search.xml.button-images seahorse-2.27.90/src/seahorse-keyserver-search.xml
99584a6
--- seahorse-2.27.90/src/seahorse-keyserver-search.xml.button-images	2009-08-26 21:25:59.739022563 -0400
99584a6
+++ seahorse-2.27.90/src/seahorse-keyserver-search.xml	2009-08-26 21:27:26.426024597 -0400
99584a6
@@ -2,6 +2,10 @@
99584a6
 <interface>
99584a6
   <requires lib="gtk+" version="2.16"/>
99584a6
   
99584a6
+  <object class="GtkImage" id="search-image">
99584a6
+    <property name="stock">gtk-find</property>
99584a6
+    <property name="icon-size">4</property>
99584a6
+  </object>
99584a6
   <object class="GtkDialog" id="keyserver-search">
99584a6
     <property name="visible">True</property>
99584a6
     <property name="border_width">5</property>
99584a6
@@ -211,44 +215,10 @@
99584a6
                 <property name="can_default">True</property>
99584a6
                 <property name="has_default">True</property>
99584a6
                 <property name="receives_default">False</property>
99584a6
+                <property name="image">search-image</property>
99584a6
+                <property name="label" translatable="yes">_Search</property>
99584a6
+                <property name="use_underline">True</property>
99584a6
                 <signal name="clicked" handler="on_keyserver_search_ok_clicked"/>
99584a6
-                <child>
99584a6
-                  <object class="GtkAlignment" id="alignment4">
99584a6
-                    <property name="visible">True</property>
99584a6
-                    <property name="xscale">0</property>
99584a6
-                    <property name="yscale">0</property>
99584a6
-                    <child>
99584a6
-                      <object class="GtkHBox" id="hbox7">
99584a6
-                        <property name="visible">True</property>
99584a6
-                        <property name="spacing">2</property>
99584a6
-                        <child>
99584a6
-                          <object class="GtkImage" id="image5">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="stock">gtk-find</property>
99584a6
-                            <property name="icon-size">4</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                            <property name="position">0</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                        <child>
99584a6
-                          <object class="GtkLabel" id="label14">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="label" translatable="yes">_Search</property>
99584a6
-                            <property name="use_underline">True</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                            <property name="position">1</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                      </object>
99584a6
-                    </child>
99584a6
-                  </object>
99584a6
-                </child>
99584a6
               </object>
99584a6
               <packing>
99584a6
                 <property name="expand">False</property>
99584a6
diff -up seahorse-2.27.90/src/seahorse-keyserver-sync.xml.button-images seahorse-2.27.90/src/seahorse-keyserver-sync.xml
99584a6
--- seahorse-2.27.90/src/seahorse-keyserver-sync.xml.button-images	2009-08-26 21:28:57.566027136 -0400
99584a6
+++ seahorse-2.27.90/src/seahorse-keyserver-sync.xml	2009-08-26 21:31:55.773285847 -0400
99584a6
@@ -1,6 +1,14 @@
99584a6
 
99584a6
 
99584a6
 <interface>
99584a6
+  <object class="GtkImage" id="configure-image">
99584a6
+    <property name="stock">gtk-properties</property>
99584a6
+    <property name="icon_size">4</property>
99584a6
+  </object>
99584a6
+  <object class="GtkImage" id="sync-image">
99584a6
+    <property name="stock">gtk-refresh</property>
99584a6
+    <property name="icon_size">4</property>
99584a6
+  </object>
99584a6
   <object class="GtkDialog" id="keyserver-sync">
99584a6
     <property name="border_width">5</property>
99584a6
     <property name="visible">True</property>
99584a6
@@ -34,67 +42,10 @@
99584a6
                 <property name="can_focus">True</property>
99584a6
                 <property name="relief">GTK_RELIEF_NORMAL</property>
99584a6
                 <property name="focus_on_click">True</property>
99584a6
+                <property name="image">configure-image</property>
99584a6
+                <property name="label" translatable="yes">_Key Servers</property>
99584a6
+                <property name="use_underline">True</property>
99584a6
                 <signal handler="on_sync_configure_clicked" last_modification_time="Sun, 03 Apr 2005 22:45:26 GMT" name="clicked"/>
99584a6
-                <child>
99584a6
-                  <object class="GtkAlignment" id="alignment3">
99584a6
-                    <property name="visible">True</property>
99584a6
-                    <property name="xalign">0.5</property>
99584a6
-                    <property name="yalign">0.5</property>
99584a6
-                    <property name="xscale">0</property>
99584a6
-                    <property name="yscale">0</property>
99584a6
-                    <property name="top_padding">0</property>
99584a6
-                    <property name="bottom_padding">0</property>
99584a6
-                    <property name="left_padding">0</property>
99584a6
-                    <property name="right_padding">0</property>
99584a6
-                    <child>
99584a6
-                      <object class="GtkHBox" id="hbox5">
99584a6
-                        <property name="visible">True</property>
99584a6
-                        <property name="homogeneous">False</property>
99584a6
-                        <property name="spacing">2</property>
99584a6
-                        <child>
99584a6
-                          <object class="GtkImage" id="image4">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="stock">gtk-properties</property>
99584a6
-                            <property name="icon_size">4</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                        <child>
99584a6
-                          <object class="GtkLabel" id="label12">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="label" translatable="yes">_Key Servers</property>
99584a6
-                            <property name="use_underline">True</property>
99584a6
-                            <property name="use_markup">False</property>
99584a6
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
99584a6
-                            <property name="wrap">False</property>
99584a6
-                            <property name="selectable">False</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
99584a6
-                            <property name="width_chars">-1</property>
99584a6
-                            <property name="single_line_mode">False</property>
99584a6
-                            <property name="angle">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                      </object>
99584a6
-                    </child>
99584a6
-                  </object>
99584a6
-                </child>
99584a6
               </object>
99584a6
             </child>
99584a6
             <child>
99584a6
@@ -118,67 +69,10 @@
99584a6
                 <property name="has_focus">True</property>
99584a6
                 <property name="relief">GTK_RELIEF_NORMAL</property>
99584a6
                 <property name="focus_on_click">True</property>
99584a6
+                <property name="image">sync-image</property>
99584a6
+                <property name="label" translatable="yes">_Sync</property>
99584a6
+                <property name="use_underline">True</property>
99584a6
                 <signal handler="on_sync_ok_clicked" last_modification_time="Wed, 31 Dec 2003 00:41:45 GMT" name="clicked"/>
99584a6
-                <child>
99584a6
-                  <object class="GtkAlignment" id="alignment4">
99584a6
-                    <property name="visible">True</property>
99584a6
-                    <property name="xalign">0.5</property>
99584a6
-                    <property name="yalign">0.5</property>
99584a6
-                    <property name="xscale">0</property>
99584a6
-                    <property name="yscale">0</property>
99584a6
-                    <property name="top_padding">0</property>
99584a6
-                    <property name="bottom_padding">0</property>
99584a6
-                    <property name="left_padding">0</property>
99584a6
-                    <property name="right_padding">0</property>
99584a6
-                    <child>
99584a6
-                      <object class="GtkHBox" id="hbox6">
99584a6
-                        <property name="visible">True</property>
99584a6
-                        <property name="homogeneous">False</property>
99584a6
-                        <property name="spacing">2</property>
99584a6
-                        <child>
99584a6
-                          <object class="GtkImage" id="image5">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="stock">gtk-refresh</property>
99584a6
-                            <property name="icon_size">4</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                        <child>
99584a6
-                          <object class="GtkLabel" id="label13">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="label" translatable="yes">_Sync</property>
99584a6
-                            <property name="use_underline">True</property>
99584a6
-                            <property name="use_markup">False</property>
99584a6
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
99584a6
-                            <property name="wrap">False</property>
99584a6
-                            <property name="selectable">False</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
99584a6
-                            <property name="width_chars">-1</property>
99584a6
-                            <property name="single_line_mode">False</property>
99584a6
-                            <property name="angle">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                      </object>
99584a6
-                    </child>
99584a6
-                  </object>
99584a6
-                </child>
99584a6
               </object>
99584a6
             </child>
99584a6
           </object>
99584a6
diff -up seahorse-2.27.90/ssh/seahorse-ssh-generate.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-generate.xml
99584a6
--- seahorse-2.27.90/ssh/seahorse-ssh-generate.xml.button-images	2009-08-26 21:42:10.095030435 -0400
99584a6
+++ seahorse-2.27.90/ssh/seahorse-ssh-generate.xml	2009-08-26 21:47:24.770274900 -0400
99584a6
@@ -1,6 +1,10 @@
99584a6
 
99584a6
 
99584a6
 <interface>
99584a6
+  <object class="GtkImage" id="create-image">
99584a6
+    <property name="stock">gtk-ok</property>
99584a6
+    <property name="icon_size">4</property>
99584a6
+  </object>
99584a6
   <object class="GtkAdjustment" id="adjustment1">
99584a6
     <property name="upper">8192</property>
99584a6
     <property name="lower">512</property>
99584a6
@@ -80,66 +84,9 @@
99584a6
                 <property name="can_focus">True</property>
99584a6
                 <property name="relief">GTK_RELIEF_NORMAL</property>
99584a6
                 <property name="focus_on_click">True</property>
99584a6
-                <child>
99584a6
-                  <object class="GtkAlignment" id="alignment6">
99584a6
-                    <property name="visible">True</property>
99584a6
-                    <property name="xalign">0.5</property>
99584a6
-                    <property name="yalign">0.5</property>
99584a6
-                    <property name="xscale">0</property>
99584a6
-                    <property name="yscale">0</property>
99584a6
-                    <property name="top_padding">0</property>
99584a6
-                    <property name="bottom_padding">0</property>
99584a6
-                    <property name="left_padding">0</property>
99584a6
-                    <property name="right_padding">0</property>
99584a6
-                    <child>
99584a6
-                      <object class="GtkHBox" id="hbox3">
99584a6
-                        <property name="visible">True</property>
99584a6
-                        <property name="homogeneous">False</property>
99584a6
-                        <property name="spacing">2</property>
99584a6
-                        <child>
99584a6
-                          <object class="GtkImage" id="image2">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="stock">gtk-ok</property>
99584a6
-                            <property name="icon_size">4</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                        <child>
99584a6
-                          <object class="GtkLabel" id="label55">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="label" translatable="yes">_Create and Set Up</property>
99584a6
-                            <property name="use_underline">True</property>
99584a6
-                            <property name="use_markup">False</property>
99584a6
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
99584a6
-                            <property name="wrap">False</property>
99584a6
-                            <property name="selectable">False</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
99584a6
-                            <property name="width_chars">-1</property>
99584a6
-                            <property name="single_line_mode">False</property>
99584a6
-                            <property name="angle">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                      </object>
99584a6
-                    </child>
99584a6
-                  </object>
99584a6
-                </child>
99584a6
+                <property name="image">create-image</property>
99584a6
+                <property name="label" translatable="yes">_Create and Set Up</property>
99584a6
+                <property name="use_underline">True</property>
99584a6
               </object>
99584a6
             </child>
99584a6
           </object>
99584a6
@@ -195,7 +142,7 @@
99584a6
                     <property name="homogeneous">False</property>
99584a6
                     <property name="spacing">12</property>
99584a6
                     <child>
99584a6
-                      <object class="GtkHBox" id="hbox4">
99584a6
+                      <object class="GtkHBox" id="hbox41">
99584a6
                         <property name="visible">True</property>
99584a6
                         <property name="homogeneous">False</property>
99584a6
                         <property name="spacing">12</property>
99584a6
diff -up seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml
99584a6
--- seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml.button-images	2009-08-26 21:18:32.452275545 -0400
99584a6
+++ seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml	2009-08-26 21:23:55.993025066 -0400
99584a6
@@ -2,6 +2,14 @@
99584a6
 <interface>
99584a6
   <requires lib="gtk+" version="2.16"/>
99584a6
   
99584a6
+  <object class="GtkImage" id="passphrase-image">
99584a6
+    <property name="stock">gtk-edit</property>
99584a6
+    <property name="icon-size">4</property>
99584a6
+  </object>
99584a6
+  <object class="GtkImage" id="export-image">
99584a6
+    <property name="stock">gtk-save-as</property>
99584a6
+    <property name="icon-size">4</property>
99584a6
+  </object>
99584a6
   <object class="GtkDialog" id="ssh-key-properties">
99584a6
     <property name="visible">True</property>
99584a6
     <property name="border_width">5</property>
99584a6
@@ -190,44 +198,10 @@
99584a6
                         <property name="visible">True</property>
99584a6
                         <property name="can_focus">True</property>
99584a6
                         <property name="receives_default">False</property>
99584a6
+                        <property name="image">passphrase-image</property>
99584a6
+                        <property name="label" translatable="yes">Change _Passphrase</property>
99584a6
+                        <property name="use_underline">True</property>
99584a6
                         <signal name="clicked" handler="on_ssh_passphrase_button_clicked"/>
99584a6
-                        <child>
99584a6
-                          <object class="GtkAlignment" id="alignment43">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="xscale">0</property>
99584a6
-                            <property name="yscale">0</property>
99584a6
-                            <child>
99584a6
-                              <object class="GtkHBox" id="hbox58">
99584a6
-                                <property name="visible">True</property>
99584a6
-                                <property name="spacing">2</property>
99584a6
-                                <child>
99584a6
-                                  <object class="GtkImage" id="image38">
99584a6
-                                    <property name="visible">True</property>
99584a6
-                                    <property name="stock">gtk-edit</property>
99584a6
-                                    <property name="icon-size">4</property>
99584a6
-                                  </object>
99584a6
-                                  <packing>
99584a6
-                                    <property name="expand">False</property>
99584a6
-                                    <property name="fill">False</property>
99584a6
-                                    <property name="position">0</property>
99584a6
-                                  </packing>
99584a6
-                                </child>
99584a6
-                                <child>
99584a6
-                                  <object class="GtkLabel" id="label22224">
99584a6
-                                    <property name="visible">True</property>
99584a6
-                                    <property name="label" translatable="yes">Change _Passphrase</property>
99584a6
-                                    <property name="use_underline">True</property>
99584a6
-                                  </object>
99584a6
-                                  <packing>
99584a6
-                                    <property name="expand">False</property>
99584a6
-                                    <property name="fill">False</property>
99584a6
-                                    <property name="position">1</property>
99584a6
-                                  </packing>
99584a6
-                                </child>
99584a6
-                              </object>
99584a6
-                            </child>
99584a6
-                          </object>
99584a6
-                        </child>
99584a6
                       </object>
99584a6
                     </child>
99584a6
                   </object>
99584a6
@@ -494,44 +468,10 @@
99584a6
                         <property name="visible">True</property>
99584a6
                         <property name="can_focus">True</property>
99584a6
                         <property name="receives_default">False</property>
99584a6
+                        <property name="image">export-image</property>
99584a6
+                        <property name="label" translatable="yes">E_xport Complete Key</property>
99584a6
+                        <property name="use_underline">True</property>
99584a6
                         <signal name="clicked" handler="on_ssh_export_button_clicked"/>
99584a6
-                        <child>
99584a6
-                          <object class="GtkAlignment" id="alignment45">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="xscale">0</property>
99584a6
-                            <property name="yscale">0</property>
99584a6
-                            <child>
99584a6
-                              <object class="GtkHBox" id="hbox59">
99584a6
-                                <property name="visible">True</property>
99584a6
-                                <property name="spacing">2</property>
99584a6
-                                <child>
99584a6
-                                  <object class="GtkImage" id="image39">
99584a6
-                                    <property name="visible">True</property>
99584a6
-                                    <property name="stock">gtk-save-as</property>
99584a6
-                                    <property name="icon-size">4</property>
99584a6
-                                  </object>
99584a6
-                                  <packing>
99584a6
-                                    <property name="expand">False</property>
99584a6
-                                    <property name="fill">False</property>
99584a6
-                                    <property name="position">0</property>
99584a6
-                                  </packing>
99584a6
-                                </child>
99584a6
-                                <child>
99584a6
-                                  <object class="GtkLabel" id="label22225">
99584a6
-                                    <property name="visible">True</property>
99584a6
-                                    <property name="label" translatable="yes">E_xport Complete Key</property>
99584a6
-                                    <property name="use_underline">True</property>
99584a6
-                                  </object>
99584a6
-                                  <packing>
99584a6
-                                    <property name="expand">False</property>
99584a6
-                                    <property name="fill">False</property>
99584a6
-                                    <property name="position">1</property>
99584a6
-                                  </packing>
99584a6
-                                </child>
99584a6
-                              </object>
99584a6
-                            </child>
99584a6
-                          </object>
99584a6
-                        </child>
99584a6
                       </object>
99584a6
                     </child>
99584a6
                   </object>
99584a6
diff -up seahorse-2.27.90/ssh/seahorse-ssh-upload.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-upload.xml
99584a6
--- seahorse-2.27.90/ssh/seahorse-ssh-upload.xml.button-images	2009-08-26 21:35:42.777271303 -0400
99584a6
+++ seahorse-2.27.90/ssh/seahorse-ssh-upload.xml	2009-08-26 21:35:22.230287488 -0400
99584a6
@@ -1,6 +1,10 @@
99584a6
 
99584a6
 
99584a6
 <interface>
99584a6
+  <object class="GtkImage" id="setup-image">
99584a6
+    <property name="stock">gtk-go-up</property>
99584a6
+    <property name="icon_size">4</property>
99584a6
+  </object>
99584a6
   <object class="GtkDialog" id="ssh-upload">
99584a6
     <property name="border_width">5</property>
99584a6
     <property name="title" translatable="yes">Set Up Computer for SSH Connection</property>
99584a6
@@ -48,66 +52,9 @@
99584a6
                 <property name="has_focus">True</property>
99584a6
                 <property name="relief">GTK_RELIEF_NORMAL</property>
99584a6
                 <property name="focus_on_click">True</property>
99584a6
-                <child>
99584a6
-                  <object class="GtkAlignment" id="alignment1">
99584a6
-                    <property name="visible">True</property>
99584a6
-                    <property name="xalign">0.5</property>
99584a6
-                    <property name="yalign">0.5</property>
99584a6
-                    <property name="xscale">0</property>
99584a6
-                    <property name="yscale">0</property>
99584a6
-                    <property name="top_padding">0</property>
99584a6
-                    <property name="bottom_padding">0</property>
99584a6
-                    <property name="left_padding">0</property>
99584a6
-                    <property name="right_padding">0</property>
99584a6
-                    <child>
99584a6
-                      <object class="GtkHBox" id="hbox4">
99584a6
-                        <property name="visible">True</property>
99584a6
-                        <property name="homogeneous">False</property>
99584a6
-                        <property name="spacing">2</property>
99584a6
-                        <child>
99584a6
-                          <object class="GtkImage" id="image2">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="stock">gtk-go-up</property>
99584a6
-                            <property name="icon_size">4</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                        <child>
99584a6
-                          <object class="GtkLabel" id="label6">
99584a6
-                            <property name="visible">True</property>
99584a6
-                            <property name="label" translatable="yes">_Set Up</property>
99584a6
-                            <property name="use_underline">True</property>
99584a6
-                            <property name="use_markup">False</property>
99584a6
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
99584a6
-                            <property name="wrap">False</property>
99584a6
-                            <property name="selectable">False</property>
99584a6
-                            <property name="xalign">0.5</property>
99584a6
-                            <property name="yalign">0.5</property>
99584a6
-                            <property name="xpad">0</property>
99584a6
-                            <property name="ypad">0</property>
99584a6
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
99584a6
-                            <property name="width_chars">-1</property>
99584a6
-                            <property name="single_line_mode">False</property>
99584a6
-                            <property name="angle">0</property>
99584a6
-                          </object>
99584a6
-                          <packing>
99584a6
-                            <property name="padding">0</property>
99584a6
-                            <property name="expand">False</property>
99584a6
-                            <property name="fill">False</property>
99584a6
-                          </packing>
99584a6
-                        </child>
99584a6
-                      </object>
99584a6
-                    </child>
99584a6
-                  </object>
99584a6
-                </child>
99584a6
+                <property name="image">setup-image</property>
99584a6
+                <property name="label" translatable="yes">_Set Up</property>
99584a6
+                <property name="use_underline">True</property>
99584a6
               </object>
99584a6
             </child>
99584a6
           </object>