diff --git a/data/glade/gc_occupants_menu.glade b/data/glade/gc_occupants_menu.glade
index 044a6bb4f..a8b4afbbc 100644
--- a/data/glade/gc_occupants_menu.glade
+++ b/data/glade/gc_occupants_menu.glade
@@ -17,6 +17,20 @@
         </child>
       </widget>
     </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="send_file_menuitem">
+        <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>
+        <property name="label" translatable="yes">Send _File</property>
+        <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="menu-item-image4">
+            <property name="stock">gtk-save</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
     <child>
       <widget class="GtkMenuItem" id="group_chat_actions_menuitem">
         <property name="visible">True</property>
@@ -87,20 +101,6 @@
         </child>
       </widget>
     </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="send_file_menuitem">
-        <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>
-        <property name="label" translatable="yes">Send _File</property>
-        <property name="use_underline">True</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image4">
-            <property name="stock">gtk-save</property>
-            <property name="icon_size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
     <child>
       <widget class="GtkSeparatorMenuItem" id="separator6">
         <property name="visible">True</property>
diff --git a/data/glade/roster_contact_context_menu.glade b/data/glade/roster_contact_context_menu.glade
index 7e0186f87..9e72d1745 100644
--- a/data/glade/roster_contact_context_menu.glade
+++ b/data/glade/roster_contact_context_menu.glade
@@ -39,7 +39,7 @@
         <child internal-child="image">
           <widget class="GtkImage" id="image1706">
             <property name="visible">True</property>
-            <property name="stock">gtk-floppy</property>
+            <property name="stock">gtk-save</property>
             <property name="icon_size">1</property>
           </widget>
         </child>
@@ -267,19 +267,6 @@
                 </child>
               </widget>
             </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="remove_from_roster_menuitem">
-                <property name="label" translatable="yes">_Remove</property>
-                <property name="use_underline">True</property>
-                <child internal-child="image">
-                  <widget class="GtkImage" id="image1717">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-remove</property>
-                    <property name="icon_size">1</property>
-                  </widget>
-                </child>
-              </widget>
-            </child>
             <child>
               <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
                 <property name="label" translatable="yes">_Add to Roster</property>
@@ -293,6 +280,19 @@
                 </child>
               </widget>
             </child>
+            <child>
+              <widget class="GtkImageMenuItem" id="remove_from_roster_menuitem">
+                <property name="label" translatable="yes">_Remove</property>
+                <property name="use_underline">True</property>
+                <child internal-child="image">
+                  <widget class="GtkImage" id="image1717">
+                    <property name="visible">True</property>
+                    <property name="stock">gtk-remove</property>
+                    <property name="icon_size">1</property>
+                  </widget>
+                </child>
+              </widget>
+            </child>
           </widget>
         </child>
         <child internal-child="image">