From ca0db4d1a72b38f66de5c85ab3f99438c2f8d0e9 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sat, 30 Jun 2018 11:48:10 +0100
Subject: [PATCH] [GTK3] Save ui files with Glade 3

---
 .../glade/add_torrent_dialog.infohash.ui      |  18 +-
 .../ui/gtkui/glade/add_torrent_dialog.url.ui  |  14 +-
 deluge/ui/gtkui/glade/connect_peer_dialog.ui  |  16 +-
 .../gtkui/glade/connection_manager.addhost.ui |  23 +-
 deluge/ui/gtkui/glade/connection_manager.ui   | 141 ++++++------
 .../glade/create_torrent_dialog.progress.ui   |  11 +-
 .../create_torrent_dialog.remote_path.ui      |  14 +-
 .../create_torrent_dialog.remote_save.ui      |  14 +-
 .../ui/gtkui/glade/create_torrent_dialog.ui   | 105 ++++-----
 deluge/ui/gtkui/glade/edit_trackers.add.ui    |  15 +-
 deluge/ui/gtkui/glade/edit_trackers.edit.ui   |  14 +-
 deluge/ui/gtkui/glade/edit_trackers.ui        |  18 +-
 deluge/ui/gtkui/glade/filtertree_menu.ui      |  10 +-
 .../ui/gtkui/glade/main_window.new_release.ui |  23 +-
 .../gtkui/glade/main_window.tabs.menu_file.ui |  14 +-
 .../gtkui/glade/main_window.tabs.menu_peer.ui |   6 +-
 deluge/ui/gtkui/glade/move_storage_dialog.ui  |  11 +-
 deluge/ui/gtkui/glade/other_dialog.ui         |  17 +-
 deluge/ui/gtkui/glade/path_combo_chooser.ui   | 140 ++++++------
 deluge/ui/gtkui/glade/preferences_dialog.ui   | 216 ++++++------------
 deluge/ui/gtkui/glade/queuedtorrents.ui       |  18 +-
 .../ui/gtkui/glade/remove_torrent_dialog.ui   | 161 ++++++-------
 deluge/ui/gtkui/glade/torrent_menu.options.ui |   8 +-
 deluge/ui/gtkui/glade/torrent_menu.queue.ui   |   4 +-
 deluge/ui/gtkui/glade/torrent_menu.ui         |  24 +-
 deluge/ui/gtkui/glade/tray_menu.ui            |  16 +-
 26 files changed, 509 insertions(+), 562 deletions(-)

diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui
index 845b1c3f4..a8e8ddcc8 100644
--- a/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui
+++ b/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="dialog_infohash">
     <property name="width_request">462</property>
     <property name="can_focus">False</property>
@@ -11,13 +11,16 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox7">
+      <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area7">
+          <object class="GtkButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -140,11 +143,8 @@
                     <property name="invisible_char">•</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>
-                    <property name="primary_icon_sensitive">True</property>
-                    <property name="secondary_icon_sensitive">True</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -168,8 +168,8 @@
                   <object class="GtkLabel" id="label22">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
                     <property name="label" translatable="yes">Trackers:</property>
+                    <property name="yalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -181,8 +181,6 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow3">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTextView" id="text_trackers">
diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui
index abf46acde..8a68d87d7 100644
--- a/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui
+++ b/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="url_dialog">
     <property name="width_request">462</property>
     <property name="can_focus">False</property>
@@ -11,13 +11,16 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area5">
+          <object class="GtkButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -140,11 +143,8 @@
                     <property name="invisible_char">•</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>
-                    <property name="primary_icon_sensitive">True</property>
-                    <property name="secondary_icon_sensitive">True</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
diff --git a/deluge/ui/gtkui/glade/connect_peer_dialog.ui b/deluge/ui/gtkui/glade/connect_peer_dialog.ui
index 58cda64ea..f6fd99fb7 100644
--- a/deluge/ui/gtkui/glade/connect_peer_dialog.ui
+++ b/deluge/ui/gtkui/glade/connect_peer_dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="connect_peer_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -11,13 +11,16 @@
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="decorated">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
+          <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -87,8 +90,8 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Add Peer</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -126,11 +129,8 @@
                 <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>
-                <property name="primary_icon_sensitive">True</property>
-                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
diff --git a/deluge/ui/gtkui/glade/connection_manager.addhost.ui b/deluge/ui/gtkui/glade/connection_manager.addhost.ui
index 3d3df57cd..fc97e956f 100644
--- a/deluge/ui/gtkui/glade/connection_manager.addhost.ui
+++ b/deluge/ui/gtkui/glade/connection_manager.addhost.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment_port">
     <property name="upper">65535</property>
     <property name="value">58846</property>
@@ -16,13 +16,16 @@
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area5">
+          <object class="GtkButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -93,11 +96,8 @@
                     <property name="invisible_char">•</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>
-                    <property name="primary_icon_sensitive">True</property>
-                    <property name="secondary_icon_sensitive">True</property>
                     <signal name="paste-clipboard" handler="on_entry_host_paste_clipboard" swapped="no"/>
                   </object>
                 </child>
@@ -128,12 +128,9 @@
                 <property name="invisible_char">•</property>
                 <property name="width_chars">5</property>
                 <property name="xalign">1</property>
-                <property name="invisible_char_set">True</property>
                 <property name="progress_pulse_step">1</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="secondary_icon_activatable">False</property>
-                <property name="primary_icon_sensitive">True</property>
-                <property name="secondary_icon_sensitive">True</property>
                 <property name="adjustment">adjustment_port</property>
                 <property name="climb_rate">1</property>
                 <property name="numeric">True</property>
@@ -169,11 +166,8 @@
                     <property name="visibility">False</property>
                     <property name="invisible_char">•</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>
-                    <property name="secondary_icon_sensitive">True</property>
                   </object>
                 </child>
               </object>
@@ -195,11 +189,8 @@
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</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>
-                    <property name="secondary_icon_sensitive">True</property>
                   </object>
                 </child>
               </object>
diff --git a/deluge/ui/gtkui/glade/connection_manager.ui b/deluge/ui/gtkui/glade/connection_manager.ui
index af12310c4..eb1acdffa 100644
--- a/deluge/ui/gtkui/glade/connection_manager.ui
+++ b/deluge/ui/gtkui/glade/connection_manager.ui
@@ -1,7 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkListStore" id="liststore_hostlist">
+    <columns>
+      <!-- column-name host_id -->
+      <column type="gchararray"/>
+      <!-- column-name hostname -->
+      <column type="gchararray"/>
+      <!-- column-name port -->
+      <column type="gint"/>
+      <!-- column-name username -->
+      <column type="gchararray"/>
+      <!-- column-name password -->
+      <column type="gchararray"/>
+      <!-- column-name status -->
+      <column type="gchararray"/>
+      <!-- column-name version -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="connection_manager">
     <property name="can_focus">False</property>
     <property name="has_focus">True</property>
@@ -13,11 +31,58 @@
     <property name="default_height">250</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">True</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_close">
+                <property name="label">_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_underline">True</property>
+                <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_connect">
+                <property name="label">C_onnect</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_underline">True</property>
+                <signal name="clicked" handler="on_button_connect_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
@@ -43,8 +108,6 @@
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <object class="GtkTreeView" id="treeview_hostlist">
                                 <property name="height_request">80</property>
@@ -52,6 +115,9 @@
                                 <property name="can_focus">True</property>
                                 <property name="model">liststore_hostlist</property>
                                 <signal name="row-activated" handler="on_hostlist_row_activated" swapped="no"/>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection"/>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -236,51 +302,6 @@
             <property name="position">0</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_close">
-                <property name="label">_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_underline">True</property>
-                <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_connect">
-                <property name="label">C_onnect</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_underline">True</property>
-                <signal name="clicked" handler="on_button_connect_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkExpander" id="expander1">
             <property name="visible">True</property>
@@ -372,22 +393,4 @@
       <action-widget response="0">button_connect</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="liststore_hostlist">
-    <columns>
-      <!-- column-name host_id -->
-      <column type="gchararray"/>
-      <!-- column-name hostname -->
-      <column type="gchararray"/>
-      <!-- column-name port -->
-      <column type="gint"/>
-      <!-- column-name username -->
-      <column type="gchararray"/>
-      <!-- column-name password -->
-      <column type="gchararray"/>
-      <!-- column-name status -->
-      <column type="gchararray"/>
-      <!-- column-name version -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
 </interface>
diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.progress.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.progress.ui
index 2896159db..6757d7e1b 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.progress.ui
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.progress.ui
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="progress_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Creating Torrent</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox9">
+      <object class="GtkBox" id="dialog-vbox9">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area9">
+          <object class="GtkButtonBox" id="dialog-action_area9">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</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 486375eed..77e7a9638 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="remote_path_dialog">
     <property name="width_request">462</property>
     <property name="can_focus">False</property>
@@ -11,13 +11,16 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox7">
+      <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area7">
+          <object class="GtkButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -140,11 +143,8 @@
                     <property name="invisible_char">•</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>
-                    <property name="primary_icon_sensitive">True</property>
-                    <property name="secondary_icon_sensitive">True</property>
                   </object>
                   <packing>
                     <property name="expand">True</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 6385243b6..88a0dd8de 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="remote_save_dialog">
     <property name="width_request">462</property>
     <property name="can_focus">False</property>
@@ -11,13 +11,16 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="decorated">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area5">
+          <object class="GtkButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -140,11 +143,8 @@
                     <property name="invisible_char">•</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>
-                    <property name="primary_icon_sensitive">True</property>
-                    <property name="secondary_icon_sensitive">True</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.ui
index 3440dc98f..93685b817 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.ui
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.ui
@@ -1,12 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">32 KiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">64 KiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">128 KiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">256 KiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">512 KiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1 MiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2 MiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">4 MiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">8 MiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">16 MiB</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes"/>
+      </row>
+    </data>
+  </object>
   <object class="GtkWindow" id="create_torrent_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Create Torrent</property>
     <property name="window_position">center-on-parent</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -22,7 +66,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="stock">gtk-new</property>
-                <property name="icon-size">5</property>
+                <property name="icon_size">5</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -86,8 +130,6 @@
                       <object class="GtkScrolledWindow" id="scrolledwindow1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="treeview_files">
@@ -95,6 +137,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="headers_visible">False</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection"/>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -316,8 +361,6 @@
                             <property name="truncate_multiline">True</property>
                             <property name="primary_icon_activatable">False</property>
                             <property name="secondary_icon_activatable">False</property>
-                            <property name="primary_icon_sensitive">True</property>
-                            <property name="secondary_icon_sensitive">True</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -355,8 +398,6 @@
                             <property name="can_focus">True</property>
                             <property name="primary_icon_activatable">False</property>
                             <property name="secondary_icon_activatable">False</property>
-                            <property name="primary_icon_sensitive">True</property>
-                            <property name="secondary_icon_sensitive">True</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -426,13 +467,14 @@
                       <object class="GtkScrolledWindow" id="scrolledwindow3">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="tracker_treeview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection"/>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -808,45 +850,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">32 KiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">64 KiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">128 KiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">256 KiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">512 KiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1 MiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2 MiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">4 MiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">8 MiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">16 MiB</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes"></col>
-      </row>
-    </data>
-  </object>
 </interface>
diff --git a/deluge/ui/gtkui/glade/edit_trackers.add.ui b/deluge/ui/gtkui/glade/edit_trackers.add.ui
index c739bb26d..584803a5b 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.add.ui
+++ b/deluge/ui/gtkui/glade/edit_trackers.add.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="add_tracker_dialog">
     <property name="width_request">400</property>
     <property name="height_request">200</property>
@@ -11,13 +11,16 @@
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area5">
+          <object class="GtkButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -127,9 +130,9 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Trackers:</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Trackers:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -141,8 +144,6 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTextView" id="textview_trackers">
diff --git a/deluge/ui/gtkui/glade/edit_trackers.edit.ui b/deluge/ui/gtkui/glade/edit_trackers.edit.ui
index b2ddf2085..4db60c766 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.edit.ui
+++ b/deluge/ui/gtkui/glade/edit_trackers.edit.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="edit_tracker_entry">
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
@@ -10,13 +10,16 @@
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox7">
+      <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area7">
+          <object class="GtkButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -141,11 +144,8 @@
                     <property name="invisible_char">•</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>
-                    <property name="primary_icon_sensitive">True</property>
-                    <property name="secondary_icon_sensitive">True</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
diff --git a/deluge/ui/gtkui/glade/edit_trackers.ui b/deluge/ui/gtkui/glade/edit_trackers.ui
index d595a3532..3600e50dc 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.ui
+++ b/deluge/ui/gtkui/glade/edit_trackers.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="edit_trackers_dialog">
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
@@ -12,13 +12,16 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <signal name="configure-event" handler="on_edit_trackers_dialog_configure_event" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -86,9 +89,9 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0.05000000074505806</property>
                     <property name="ypad">10</property>
                     <property name="label" translatable="yes">Edit Trackers</property>
+                    <property name="xalign">0.05000000074505806</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                       <attribute name="scale" value="1.2"/>
@@ -116,13 +119,14 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow3">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="tracker_treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection"/>
+                        </child>
                       </object>
                     </child>
                   </object>
diff --git a/deluge/ui/gtkui/glade/filtertree_menu.ui b/deluge/ui/gtkui/glade/filtertree_menu.ui
index d85518dee..6743e06e8 100644
--- a/deluge/ui/gtkui/glade/filtertree_menu.ui
+++ b/deluge/ui/gtkui/glade/filtertree_menu.ui
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image22">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-select-all</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image22">
     <property name="can_focus">False</property>
     <property name="stock">gtk-media-pause</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image23">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-media-play</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="filtertree_menu">
     <property name="visible">True</property>
diff --git a/deluge/ui/gtkui/glade/main_window.new_release.ui b/deluge/ui/gtkui/glade/main_window.new_release.ui
index ae7e3f284..961acc723 100644
--- a/deluge/ui/gtkui/glade/main_window.new_release.ui
+++ b/deluge/ui/gtkui/glade/main_window.new_release.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="new_release_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -9,13 +9,16 @@
     <property name="window_position">center-on-parent</property>
     <property name="icon_name">deluge</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
+          <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -137,15 +140,15 @@
                         <property name="right_attach">2</property>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
-                        <property name="x_options"></property>
+                        <property name="x_options"/>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label_available_version_text">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Available Version:</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="style" value="italic"/>
                         </attributes>
@@ -164,15 +167,15 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="x_options"></property>
+                        <property name="x_options"/>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label_client_version_text">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Current Version:</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="style" value="italic"/>
                         </attributes>
@@ -184,8 +187,8 @@
                     <child>
                       <object class="GtkLabel" id="label_server_version_text">
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Server Version</property>
+                        <property name="xalign">0</property>
                         <attributes>
                           <attribute name="style" value="italic"/>
                         </attributes>
@@ -204,7 +207,7 @@
                         <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
-                        <property name="x_options"></property>
+                        <property name="x_options"/>
                       </packing>
                     </child>
                   </object>
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 a4def4275..4f81cd15f 100644
--- a/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui
+++ b/deluge/ui/gtkui/glade/main_window.tabs.menu_file.ui
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-zoom-fit</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-no</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-yes</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-go-up</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="image5">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-go-down</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="menu_file_tab">
     <property name="visible">True</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 2d726351e..e59e461cb 100644
--- a/deluge/ui/gtkui/glade/main_window.tabs.menu_peer.ui
+++ b/deluge/ui/gtkui/glade/main_window.tabs.menu_peer.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-add</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="menu_peer_tab">
     <property name="visible">True</property>
diff --git a/deluge/ui/gtkui/glade/move_storage_dialog.ui b/deluge/ui/gtkui/glade/move_storage_dialog.ui
index b6c7f5125..f0bf52cbf 100644
--- a/deluge/ui/gtkui/glade/move_storage_dialog.ui
+++ b/deluge/ui/gtkui/glade/move_storage_dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="move_storage_dialog">
     <property name="width_request">500</property>
     <property name="can_focus">False</property>
@@ -10,13 +10,16 @@
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
+          <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
diff --git a/deluge/ui/gtkui/glade/other_dialog.ui b/deluge/ui/gtkui/glade/other_dialog.ui
index d30b77cc2..742880f83 100644
--- a/deluge/ui/gtkui/glade/other_dialog.ui
+++ b/deluge/ui/gtkui/glade/other_dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">-1</property>
     <property name="upper">2097151</property>
@@ -19,13 +19,16 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">5</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -89,9 +92,9 @@
               <object class="GtkLabel" id="label_header">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label">label</property>
                 <property name="use_markup">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -150,8 +153,6 @@
                     <property name="xalign">1</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
-                    <property name="primary_icon_sensitive">True</property>
-                    <property name="secondary_icon_sensitive">True</property>
                     <property name="adjustment">adjustment1</property>
                   </object>
                 </child>
@@ -166,8 +167,8 @@
               <object class="GtkLabel" id="label_type">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">label</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">True</property>
diff --git a/deluge/ui/gtkui/glade/path_combo_chooser.ui b/deluge/ui/gtkui/glade/path_combo_chooser.ui
index e15f0ebd3..da558773d 100644
--- a/deluge/ui/gtkui/glade/path_combo_chooser.ui
+++ b/deluge/ui/gtkui/glade/path_combo_chooser.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAction" id="action1"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
@@ -26,13 +26,44 @@
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <signal name="key-release-event" handler="on_completion_config_dialog_key_release_event" swapped="no"/>
     <signal name="delete-event" handler="on_completion_config_dialog_delete_event" swapped="no"/>
+    <signal name="key-release-event" handler="on_completion_config_dialog_key_release_event" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">5</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="config_dialog_button_close">
+                <property name="label" translatable="yes">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>
+                <signal name="clicked" handler="on_config_dialog_button_close_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkFrame" id="config_general_frame">
             <property name="visible">True</property>
@@ -54,8 +85,8 @@
                       <object class="GtkLabel" id="visible_rows_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Max drop down rows</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -70,8 +101,6 @@
                         <property name="max_length">2</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
                         <property name="adjustment">adjustment3</property>
                         <property name="climb_rate">1</property>
                         <property name="numeric">True</property>
@@ -217,6 +246,9 @@
                     <property name="n_columns">2</property>
                     <property name="column_spacing">5</property>
                     <property name="row_spacing">5</property>
+                    <child>
+                      <placeholder/>
+                    </child>
                     <child>
                       <object class="GtkCheckButton" id="enable_auto_completion_checkbutton">
                         <property name="label" translatable="yes">Enable autocomplete</property>
@@ -236,8 +268,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">Press this key to set new key accelerators to trigger auto-complete</property>
-                        <signal name="pressed" handler="on_set_completion_accelerator_button_pressed" swapped="no"/>
                         <signal name="clicked" handler="on_set_completion_accelerator_button_clicked" swapped="no"/>
+                        <signal name="pressed" handler="on_set_completion_accelerator_button_pressed" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -260,9 +292,6 @@
                         <property name="bottom_attach">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -309,16 +338,16 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Autocomplete</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Save path</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
@@ -329,8 +358,8 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Edit path</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="top_attach">2</property>
@@ -341,9 +370,9 @@
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Remove path</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0.51999998092651367</property>
-                        <property name="label" translatable="yes">Remove path</property>
                       </object>
                       <packing>
                         <property name="top_attach">3</property>
@@ -354,8 +383,8 @@
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Toggle hidden files</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="top_attach">4</property>
@@ -366,8 +395,8 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Ctrl+S</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -391,8 +420,8 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Ctrl+E</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -405,8 +434,8 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Ctrl+R</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -419,8 +448,8 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Ctrl+H</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -433,8 +462,8 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Default path</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="top_attach">5</property>
@@ -445,8 +474,8 @@
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Ctrl+D</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -476,34 +505,6 @@
             <property name="position">3</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="config_dialog_button_close">
-                <property name="label" translatable="yes">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>
-                <signal name="clicked" handler="on_config_dialog_button_close_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -527,8 +528,11 @@
     <property name="decorated">False</property>
     <property name="deletable">False</property>
     <signal name="button-press-event" handler="on_completion_popup_window_button_press_event" swapped="no"/>
-    <signal name="key-press-event" handler="on_completion_popup_window_key_press_event" swapped="no"/>
     <signal name="focus-out-event" handler="on_completion_popup_window_focus_out_event" swapped="no"/>
+    <signal name="key-press-event" handler="on_completion_popup_window_key_press_event" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkVBox" id="popup_content_box1">
         <property name="visible">True</property>
@@ -542,8 +546,6 @@
             <property name="can_default">True</property>
             <property name="has_default">True</property>
             <property name="receives_default">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkTreeView" id="completion_treeview">
@@ -559,6 +561,9 @@
                 <signal name="key-press-event" handler="on_completion_treeview_key_press_event" swapped="no"/>
                 <signal name="motion-notify-event" handler="on_completion_treeview_motion_notify_event" swapped="no"/>
                 <signal name="scroll-event" handler="on_completion_treeview_scroll_event" swapped="no"/>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="completion_treeview_column">
                     <property name="sizing">autosize</property>
@@ -594,12 +599,12 @@
     <property name="action">select-folder</property>
     <property name="preview_widget_active">False</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -668,6 +673,9 @@
     <signal name="button-press-event" handler="on_stored_values_popup_window_button_press_event" swapped="no"/>
     <signal name="focus-out-event" handler="on_stored_values_popup_window_focus_out_event" swapped="no"/>
     <signal name="hide" handler="on_stored_values_popup_window_hide" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
@@ -682,7 +690,6 @@
             <property name="has_default">True</property>
             <property name="receives_default">True</property>
             <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">automatic</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkTreeView" id="stored_values_treeview">
@@ -694,9 +701,12 @@
                 <property name="search_column">0</property>
                 <property name="show_expanders">False</property>
                 <signal name="button-press-event" handler="on_stored_values_treeview_mouse_button_press_event" swapped="no"/>
-                <signal name="key-release-event" handler="on_stored_values_treeview_key_release_event" swapped="no"/>
                 <signal name="key-press-event" handler="on_stored_values_treeview_key_press_event" swapped="no"/>
+                <signal name="key-release-event" handler="on_stored_values_treeview_key_release_event" swapped="no"/>
                 <signal name="scroll-event" handler="on_stored_values_treeview_scroll_event" swapped="no"/>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="stored_values_treeview_column">
                     <property name="sizing">autosize</property>
@@ -875,6 +885,9 @@
   </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkHBox" id="entry_combobox_hbox">
         <property name="visible">True</property>
@@ -927,8 +940,8 @@
                   <object class="GtkLabel" id="folder_name_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="xpad">6</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -950,16 +963,13 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="invisible_char">•</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>
-            <property name="secondary_icon_sensitive">True</property>
             <signal name="changed" handler="on_entry_text_changed" swapped="no"/>
-            <signal name="insert-text" handler="on_entry_text_insert_text" swapped="no"/>
-            <signal name="key-press-event" handler="on_entry_text_key_press_event" swapped="no"/>
             <signal name="delete-text" handler="on_entry_text_delete_text" swapped="no"/>
             <signal name="focus-out-event" handler="on_entry_text_focus_out_event" swapped="no"/>
+            <signal name="insert-text" handler="on_entry_text_insert_text" swapped="no"/>
+            <signal name="key-press-event" handler="on_entry_text_key_press_event" swapped="no"/>
             <signal name="scroll-event" handler="on_entry_text_scroll_event" swapped="no"/>
           </object>
           <packing>
@@ -973,12 +983,12 @@
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="focus_on_click">False</property>
             <property name="receives_default">True</property>
             <property name="tooltip_text" translatable="yes">Saved paths</property>
-            <property name="focus_on_click">False</property>
             <signal name="button-press-event" handler="on_button_toggle_dropdown_button_press_event" swapped="no"/>
-            <signal name="toggled" handler="on_button_toggle_dropdown_toggled" swapped="no"/>
             <signal name="scroll-event" handler="on_button_toggle_dropdown_scroll_event" swapped="no"/>
+            <signal name="toggled" handler="on_button_toggle_dropdown_toggled" swapped="no"/>
             <child>
               <object class="GtkVBox" id="vbox1">
                 <property name="height_request">15</property>
diff --git a/deluge/ui/gtkui/glade/preferences_dialog.ui b/deluge/ui/gtkui/glade/preferences_dialog.ui
index 69bbf4e36..5b1cc5f8e 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.ui
+++ b/deluge/ui/gtkui/glade/preferences_dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment_cache_expiry">
     <property name="lower">1</property>
     <property name="upper">32000</property>
@@ -244,13 +244,16 @@
     <property name="type_hint">dialog</property>
     <signal name="configure-event" handler="on_pref_dialog_configure_event" swapped="no"/>
     <signal name="delete-event" handler="on_pref_dialog_delete_event" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -321,6 +324,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="headers_visible">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -339,8 +345,6 @@
                   <object class="GtkScrolledWindow" id="InterfaceScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="interface_viewport">
                         <property name="visible">True</property>
@@ -514,8 +518,8 @@ and daemon (does not apply in Standalone mode).</property>
                                                       <object class="GtkLabel" id="label66">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">1</property>
                                                         <property name="label" translatable="yes">Completed:</property>
+                                                        <property name="xalign">1</property>
                                                       </object>
                                                       <packing>
                                                         <property name="x_options">GTK_FILL</property>
@@ -540,8 +544,8 @@ and daemon (does not apply in Standalone mode).</property>
                                                       <object class="GtkLabel" id="label67">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">1</property>
                                                         <property name="label" translatable="yes">Downloading:</property>
+                                                        <property name="xalign">1</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">1</property>
@@ -570,8 +574,8 @@ and daemon (does not apply in Standalone mode).</property>
                                                       <object class="GtkLabel" id="label69">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">1</property>
                                                         <property name="label" translatable="yes">Waiting:</property>
+                                                        <property name="xalign">1</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">2</property>
@@ -600,8 +604,8 @@ and daemon (does not apply in Standalone mode).</property>
                                                       <object class="GtkLabel" id="label70">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">1</property>
                                                         <property name="label" translatable="yes">Missing:</property>
+                                                        <property name="xalign">1</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">3</property>
@@ -912,8 +916,8 @@ and daemon (does not apply in Standalone mode).</property>
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">Password:</property>
+                                                    <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -932,8 +936,6 @@ and daemon (does not apply in Standalone mode).</property>
                                                     <property name="truncate_multiline">True</property>
                                                     <property name="primary_icon_activatable">False</property>
                                                     <property name="secondary_icon_activatable">False</property>
-                                                    <property name="primary_icon_sensitive">True</property>
-                                                    <property name="secondary_icon_sensitive">True</property>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -1125,8 +1127,6 @@ and daemon (does not apply in Standalone mode).</property>
                   <object class="GtkScrolledWindow" id="DownloadsScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport2">
                         <property name="visible">True</property>
@@ -1204,8 +1204,8 @@ and daemon (does not apply in Standalone mode).</property>
                                           <object class="GtkLabel" id="label19">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Download to:</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="x_options">GTK_FILL</property>
@@ -1497,8 +1497,6 @@ used sparingly.</property>
                   <object class="GtkScrolledWindow" id="BandwidthScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport3">
                         <property name="visible">True</property>
@@ -1551,8 +1549,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_max_conn_per_sec</property>
                                                 <property name="numeric">True</property>
                                               </object>
@@ -1572,8 +1568,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_max_half_open_conn</property>
                                                 <property name="numeric">True</property>
                                               </object>
@@ -1589,8 +1583,8 @@ used sparingly.</property>
                                               <object class="GtkLabel" id="label58">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Connection Attempts per Second:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">5</property>
@@ -1602,8 +1596,8 @@ used sparingly.</property>
                                               <object class="GtkLabel" id="label57">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Half-Open Connections:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">4</property>
@@ -1616,8 +1610,8 @@ used sparingly.</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <property name="tooltip_text" translatable="yes">The maximum upload speed for all torrents.  Set -1 for unlimited.</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Upload Speed:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">3</property>
@@ -1630,8 +1624,8 @@ used sparingly.</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <property name="tooltip_text" translatable="yes">The maximum number of connections allowed.  Set -1 for unlimited.</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Connections:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="x_options">GTK_FILL</property>
@@ -1642,8 +1636,8 @@ used sparingly.</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <property name="tooltip_text" translatable="yes">The maximum upload slots for all torrents.  Set -1 for unlimited.</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Upload Slots:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">1</property>
@@ -1661,8 +1655,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_max_conn_global</property>
                                                 <property name="climb_rate">1</property>
                                                 <property name="snap_to_ticks">True</property>
@@ -1680,8 +1672,8 @@ used sparingly.</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <property name="tooltip_text" translatable="yes">The maximum download speed for all torrents.  Set -1 for unlimited.</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Download Speed:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">2</property>
@@ -1698,8 +1690,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_max_download</property>
                                                 <property name="climb_rate">1</property>
                                                 <property name="digits">1</property>
@@ -1722,8 +1712,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_max_upload</property>
                                                 <property name="climb_rate">1</property>
                                                 <property name="digits">1</property>
@@ -1746,8 +1734,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_max_upload_slots_global</property>
                                                 <property name="climb_rate">1</property>
                                                 <property name="snap_to_ticks">True</property>
@@ -1765,8 +1751,8 @@ used sparingly.</property>
                                               <object class="GtkLabel" id="label22">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">KiB/s</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">2</property>
@@ -1781,8 +1767,8 @@ used sparingly.</property>
                                               <object class="GtkLabel" id="label23">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">KiB/s</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">2</property>
@@ -1903,8 +1889,6 @@ used sparingly.</property>
                                             <property name="xalign">1</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <property name="adjustment">adjustment_spin_max_upload_slots_per_torrent</property>
                                             <property name="climb_rate">1</property>
                                             <property name="snap_to_ticks">True</property>
@@ -1928,8 +1912,6 @@ used sparingly.</property>
                                             <property name="xalign">1</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <property name="adjustment">adjustment_spin_max_conn_per_torrent</property>
                                             <property name="snap_to_ticks">True</property>
                                             <property name="numeric">True</property>
@@ -1944,8 +1926,8 @@ used sparingly.</property>
                                           <object class="GtkLabel" id="label18">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Connections:</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="x_options">GTK_FILL</property>
@@ -1955,8 +1937,8 @@ used sparingly.</property>
                                           <object class="GtkLabel" id="label24">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Upload Slots:</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">1</property>
@@ -1968,8 +1950,8 @@ used sparingly.</property>
                                           <object class="GtkLabel" id="label31">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Download Speed:</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">2</property>
@@ -1981,8 +1963,8 @@ used sparingly.</property>
                                           <object class="GtkLabel" id="label32">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Upload Speed:</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">3</property>
@@ -1999,8 +1981,6 @@ used sparingly.</property>
                                             <property name="xalign">1</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <property name="adjustment">adjustment_spin_max_download_per_torrent</property>
                                             <property name="digits">1</property>
                                             <property name="numeric">True</property>
@@ -2022,8 +2002,6 @@ used sparingly.</property>
                                             <property name="xalign">1</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <property name="adjustment">adjustment_spin_max_upload_per_torrent</property>
                                             <property name="digits">1</property>
                                             <property name="numeric">True</property>
@@ -2040,8 +2018,8 @@ used sparingly.</property>
                                           <object class="GtkLabel" id="label12">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">KiB/s</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">2</property>
@@ -2056,8 +2034,8 @@ used sparingly.</property>
                                           <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">KiB/s</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">2</property>
@@ -2117,8 +2095,6 @@ used sparingly.</property>
                   <object class="GtkScrolledWindow" id="QueueScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport9">
                         <property name="visible">True</property>
@@ -2217,8 +2193,6 @@ used sparingly.</property>
                                                     <property name="xalign">1</property>
                                                     <property name="primary_icon_activatable">False</property>
                                                     <property name="secondary_icon_activatable">False</property>
-                                                    <property name="primary_icon_sensitive">True</property>
-                                                    <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adjustment_spin_active</property>
                                                     <property name="snap_to_ticks">True</property>
                                                     <property name="numeric">True</property>
@@ -2236,8 +2210,6 @@ used sparingly.</property>
                                                     <property name="xalign">1</property>
                                                     <property name="primary_icon_activatable">False</property>
                                                     <property name="secondary_icon_activatable">False</property>
-                                                    <property name="primary_icon_sensitive">True</property>
-                                                    <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adjustment_spin_seeding</property>
                                                     <property name="snap_to_ticks">True</property>
                                                     <property name="numeric">True</property>
@@ -2254,8 +2226,8 @@ used sparingly.</property>
                                                   <object class="GtkLabel" id="label27">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">Seeding:</property>
+                                                    <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="top_attach">2</property>
@@ -2267,8 +2239,8 @@ used sparingly.</property>
                                                   <object class="GtkLabel" id="label48">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">Total:</property>
+                                                    <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="x_options">GTK_FILL</property>
@@ -2281,8 +2253,6 @@ used sparingly.</property>
                                                     <property name="xalign">1</property>
                                                     <property name="primary_icon_activatable">False</property>
                                                     <property name="secondary_icon_activatable">False</property>
-                                                    <property name="primary_icon_sensitive">True</property>
-                                                    <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adjustment_spin_downloading</property>
                                                     <property name="snap_to_ticks">True</property>
                                                     <property name="numeric">True</property>
@@ -2299,8 +2269,8 @@ used sparingly.</property>
                                                   <object class="GtkLabel" id="label42">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">Downloading:</property>
+                                                    <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="top_attach">1</property>
@@ -2389,8 +2359,8 @@ used sparingly.</property>
                                               <object class="GtkLabel" id="label53">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Share Ratio:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="x_options">GTK_FILL</property>
@@ -2400,8 +2370,8 @@ used sparingly.</property>
                                               <object class="GtkLabel" id="label54">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Time Ratio:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">1</property>
@@ -2413,8 +2383,8 @@ used sparingly.</property>
                                               <object class="GtkLabel" id="label55">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Time (m):</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">2</property>
@@ -2431,8 +2401,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_share_ratio_limit</property>
                                                 <property name="digits">2</property>
                                               </object>
@@ -2451,8 +2419,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_time_ratio_limit</property>
                                                 <property name="digits">2</property>
                                               </object>
@@ -2473,8 +2439,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_seed_time_limit</property>
                                               </object>
                                               <packing>
@@ -2548,11 +2512,8 @@ used sparingly.</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="invisible_char">•</property>
                                                     <property name="xalign">1</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>
-                                                    <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adjustment_share_ratio</property>
                                                     <property name="digits">2</property>
                                                     <property name="numeric">True</property>
@@ -2667,8 +2628,6 @@ used sparingly.</property>
                   <object class="GtkScrolledWindow" id="NetworkScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
@@ -2703,8 +2662,6 @@ used sparingly.</property>
                                         <property name="truncate_multiline">True</property>
                                         <property name="primary_icon_activatable">False</property>
                                         <property name="secondary_icon_activatable">False</property>
-                                        <property name="primary_icon_sensitive">True</property>
-                                        <property name="secondary_icon_sensitive">True</property>
                                       </object>
                                     </child>
                                   </object>
@@ -2756,8 +2713,6 @@ used sparingly.</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_incoming_port</property>
                                                 <property name="climb_rate">1</property>
                                                 <property name="snap_to_ticks">True</property>
@@ -2806,9 +2761,9 @@ used sparingly.</property>
                                                   <object class="GtkLabel" id="label3">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">Active Port:</property>
                                                     <property name="justify">right</property>
+                                                    <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -2821,9 +2776,9 @@ used sparingly.</property>
                                                     <property name="width_request">50</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="xalign">0</property>
                                                     <property name="label">0</property>
                                                     <property name="width_chars">5</property>
+                                                    <property name="xalign">0</property>
                                                     <attributes>
                                                       <attribute name="style" value="italic"/>
                                                     </attributes>
@@ -2931,11 +2886,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                         <property name="invisible_char">●</property>
                                         <property name="width_chars">15</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>
-                                        <property name="secondary_icon_sensitive">True</property>
                                       </object>
                                     </child>
                                   </object>
@@ -2996,8 +2948,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                             <property name="xalign">1</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <property name="adjustment">adjustment_spin_outgoing_port_min</property>
                                             <property name="climb_rate">1</property>
                                             <property name="snap_to_ticks">True</property>
@@ -3031,8 +2981,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                             <property name="xalign">1</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <property name="adjustment">adjustment_spin_outgoing_port_max</property>
                                             <property name="climb_rate">1</property>
                                             <property name="snap_to_ticks">True</property>
@@ -3149,8 +3097,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                               <object class="GtkLabel" id="label8">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">1</property>
                                                 <property name="label" translatable="yes">Outgoing:</property>
+                                                <property name="xalign">1</property>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">1</property>
@@ -3161,8 +3109,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                               <object class="GtkLabel" id="label7">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="xalign">1</property>
                                                 <property name="label" translatable="yes">Incoming:</property>
+                                                <property name="xalign">1</property>
                                               </object>
                                             </child>
                                           </object>
@@ -3185,9 +3133,9 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                                   <object class="GtkLabel" id="label9">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
-                                                    <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label" translatable="yes">Level:</property>
+                                                    <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">True</property>
@@ -3376,8 +3324,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                                 <property name="truncate_multiline">True</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -3440,8 +3386,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                   <object class="GtkScrolledWindow" id="ProxyScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport10">
                         <property name="visible">True</property>
@@ -3477,8 +3421,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                           <object class="GtkLabel" id="label_proxy_pass">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Password:</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">2</property>
@@ -3494,8 +3438,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                             <property name="truncate_multiline">True</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
@@ -3509,8 +3451,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                           <object class="GtkLabel" id="label_proxy_host">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Hostname:</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">3</property>
@@ -3525,8 +3467,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                             <property name="truncate_multiline">True</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <signal name="paste-clipboard" handler="on_entry_proxy_host_paste_clipboard" swapped="no"/>
                                           </object>
                                           <packing>
@@ -3540,8 +3480,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                           <object class="GtkLabel" id="label_proxy_port">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Port:</property>
+                                            <property name="xalign">1</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">4</property>
@@ -3561,8 +3501,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                                 <property name="can_focus">True</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_proxy_port</property>
                                                 <property name="numeric">True</property>
                                               </object>
@@ -3583,8 +3521,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                             <property name="truncate_multiline">True</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
@@ -3617,8 +3553,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L
                                           <object class="GtkLabel" id="label_proxy_user">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Username:</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">1</property>
@@ -3802,8 +3738,6 @@ the proxy instead of using the local DNS service</property>
                   <object class="GtkScrolledWindow" id="CacheScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport13">
                         <property name="visible">True</property>
@@ -3837,8 +3771,8 @@ the proxy instead of using the local DNS service</property>
                                           <object class="GtkLabel" id="label114">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Cache Size (16 KiB blocks):</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="x_options">GTK_FILL</property>
@@ -3850,8 +3784,8 @@ the proxy instead of using the local DNS service</property>
                                             <property name="can_focus">False</property>
                                             <property name="has_tooltip">True</property>
                                             <property name="tooltip_text" translatable="yes">The number of seconds from the last cached write to a piece in the write cache, to when it's forcefully flushed to disk. Default is 60 seconds.</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Cache Expiry (seconds):</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">1</property>
@@ -3868,8 +3802,6 @@ the proxy instead of using the local DNS service</property>
                                             <property name="xalign">1</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <property name="adjustment">adjustment_cache_size</property>
                                             <property name="numeric">True</property>
                                             <property name="update_policy">if-valid</property>
@@ -3890,8 +3822,6 @@ the proxy instead of using the local DNS service</property>
                                             <property name="xalign">1</property>
                                             <property name="primary_icon_activatable">False</property>
                                             <property name="secondary_icon_activatable">False</property>
-                                            <property name="primary_icon_sensitive">True</property>
-                                            <property name="secondary_icon_sensitive">True</property>
                                             <property name="adjustment">adjustment_cache_expiry</property>
                                           </object>
                                           <packing>
@@ -3963,8 +3893,8 @@ the proxy instead of using the local DNS service</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="tooltip_text" translatable="yes">The total number of 16 KiB blocks written to disk since this session was started.</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Blocks Written:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="x_options">GTK_FILL</property>
@@ -3975,8 +3905,8 @@ the proxy instead of using the local DNS service</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="tooltip_text" translatable="yes">The total number of write operations performed since this session was started.</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Writes:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">1</property>
@@ -3989,8 +3919,8 @@ the proxy instead of using the local DNS service</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="tooltip_text" translatable="yes">The ratio (blocks_written - writes) / blocks_written represents the number of saved write operations per total write operations, i.e. a kind of cache hit ratio for the write cache.</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Write Cache Hit Ratio:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">2</property>
@@ -4082,8 +4012,8 @@ the proxy instead of using the local DNS service</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="tooltip_text" translatable="yes">The number of blocks that were requested from the bittorrent engine (from peers), that were served from disk or cache.</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Blocks Read:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="x_options">GTK_FILL</property>
@@ -4094,8 +4024,8 @@ the proxy instead of using the local DNS service</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="tooltip_text" translatable="yes">The number of blocks that were served from cache.</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Blocks Read Hit:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">1</property>
@@ -4108,8 +4038,8 @@ the proxy instead of using the local DNS service</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="tooltip_text" translatable="yes">The cache hit ratio for the read cache.</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Read Cache Hit Ratio:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">3</property>
@@ -4163,8 +4093,8 @@ the proxy instead of using the local DNS service</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="has_tooltip">True</property>
                                                         <property name="tooltip_text" translatable="yes">The total number of read operations performed since this session was started.</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Reads:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">2</property>
@@ -4229,8 +4159,8 @@ the proxy instead of using the local DNS service</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
                                                         <property name="tooltip_text" translatable="yes">The number of 16 KiB blocks currently in the disk cache. This includes both read and write cache.</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Cache Size:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="x_options">GTK_FILL</property>
@@ -4240,8 +4170,8 @@ the proxy instead of using the local DNS service</property>
                                                       <object class="GtkLabel" id="label117">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Read Cache Size:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">1</property>
@@ -4369,8 +4299,6 @@ the proxy instead of using the local DNS service</property>
                   <object class="GtkScrolledWindow" id="OtherScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport8">
                         <property name="visible">True</property>
@@ -4401,9 +4329,9 @@ the proxy instead of using the local DNS service</property>
                                           <object class="GtkLabel" id="label44">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Help us improve Deluge by sending us your Python version, PyGTK version, OS and processor types.  Absolutely no other information is sent.</property>
                                             <property name="wrap">True</property>
+                                            <property name="xalign">0</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -4501,8 +4429,6 @@ the proxy instead of using the local DNS service</property>
                                                     <property name="truncate_multiline">True</property>
                                                     <property name="primary_icon_activatable">False</property>
                                                     <property name="secondary_icon_activatable">False</property>
-                                                    <property name="primary_icon_sensitive">True</property>
-                                                    <property name="secondary_icon_sensitive">True</property>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">True</property>
@@ -4620,8 +4546,6 @@ the proxy instead of using the local DNS service</property>
                   <object class="GtkScrolledWindow" id="DaemonScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport7">
                         <property name="visible">True</property>
@@ -4672,8 +4596,6 @@ the proxy instead of using the local DNS service</property>
                                                 <property name="xalign">1</property>
                                                 <property name="primary_icon_activatable">False</property>
                                                 <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adjustment_spin_daemon_port</property>
                                               </object>
                                               <packing>
@@ -4812,6 +4734,9 @@ the proxy instead of using the local DNS service</property>
                                           <object class="GtkTreeView" id="accounts_listview">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <child internal-child="selection">
+                                              <object class="GtkTreeSelection"/>
+                                            </child>
                                           </object>
                                           <packing>
                                             <property name="expand">True</property>
@@ -4889,10 +4814,10 @@ the proxy instead of using the local DNS service</property>
                                   <object class="GtkLabel" id="label61">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="xpad">10</property>
                                     <property name="ypad">10</property>
                                     <property name="label" translatable="yes">Accounts</property>
+                                    <property name="xalign">0</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
                                     </attributes>
@@ -4921,8 +4846,6 @@ the proxy instead of using the local DNS service</property>
                   <object class="GtkScrolledWindow" id="PluginsScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport5">
                         <property name="visible">True</property>
@@ -4941,13 +4864,14 @@ the proxy instead of using the local DNS service</property>
                                   <object class="GtkScrolledWindow" id="scrolledwindow12">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
                                     <property name="shadow_type">in</property>
                                     <child>
                                       <object class="GtkTreeView" id="plugin_listview">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <child internal-child="selection">
+                                          <object class="GtkTreeSelection"/>
+                                        </child>
                                       </object>
                                     </child>
                                   </object>
@@ -4961,8 +4885,6 @@ the proxy instead of using the local DNS service</property>
                                     <property name="height_request">115</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
                                     <child>
                                       <object class="GtkViewport" id="viewport12">
                                         <property name="visible">True</property>
@@ -5031,9 +4953,9 @@ the proxy instead of using the local DNS service</property>
                                                       <object class="GtkLabel" id="label85">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
+                                                        <property name="label" translatable="yes">Details:</property>
                                                         <property name="xalign">0</property>
                                                         <property name="yalign">0</property>
-                                                        <property name="label" translatable="yes">Details:</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">4</property>
@@ -5046,8 +4968,8 @@ the proxy instead of using the local DNS service</property>
                                                       <object class="GtkLabel" id="label84">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Version:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">1</property>
@@ -5060,8 +4982,8 @@ the proxy instead of using the local DNS service</property>
                                                       <object class="GtkLabel" id="label82">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Author:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="x_options">GTK_FILL</property>
@@ -5072,8 +4994,8 @@ the proxy instead of using the local DNS service</property>
                                                       <object class="GtkLabel" id="label86">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Homepage:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">3</property>
@@ -5086,8 +5008,8 @@ the proxy instead of using the local DNS service</property>
                                                       <object class="GtkLabel" id="label87">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">False</property>
-                                                        <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">Author Email:</property>
+                                                        <property name="xalign">0</property>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">2</property>
diff --git a/deluge/ui/gtkui/glade/queuedtorrents.ui b/deluge/ui/gtkui/glade/queuedtorrents.ui
index 81cbd8dd8..78d6209f1 100644
--- a/deluge/ui/gtkui/glade/queuedtorrents.ui
+++ b/deluge/ui/gtkui/glade/queuedtorrents.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="queued_torrents_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -11,13 +11,16 @@
     <property name="default_height">300</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -92,9 +95,9 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0.05000000074505806</property>
                     <property name="ypad">10</property>
                     <property name="label" translatable="yes">Add Queued Torrents</property>
+                    <property name="xalign">0.05000000074505806</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                       <attribute name="scale" value="1.2"/>
@@ -117,14 +120,15 @@
               <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkTreeView" id="treeview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="headers_visible">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
+                    </child>
                   </object>
                 </child>
               </object>
diff --git a/deluge/ui/gtkui/glade/remove_torrent_dialog.ui b/deluge/ui/gtkui/glade/remove_torrent_dialog.ui
index dad327351..86057057e 100644
--- a/deluge/ui/gtkui/glade/remove_torrent_dialog.ui
+++ b/deluge/ui/gtkui/glade/remove_torrent_dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="remove_torrent_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -11,86 +11,16 @@
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" id="hbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="yalign">0</property>
-                <property name="stock">gtk-dialog-warning</property>
-                <property name="icon-size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_title">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Remove the selected torrent(s)?</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                  <attribute name="scale" value="1.3"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_torrents">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0.05000000074505806</property>
-            <property name="ypad">5</property>
-            <property name="ellipsize">end</property>
-            <attributes>
-              <attribute name="style" value="italic"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHSeparator" id="hseparator2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -133,6 +63,79 @@
             <property name="position">4</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon_size">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_title">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Remove the selected torrent(s)?</property>
+                <property name="xalign">0</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                  <attribute name="scale" value="1.3"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label_torrents">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="ypad">5</property>
+            <property name="ellipsize">end</property>
+            <property name="xalign">0.05000000074505806</property>
+            <attributes>
+              <attribute name="style" value="italic"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <object class="GtkHSeparator" id="hseparator2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkHBox" id="hbox2">
             <property name="visible">True</property>
@@ -143,8 +146,8 @@
                 <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="focus_on_click">False</property>
+                <property name="receives_default">False</property>
                 <property name="draw_indicator">True</property>
                 <signal name="toggled" handler="on_delete_files_toggled" swapped="no"/>
               </object>
@@ -157,10 +160,10 @@
             <child>
               <object class="GtkLabel" id="warning_label">
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="xpad">4</property>
                 <property name="ypad">2</property>
                 <property name="label" translatable="yes">(This is permanent!)</property>
+                <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                   <attribute name="scale" value="0.90000000000000002"/>
diff --git a/deluge/ui/gtkui/glade/torrent_menu.options.ui b/deluge/ui/gtkui/glade/torrent_menu.options.ui
index 9fc56f8df..0076b3920 100644
--- a/deluge/ui/gtkui/glade/torrent_menu.options.ui
+++ b/deluge/ui/gtkui/glade/torrent_menu.options.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="download-limit-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -11,7 +11,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-network</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="upload-limit-image">
     <property name="visible">True</property>
@@ -22,7 +22,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-sort-ascending</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="options_torrent_menu">
     <property name="visible">True</property>
diff --git a/deluge/ui/gtkui/glade/torrent_menu.queue.ui b/deluge/ui/gtkui/glade/torrent_menu.queue.ui
index 14170868d..3930d3eaf 100644
--- a/deluge/ui/gtkui/glade/torrent_menu.queue.ui
+++ b/deluge/ui/gtkui/glade/torrent_menu.queue.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkMenu" id="queue_torrent_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
diff --git a/deluge/ui/gtkui/glade/torrent_menu.ui b/deluge/ui/gtkui/glade/torrent_menu.ui
index a8e79b928..2edb8997d 100644
--- a/deluge/ui/gtkui/glade/torrent_menu.ui
+++ b/deluge/ui/gtkui/glade/torrent_menu.ui
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-preferences</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image12">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-edit</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image13">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-media-play</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image14">
     <property name="can_focus">False</property>
     <property name="stock">gtk-media-pause</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image19">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-sort-descending</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image5">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-refresh</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image6">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-redo</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-open</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image8">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-save-as</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image9">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-remove</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="torrent_menu">
     <property name="visible">True</property>
diff --git a/deluge/ui/gtkui/glade/tray_menu.ui b/deluge/ui/gtkui/glade/tray_menu.ui
index aec177d4e..da1cabd76 100644
--- a/deluge/ui/gtkui/glade/tray_menu.ui
+++ b/deluge/ui/gtkui/glade/tray_menu.ui
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkImage" id="download-limit-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-add</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image6">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-media-pause</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-media-play</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image8">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-quit</property>
-    <property name="icon-size">1</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>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="tray_menu">
     <property name="visible">True</property>