--- data/ui/memaker-fix.ui	2010-06-26 13:01:08.000000000 +0100
+++ data/ui/memaker.ui	2010-06-26 13:05:37.000000000 +0100
@@ -180,7 +180,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="vbox2">
+              <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -211,7 +211,7 @@
                             <property name="receives_default">True</property>
                             <signal name="clicked" handler="on_button_start_authorization_assistant_clicked"/>
                             <child>
-                              <object class="GtkImage" id="icon-yes">
+                              <object class="GtkImage" id="image1">
                                 <property name="visible">True</property>
                                 <property name="stock">gtk-yes</property>
                                 <property name="icon-size">1</property>
@@ -297,7 +297,7 @@
       <action-widget response="0">closePreferencesButton</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="icon-save-as">
+  <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="stock">gtk-save-as</property>
     <property name="icon-size">1</property>
@@ -529,7 +529,7 @@
           <object class="GtkHBox" id="hbox4">
             <property name="visible">True</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>