From 93ab2445a1bffd65d00d8ff10d7d1a40a3d2dd40 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Wed, 9 Nov 2016 15:01:44 +0000
Subject: [PATCH] [GTKUI] Update version string in ui files

---
 .../glade/add_torrent_dialog.infohash.ui      |   8 +-
 .../ui/gtkui/glade/add_torrent_dialog.url.ui  |   8 +-
 deluge/ui/gtkui/glade/connect_peer_dialog.ui  |   8 +-
 .../gtkui/glade/connection_manager.addhost.ui |  20 +--
 .../glade/connection_manager.askpassword.ui   |   6 +-
 deluge/ui/gtkui/glade/connection_manager.ui   |  22 +--
 .../glade/create_torrent_dialog.progress.ui   |   2 +-
 .../create_torrent_dialog.remote_path.ui      |   8 +-
 .../create_torrent_dialog.remote_save.ui      |   8 +-
 .../ui/gtkui/glade/create_torrent_dialog.ui   |  24 +--
 deluge/ui/gtkui/glade/edit_trackers.add.ui    |   2 +-
 deluge/ui/gtkui/glade/edit_trackers.edit.ui   |   2 +-
 deluge/ui/gtkui/glade/edit_trackers.ui        |  16 +-
 deluge/ui/gtkui/glade/filtertree_menu.ui      |  84 +++++-----
 .../ui/gtkui/glade/main_window.new_release.ui |   8 +-
 .../gtkui/glade/main_window.tabs.menu_file.ui |  18 +--
 .../gtkui/glade/main_window.tabs.menu_peer.ui |   4 +-
 deluge/ui/gtkui/glade/main_window.tabs.ui     |   2 +-
 deluge/ui/gtkui/glade/main_window.ui          |   2 +-
 deluge/ui/gtkui/glade/move_storage_dialog.ui  |   6 +-
 deluge/ui/gtkui/glade/other_dialog.ui         |   6 +-
 deluge/ui/gtkui/glade/path_combo_chooser.ui   |   2 +-
 deluge/ui/gtkui/glade/preferences_dialog.ui   | 134 +++++++--------
 deluge/ui/gtkui/glade/queuedtorrents.ui       |  12 +-
 .../ui/gtkui/glade/remove_torrent_dialog.ui   |   2 +-
 deluge/ui/gtkui/glade/torrent_menu.options.ui | 152 +++++++++---------
 deluge/ui/gtkui/glade/torrent_menu.queue.ui   |  10 +-
 deluge/ui/gtkui/glade/torrent_menu.ui         |  22 +--
 deluge/ui/gtkui/glade/tray_menu.ui            |  28 ++--
 29 files changed, 313 insertions(+), 313 deletions(-)

diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui
index 200ea5809..845b1c3f4 100644
--- a/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui
+++ b/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="dialog_infohash">
     <property name="width_request">462</property>
@@ -24,10 +24,10 @@
             <child>
               <object class="GtkButton" id="button_magnet_add_cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -39,12 +39,12 @@
             <child>
               <object class="GtkButton" id="button_magnet_add_ok">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -138,8 +138,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
-                    <property name="truncate_multiline">True</property>
                     <property name="activates_default">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui
index 8aa12e3dd..abf46acde 100644
--- a/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui
+++ b/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="url_dialog">
     <property name="width_request">462</property>
@@ -24,10 +24,10 @@
             <child>
               <object class="GtkButton" id="button_add_cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -39,12 +39,12 @@
             <child>
               <object class="GtkButton" id="button_add_ok">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -138,8 +138,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
-                    <property name="truncate_multiline">True</property>
                     <property name="activates_default">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
diff --git a/deluge/ui/gtkui/glade/connect_peer_dialog.ui b/deluge/ui/gtkui/glade/connect_peer_dialog.ui
index 33e33d8de..58cda64ea 100644
--- a/deluge/ui/gtkui/glade/connect_peer_dialog.ui
+++ b/deluge/ui/gtkui/glade/connect_peer_dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="connect_peer_dialog">
     <property name="can_focus">False</property>
@@ -24,10 +24,10 @@
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -39,12 +39,12 @@
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -122,10 +122,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">•</property>
-                <property name="truncate_multiline">True</property>
                 <property name="activates_default">True</property>
                 <property name="width_chars">39</property>
                 <property name="text" translatable="yes">hostname:port</property>
+                <property name="truncate_multiline">True</property>
                 <property name="invisible_char_set">True</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="secondary_icon_activatable">False</property>
diff --git a/deluge/ui/gtkui/glade/connection_manager.addhost.ui b/deluge/ui/gtkui/glade/connection_manager.addhost.ui
index 87c7697fb..7cb247998 100644
--- a/deluge/ui/gtkui/glade/connection_manager.addhost.ui
+++ b/deluge/ui/gtkui/glade/connection_manager.addhost.ui
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="adjustment_port">
+    <property name="upper">65535</property>
+    <property name="value">58846</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="addhost_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -23,10 +29,10 @@
             <child>
               <object class="GtkButton" id="button_addhost_cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -38,12 +44,12 @@
             <child>
               <object class="GtkButton" id="button_addhost_add">
                 <property name="label">gtk-add</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -55,9 +61,9 @@
             <child>
               <object class="GtkButton" id="button_addhost_save">
                 <property name="label">gtk-save</property>
+                <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -257,10 +263,4 @@
       <action-widget response="2">button_addhost_save</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="adjustment_port">
-    <property name="upper">65535</property>
-    <property name="value">58846</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>
diff --git a/deluge/ui/gtkui/glade/connection_manager.askpassword.ui b/deluge/ui/gtkui/glade/connection_manager.askpassword.ui
index 43f20f632..6025ac018 100644
--- a/deluge/ui/gtkui/glade/connection_manager.askpassword.ui
+++ b/deluge/ui/gtkui/glade/connection_manager.askpassword.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="askpassword_dialog">
     <property name="can_focus">False</property>
@@ -25,10 +25,10 @@
             <child>
               <object class="GtkButton" id="askpassword_dialog_connect_button">
                 <property name="label">gtk-connect</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_askpassword_dialog_connect_button_clicked" swapped="no"/>
               </object>
@@ -69,8 +69,8 @@
                 <property name="can_focus">True</property>
                 <property name="visibility">False</property>
                 <property name="invisible_char">●</property>
-                <property name="invisible_char_set">True</property>
                 <property name="truncate_multiline">True</property>
+                <property name="invisible_char_set">True</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
diff --git a/deluge/ui/gtkui/glade/connection_manager.ui b/deluge/ui/gtkui/glade/connection_manager.ui
index 15c7586ef..3fb20780c 100644
--- a/deluge/ui/gtkui/glade/connection_manager.ui
+++ b/deluge/ui/gtkui/glade/connection_manager.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="connection_manager">
     <property name="can_focus">False</property>
@@ -117,10 +117,10 @@
                     <child>
                       <object class="GtkButton" id="button_addhost">
                         <property name="label">gtk-add</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_button_addhost_clicked" swapped="no"/>
                       </object>
@@ -133,10 +133,10 @@
                     <child>
                       <object class="GtkButton" id="button_edithost">
                         <property name="label">gtk-edit</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_button_edithost_clicked" swapped="no"/>
                       </object>
@@ -149,10 +149,10 @@
                     <child>
                       <object class="GtkButton" id="button_removehost">
                         <property name="label">gtk-remove</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_button_removehost_clicked" swapped="no"/>
                       </object>
@@ -171,10 +171,10 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="button_startdaemon">
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <signal name="clicked" handler="on_button_startdaemon_clicked" swapped="no"/>
                     <child>
                       <object class="GtkHBox" id="hbox4">
@@ -219,10 +219,10 @@
                 <child>
                   <object class="GtkButton" id="button_refresh">
                     <property name="label">gtk-refresh</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_button_refresh_clicked" swapped="no"/>
                   </object>
@@ -266,10 +266,10 @@
                     <child>
                       <object class="GtkCheckButton" id="chk_autoconnect">
                         <property name="label" translatable="yes">Automatically connect to selected host on start-up</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -281,10 +281,10 @@
                     <child>
                       <object class="GtkCheckButton" id="chk_autostart">
                         <property name="label" translatable="yes">Automatically start localhost if needed</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -296,10 +296,10 @@
                     <child>
                       <object class="GtkCheckButton" id="chk_donotshow">
                         <property name="label" translatable="yes">Do not show this dialog on start-up</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -334,10 +334,10 @@
             <child>
               <object class="GtkButton" id="button_close">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
               </object>
@@ -350,10 +350,10 @@
             <child>
               <object class="GtkButton" id="button_connect">
                 <property name="label">gtk-connect</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_connect_clicked" swapped="no"/>
               </object>
diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.progress.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.progress.ui
index 2d0eb6510..2896159db 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.progress.ui
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.progress.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="progress_dialog">
     <property name="can_focus">False</property>
diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui
index 92b23cfca..486375eed 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="remote_path_dialog">
     <property name="width_request">462</property>
@@ -24,10 +24,10 @@
             <child>
               <object class="GtkButton" id="button_add_cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -39,12 +39,12 @@
             <child>
               <object class="GtkButton" id="button_add_ok">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -138,8 +138,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
-                    <property name="truncate_multiline">True</property>
                     <property name="activates_default">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui
index 56460f119..6385243b6 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="remote_save_dialog">
     <property name="width_request">462</property>
@@ -24,10 +24,10 @@
             <child>
               <object class="GtkButton" id="button_add_cancel1">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -39,12 +39,12 @@
             <child>
               <object class="GtkButton" id="button_add_ok1">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -138,8 +138,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
-                    <property name="truncate_multiline">True</property>
                     <property name="activates_default">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.ui
index d029dbcd1..3440dc98f 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.ui
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="create_torrent_dialog">
     <property name="can_focus">False</property>
@@ -111,10 +111,10 @@
                         <property name="layout_style">center</property>
                         <child>
                           <object class="GtkButton" id="button_file">
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <signal name="clicked" handler="on_button_file_clicked" swapped="no"/>
                             <child>
                               <object class="GtkHBox" id="hbox8">
@@ -157,10 +157,10 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_folder">
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <signal name="clicked" handler="on_button_folder_clicked" swapped="no"/>
                             <child>
                               <object class="GtkHBox" id="hbox9">
@@ -203,10 +203,10 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_remote_path">
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <signal name="clicked" handler="on_button_remote_path_clicked" swapped="no"/>
                             <child>
                               <object class="GtkHBox" id="hbox10">
@@ -451,10 +451,10 @@
                         <child>
                           <object class="GtkButton" id="button_up">
                             <property name="label">gtk-go-up</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                             <signal name="clicked" handler="on_button_up_clicked" swapped="no"/>
                           </object>
@@ -467,10 +467,10 @@
                         <child>
                           <object class="GtkButton" id="button_add">
                             <property name="label">gtk-add</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                             <signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
                           </object>
@@ -483,10 +483,10 @@
                         <child>
                           <object class="GtkButton" id="button_remove">
                             <property name="label">gtk-remove</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                             <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
                           </object>
@@ -499,10 +499,10 @@
                         <child>
                           <object class="GtkButton" id="button_down">
                             <property name="label">gtk-go-down</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                             <signal name="clicked" handler="on_button_down_clicked" swapped="no"/>
                           </object>
@@ -679,10 +679,10 @@
                     <child>
                       <object class="GtkCheckButton" id="chk_private_flag">
                         <property name="label" translatable="yes">Set Private Flag</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -694,10 +694,10 @@
                     <child>
                       <object class="GtkCheckButton" id="chk_add_to_session">
                         <property name="label" translatable="yes">Add this torrent to the session</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -767,10 +767,10 @@
                 <child>
                   <object class="GtkButton" id="button_cancel">
                     <property name="label">gtk-cancel</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
                   </object>
@@ -783,10 +783,10 @@
                 <child>
                   <object class="GtkButton" id="button_save">
                     <property name="label">gtk-save</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_button_save_clicked" swapped="no"/>
                   </object>
diff --git a/deluge/ui/gtkui/glade/edit_trackers.add.ui b/deluge/ui/gtkui/glade/edit_trackers.add.ui
index 67a882b1f..c739bb26d 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.add.ui
+++ b/deluge/ui/gtkui/glade/edit_trackers.add.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="add_tracker_dialog">
     <property name="width_request">400</property>
diff --git a/deluge/ui/gtkui/glade/edit_trackers.edit.ui b/deluge/ui/gtkui/glade/edit_trackers.edit.ui
index ff8eefb38..b2ddf2085 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.edit.ui
+++ b/deluge/ui/gtkui/glade/edit_trackers.edit.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="edit_tracker_entry">
     <property name="width_request">400</property>
diff --git a/deluge/ui/gtkui/glade/edit_trackers.ui b/deluge/ui/gtkui/glade/edit_trackers.ui
index 06fc2b386..d595a3532 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.ui
+++ b/deluge/ui/gtkui/glade/edit_trackers.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="edit_trackers_dialog">
     <property name="width_request">400</property>
@@ -25,10 +25,10 @@
             <child>
               <object class="GtkButton" id="button_cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -40,10 +40,10 @@
             <child>
               <object class="GtkButton" id="button_ok">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -141,10 +141,10 @@
                     <child>
                       <object class="GtkButton" id="button_up">
                         <property name="label">gtk-go-up</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_button_up_clicked" swapped="no"/>
                       </object>
@@ -157,10 +157,10 @@
                     <child>
                       <object class="GtkButton" id="button_add">
                         <property name="label">gtk-add</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
                       </object>
@@ -173,10 +173,10 @@
                     <child>
                       <object class="GtkButton" id="button_exit">
                         <property name="label">gtk-edit</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_button_edit_clicked" swapped="no"/>
                       </object>
@@ -189,10 +189,10 @@
                     <child>
                       <object class="GtkButton" id="button_remove">
                         <property name="label">gtk-remove</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
                       </object>
@@ -205,10 +205,10 @@
                     <child>
                       <object class="GtkButton" id="button_down">
                         <property name="label">gtk-go-down</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" handler="on_button_down_clicked" swapped="no"/>
                       </object>
diff --git a/deluge/ui/gtkui/glade/filtertree_menu.ui b/deluge/ui/gtkui/glade/filtertree_menu.ui
index bdfe47d86..53b422f88 100644
--- a/deluge/ui/gtkui/glade/filtertree_menu.ui
+++ b/deluge/ui/gtkui/glade/filtertree_menu.ui
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkMenu" id="filtertree_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkImageMenuItem" id="select_all">
-        <property name="label" translatable="yes">_Select All</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">image22</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="select_all" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="menuitem_pause">
-        <property name="label" translatable="yes">_Pause All</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">menu-item-image22</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="pause_all" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="menuitem_resume">
-        <property name="label" translatable="yes">Resu_me All</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Resume selected torrents.</property>
-        <property name="use_action_appearance">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">menu-item-image23</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="resume_all" swapped="no"/>
-      </object>
-    </child>
-  </object>
   <object class="GtkImage" id="image22">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -60,4 +19,45 @@
     <property name="stock">gtk-media-play</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkMenu" id="filtertree_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="select_all">
+        <property name="label" translatable="yes">_Select All</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">image22</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="select_all" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_pause">
+        <property name="label" translatable="yes">_Pause All</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">menu-item-image22</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="pause_all" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_resume">
+        <property name="label" translatable="yes">Resu_me All</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Resume selected torrents.</property>
+        <property name="use_underline">True</property>
+        <property name="image">menu-item-image23</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="resume_all" swapped="no"/>
+      </object>
+    </child>
+  </object>
 </interface>
diff --git a/deluge/ui/gtkui/glade/main_window.new_release.ui b/deluge/ui/gtkui/glade/main_window.new_release.ui
index 0830c2661..ae7e3f284 100644
--- a/deluge/ui/gtkui/glade/main_window.new_release.ui
+++ b/deluge/ui/gtkui/glade/main_window.new_release.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="new_release_dialog">
     <property name="can_focus">False</property>
@@ -22,10 +22,10 @@
             <child>
               <object class="GtkButton" id="button_close_new_release">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -37,10 +37,10 @@
             <child>
               <object class="GtkButton" id="button_goto_downloads">
                 <property name="label" translatable="yes">_Goto Website</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -224,10 +224,10 @@
                 <child>
                   <object class="GtkCheckButton" id="chk_do_not_show_new_release">
                     <property name="label" translatable="yes">Do not show this dialog in the future</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="draw_indicator">True</property>
                   </object>
                 </child>
diff --git a/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui b/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui
index 77edce787..3bece83a3 100644
--- a/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui
+++ b/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -38,9 +38,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_open_file">
         <property name="label">gtk-open</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_menuitem_open_file_activate" swapped="no"/>
@@ -48,10 +48,10 @@
     </child>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_show_file">
-        <property name="label" translatable="yes">_Show</property>
+        <property name="label">_Show</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_menuitem_show_file_activate" swapped="no"/>
@@ -66,9 +66,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_expand_all">
         <property name="label" translatable="yes">_Expand All</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">image1</property>
         <property name="use_stock">False</property>
@@ -84,9 +84,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_donotdownload">
         <property name="label" translatable="yes">_Do Not Download</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">image2</property>
         <property name="use_stock">False</property>
@@ -96,9 +96,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_normal">
         <property name="label" translatable="yes">_Normal Priority</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">image3</property>
         <property name="use_stock">False</property>
@@ -108,9 +108,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_high">
         <property name="label" translatable="yes">_High Priority</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">image4</property>
         <property name="use_stock">False</property>
@@ -120,9 +120,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_highest">
         <property name="label" translatable="yes">Hi_ghest Priority</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">image5</property>
         <property name="use_stock">False</property>
diff --git a/deluge/ui/gtkui/glade/main_window.tabs.menu_peer.ui b/deluge/ui/gtkui/glade/main_window.tabs.menu_peer.ui
index 4d03adf19..2d726351e 100644
--- a/deluge/ui/gtkui/glade/main_window.tabs.menu_peer.ui
+++ b/deluge/ui/gtkui/glade/main_window.tabs.menu_peer.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -14,10 +14,10 @@
     <child>
       <object class="GtkImageMenuItem" id="add_peer_menuitem">
         <property name="label" translatable="yes">_Add Peer</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Add a peer by its IP</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">image1</property>
         <property name="use_stock">False</property>
diff --git a/deluge/ui/gtkui/glade/main_window.tabs.ui b/deluge/ui/gtkui/glade/main_window.tabs.ui
index 383dbc56b..0b513abec 100644
--- a/deluge/ui/gtkui/glade/main_window.tabs.ui
+++ b/deluge/ui/gtkui/glade/main_window.tabs.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAdjustment" id="spin_max_connections_adjustment">
     <property name="lower">-1</property>
diff --git a/deluge/ui/gtkui/glade/main_window.ui b/deluge/ui/gtkui/glade/main_window.ui
index fb879e559..2c8188309 100644
--- a/deluge/ui/gtkui/glade/main_window.ui
+++ b/deluge/ui/gtkui/glade/main_window.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkAdjustment" id="adjustment1">
diff --git a/deluge/ui/gtkui/glade/move_storage_dialog.ui b/deluge/ui/gtkui/glade/move_storage_dialog.ui
index 2bcda5ccb..b6c7f5125 100644
--- a/deluge/ui/gtkui/glade/move_storage_dialog.ui
+++ b/deluge/ui/gtkui/glade/move_storage_dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="move_storage_dialog">
     <property name="width_request">500</property>
@@ -23,10 +23,10 @@
             <child>
               <object class="GtkButton" id="button_cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -38,12 +38,12 @@
             <child>
               <object class="GtkButton" id="button_ok">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/deluge/ui/gtkui/glade/other_dialog.ui b/deluge/ui/gtkui/glade/other_dialog.ui
index 2dd948520..d30b77cc2 100644
--- a/deluge/ui/gtkui/glade/other_dialog.ui
+++ b/deluge/ui/gtkui/glade/other_dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">-1</property>
@@ -32,10 +32,10 @@
             <child>
               <object class="GtkButton" id="button3">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -47,12 +47,12 @@
             <child>
               <object class="GtkButton" id="button4">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
diff --git a/deluge/ui/gtkui/glade/path_combo_chooser.ui b/deluge/ui/gtkui/glade/path_combo_chooser.ui
index eeb29f365..4aadcf2f7 100644
--- a/deluge/ui/gtkui/glade/path_combo_chooser.ui
+++ b/deluge/ui/gtkui/glade/path_combo_chooser.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAction" id="action1"/>
   <object class="GtkAdjustment" id="adjustment1">
diff --git a/deluge/ui/gtkui/glade/preferences_dialog.ui b/deluge/ui/gtkui/glade/preferences_dialog.ui
index 04e74e10a..c8d732357 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.ui
+++ b/deluge/ui/gtkui/glade/preferences_dialog.ui
@@ -1,73 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment_cache_expiry">
-    <property name="lower">1</property>
-    <property name="upper">32000</property>
-    <property name="value">60</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_cache_size">
-    <property name="upper">999999</property>
-    <property name="value">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_share_ratio">
-    <property name="lower">0.5</property>
-    <property name="upper">100</property>
-    <property name="value">2</property>
-    <property name="step_increment">0.10000000000000001</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_share_ratio_limit">
-    <property name="lower">-1</property>
-    <property name="upper">100</property>
-    <property name="value">1.5</property>
-    <property name="step_increment">0.10000000000000001</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_spin_active">
-    <property name="lower">-1</property>
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_spin_daemon_port">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_spin_downloading">
-    <property name="lower">-1</property>
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_spin_i2p_port">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_spin_incoming_port">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_spin_max_conn_global">
-    <property name="lower">-1</property>
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_spin_max_conn_per_sec">
-    <property name="lower">-1</property>
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkAdjustment" id="adjustment_spin_max_conn_per_torrent">
     <property name="lower">-1</property>
     <property name="upper">9999</property>
@@ -150,6 +84,72 @@
     <property name="step_increment">0.10000000000000001</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment_cache_expiry">
+    <property name="lower">1</property>
+    <property name="upper">32000</property>
+    <property name="value">60</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_cache_size">
+    <property name="upper">999999</property>
+    <property name="value">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_share_ratio">
+    <property name="lower">0.5</property>
+    <property name="upper">100</property>
+    <property name="value">2</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_share_ratio_limit">
+    <property name="lower">-1</property>
+    <property name="upper">100</property>
+    <property name="value">1.5</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_spin_active">
+    <property name="lower">-1</property>
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_spin_daemon_port">
+    <property name="upper">65535</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_spin_downloading">
+    <property name="lower">-1</property>
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_spin_i2p_port">
+    <property name="upper">65535</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_spin_incoming_port">
+    <property name="upper">65535</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_spin_max_conn_global">
+    <property name="lower">-1</property>
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_spin_max_conn_per_sec">
+    <property name="lower">-1</property>
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name item -->
diff --git a/deluge/ui/gtkui/glade/queuedtorrents.ui b/deluge/ui/gtkui/glade/queuedtorrents.ui
index 01a003bc7..81cbd8dd8 100644
--- a/deluge/ui/gtkui/glade/queuedtorrents.ui
+++ b/deluge/ui/gtkui/glade/queuedtorrents.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="queued_torrents_dialog">
     <property name="can_focus">False</property>
@@ -24,10 +24,10 @@
             <child>
               <object class="GtkButton" id="button_close">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
               </object>
@@ -40,6 +40,7 @@
             <child>
               <object class="GtkButton" id="button_add">
                 <property name="label">gtk-add</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -48,7 +49,6 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
               </object>
@@ -142,10 +142,10 @@
                 <child>
                   <object class="GtkButton" id="button_remove">
                     <property name="label">gtk-remove</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
                   </object>
@@ -158,10 +158,10 @@
                 <child>
                   <object class="GtkButton" id="button_clear">
                     <property name="label">gtk-clear</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_stock">True</property>
                     <signal name="clicked" handler="on_button_clear_clicked" swapped="no"/>
                   </object>
@@ -181,10 +181,10 @@
             <child>
               <object class="GtkCheckButton" id="chk_autoadd">
                 <property name="label" translatable="yes">Automatically add torrents on connect</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="draw_indicator">True</property>
                 <signal name="toggled" handler="on_chk_autoadd_toggled" swapped="no"/>
               </object>
diff --git a/deluge/ui/gtkui/glade/remove_torrent_dialog.ui b/deluge/ui/gtkui/glade/remove_torrent_dialog.ui
index bbe1833b9..dad327351 100644
--- a/deluge/ui/gtkui/glade/remove_torrent_dialog.ui
+++ b/deluge/ui/gtkui/glade/remove_torrent_dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="remove_torrent_dialog">
     <property name="can_focus">False</property>
diff --git a/deluge/ui/gtkui/glade/torrent_menu.options.ui b/deluge/ui/gtkui/glade/torrent_menu.options.ui
index 204467912..1d339d0f5 100644
--- a/deluge/ui/gtkui/glade/torrent_menu.options.ui
+++ b/deluge/ui/gtkui/glade/torrent_menu.options.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkImage" id="download-limit-image">
     <property name="visible">True</property>
@@ -13,81 +13,6 @@
     <property name="stock">gtk-network</property>
     <property name="icon-size">1</property>
   </object>
-  <object class="GtkMenu" id="options_torrent_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkImageMenuItem" id="menuitem_down_speed">
-        <property name="label" translatable="yes">_Download Speed Limit</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">download-limit-image</property>
-        <property name="use_stock">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="menuitem_up_speed">
-        <property name="label" translatable="yes">_Upload Speed Limit</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">upload-limit-image</property>
-        <property name="use_stock">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="menuitem_max_connections">
-        <property name="label" translatable="yes">_Connection Limit</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">max-connections-image</property>
-        <property name="use_stock">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="menuitem_upload_slots">
-        <property name="label" translatable="yes">Upload _Slot Limit</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">upload-slots-image</property>
-        <property name="use_stock">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="menuitem_stop_seed_at_ratio">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="label" translatable="yes">Stop seed at _ratio</property>
-        <property name="use_underline">True</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="menuitem_auto_managed">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="label" translatable="yes">_Auto Managed</property>
-        <property name="use_underline">True</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="menuitem_change_owner">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
-        <property name="label" translatable="yes">_Change Ownership</property>
-        <property name="use_underline">True</property>
-      </object>
-    </child>
-  </object>
   <object class="GtkImage" id="upload-limit-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -99,4 +24,79 @@
     <property name="stock">gtk-sort-ascending</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkMenu" id="options_torrent_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_down_speed">
+        <property name="label" translatable="yes">_Download Speed Limit</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">download-limit-image</property>
+        <property name="use_stock">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_up_speed">
+        <property name="label" translatable="yes">_Upload Speed Limit</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">upload-limit-image</property>
+        <property name="use_stock">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_max_connections">
+        <property name="label" translatable="yes">_Connection Limit</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">max-connections-image</property>
+        <property name="use_stock">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_upload_slots">
+        <property name="label" translatable="yes">Upload _Slot Limit</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">upload-slots-image</property>
+        <property name="use_stock">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="menuitem_stop_seed_at_ratio">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Stop seed at _ratio</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="menuitem_auto_managed">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">_Auto Managed</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="menuitem_change_owner">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">_Change Ownership</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+  </object>
 </interface>
diff --git a/deluge/ui/gtkui/glade/torrent_menu.queue.ui b/deluge/ui/gtkui/glade/torrent_menu.queue.ui
index ba89cc4ee..14170868d 100644
--- a/deluge/ui/gtkui/glade/torrent_menu.queue.ui
+++ b/deluge/ui/gtkui/glade/torrent_menu.queue.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkMenu" id="queue_torrent_menu">
     <property name="visible">True</property>
@@ -8,9 +8,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_top">
         <property name="label">gtk-goto-top</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_menuitem_queue_top_activate" swapped="no"/>
@@ -19,9 +19,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_up">
         <property name="label">gtk-go-up</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_menuitem_queue_up_activate" swapped="no"/>
@@ -30,9 +30,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_down">
         <property name="label">gtk-go-down</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_menuitem_queue_down_activate" swapped="no"/>
@@ -41,9 +41,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_bottom">
         <property name="label">gtk-goto-bottom</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_menuitem_queue_bottom_activate" swapped="no"/>
diff --git a/deluge/ui/gtkui/glade/torrent_menu.ui b/deluge/ui/gtkui/glade/torrent_menu.ui
index e4ba1e7d0..a8e79b928 100644
--- a/deluge/ui/gtkui/glade/torrent_menu.ui
+++ b/deluge/ui/gtkui/glade/torrent_menu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkImage" id="image1">
@@ -68,9 +68,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_open_folder">
         <property name="label" translatable="yes">_Open Download Folder</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image7</property>
         <property name="use_stock">False</property>
@@ -86,9 +86,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_pause">
         <property name="label" translatable="yes">_Pause</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image14</property>
         <property name="use_stock">False</property>
@@ -98,10 +98,10 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_resume">
         <property name="label" translatable="yes">Resu_me</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Resume selected torrents.</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image13</property>
         <property name="use_stock">False</property>
@@ -117,9 +117,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_options">
         <property name="label" translatable="yes">Opt_ions</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">image1</property>
         <property name="use_stock">False</property>
@@ -134,9 +134,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue">
         <property name="label" translatable="yes">_Queue</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image19</property>
         <property name="use_stock">False</property>
@@ -151,9 +151,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_updatetracker">
         <property name="label" translatable="yes">_Update Tracker</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image5</property>
         <property name="use_stock">False</property>
@@ -163,9 +163,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_edittrackers">
         <property name="label" translatable="yes">_Edit Trackers</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image12</property>
         <property name="use_stock">False</property>
@@ -181,9 +181,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_remove">
         <property name="label" translatable="yes">_Remove Torrent</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image9</property>
         <property name="use_stock">False</property>
@@ -199,9 +199,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_recheck">
         <property name="label" translatable="yes">_Force Re-check</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image6</property>
         <property name="use_stock">False</property>
@@ -211,9 +211,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_move">
         <property name="label" translatable="yes">_Move Download Folder</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image8</property>
         <property name="use_stock">False</property>
diff --git a/deluge/ui/gtkui/glade/tray_menu.ui b/deluge/ui/gtkui/glade/tray_menu.ui
index a2bdbc02e..aec177d4e 100644
--- a/deluge/ui/gtkui/glade/tray_menu.ui
+++ b/deluge/ui/gtkui/glade/tray_menu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkImage" id="download-limit-image">
@@ -32,14 +32,19 @@
     <property name="stock">gtk-quit</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="upload-limit-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon-size">1</property>
+  </object>
   <object class="GtkMenu" id="tray_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkCheckMenuItem" id="menuitem_show_deluge">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">_Show Deluge</property>
         <property name="use_underline">True</property>
         <signal name="activate" handler="on_menuitem_show_deluge_activate" swapped="no"/>
@@ -54,9 +59,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_add_torrent">
         <property name="label" translatable="yes">_Add Torrent</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image1</property>
         <property name="use_stock">False</property>
@@ -72,9 +77,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_pause_session">
         <property name="label" translatable="yes">_Pause Session</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image6</property>
         <property name="use_stock">False</property>
@@ -84,9 +89,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_resume_session">
         <property name="label" translatable="yes">_Resume Session</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image7</property>
         <property name="use_stock">False</property>
@@ -102,9 +107,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_download_limit">
         <property name="label" translatable="yes">_Download Speed Limit</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">download-limit-image</property>
         <property name="use_stock">False</property>
@@ -114,9 +119,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_upload_limit">
         <property name="label" translatable="yes">_Upload Speed Limit</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">upload-limit-image</property>
         <property name="use_stock">False</property>
@@ -132,9 +137,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_quitdaemon">
         <property name="label" translatable="yes">Quit &amp; Shutdown Daemon</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image8</property>
         <property name="use_stock">False</property>
@@ -150,9 +155,9 @@
     <child>
       <object class="GtkImageMenuItem" id="menuitem_quit">
         <property name="label">gtk-quit</property>
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <property name="accel_group">accelgroup1</property>
@@ -160,9 +165,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="upload-limit-image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon-size">1</property>
-  </object>
 </interface>