[GTK3] Save ui files with Glade 3.22

To ensure properties are updated this is a simple open and save with the
glade designer. Always a bit messy with the diff but should not
change functionality.

18 files changed, 152 insertions, 102 deletions

diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
index 3e91a7cfb..a7a8caeaa 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
@@ -17,8 +17,8 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area7">
@@ -66,8 +66,8 @@
         <child>
           <object class="GtkBox" id="vbox7">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkBox" id="hbox8">
@@ -110,9 +110,9 @@
             </child>
             <child>
               <object class="GtkSeparator" id="hseparator2">
-                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.ui
index c103cca28..0944eb3e6 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.ui
@@ -368,8 +368,8 @@
                                   <object class="GtkLabel" id="prefetch_label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Please wait for files...</property>
+                                    <property name="xalign">0</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
                                     </attributes>
@@ -406,7 +406,7 @@
                                 <child internal-child="selection">
                                   <object class="GtkTreeSelection" id="treeselection2"/>
                                 </child>
-                            </object>
+                              </object>
                             </child>
                           </object>
                           <packing>
diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui
index af5efaaae..ecbd0f7cf 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui
@@ -17,8 +17,8 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area5">
@@ -66,8 +66,8 @@
         <child>
           <object class="GtkBox" id="vbox6">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkBox" id="hbox7">
diff --git a/deluge/ui/gtk3/glade/connect_peer_dialog.ui b/deluge/ui/gtk3/glade/connect_peer_dialog.ui
index 9ba2a9ea9..f5e9337ea 100644
--- a/deluge/ui/gtk3/glade/connect_peer_dialog.ui
+++ b/deluge/ui/gtk3/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="3.0"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="connect_peer_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -11,11 +11,14 @@
     <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="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area4">
@@ -63,8 +66,8 @@
         <child>
           <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">2</property>
             <child>
               <object class="GtkBox" id="hbox1">
@@ -125,11 +128,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/gtk3/glade/create_torrent_dialog.progress.ui b/deluge/ui/gtk3/glade/create_torrent_dialog.progress.ui
index cc28a0d9e..e46ef17fd 100644
--- a/deluge/ui/gtk3/glade/create_torrent_dialog.progress.ui
+++ b/deluge/ui/gtk3/glade/create_torrent_dialog.progress.ui
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
-  <!-- interface-naming-policy project-wide -->
   <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="GtkBox" id="dialog-vbox9">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area9">
diff --git a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui b/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui
index 6595752c6..dc7b7e93e 100644
--- a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui
+++ b/deluge/ui/gtk3/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="3.0"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="remote_path_dialog">
     <property name="width_request">462</property>
     <property name="can_focus">False</property>
@@ -11,11 +11,14 @@
     <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="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area7">
@@ -63,8 +66,8 @@
         <child>
           <object class="GtkBox" id="vbox6">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkBox" id="hbox7">
@@ -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/gtk3/glade/create_torrent_dialog.remote_save.ui b/deluge/ui/gtk3/glade/create_torrent_dialog.remote_save.ui
index 23cebc3a9..a380718e4 100644
--- a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_save.ui
+++ b/deluge/ui/gtk3/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="3.0"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="remote_save_dialog">
     <property name="width_request">462</property>
     <property name="can_focus">False</property>
@@ -11,11 +11,14 @@
     <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="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area5">
@@ -63,8 +66,8 @@
         <child>
           <object class="GtkBox" id="vbox5">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkBox" id="hbox15">
@@ -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/gtk3/glade/edit_trackers.add.ui b/deluge/ui/gtk3/glade/edit_trackers.add.ui
index cdf3acce2..39d197834 100644
--- a/deluge/ui/gtk3/glade/edit_trackers.add.ui
+++ b/deluge/ui/gtk3/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="3.0"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="add_tracker_dialog">
     <property name="width_request">400</property>
     <property name="height_request">200</property>
@@ -11,11 +11,14 @@
     <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="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area5">
@@ -65,8 +68,8 @@
         <child>
           <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkBox" id="hbox1">
@@ -109,7 +112,6 @@
             </child>
             <child>
               <object class="GtkSeparator" id="hseparator1">
-                <property name="orientation"></property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
@@ -140,8 +142,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/gtk3/glade/edit_trackers.edit.ui b/deluge/ui/gtk3/glade/edit_trackers.edit.ui
index f6279b2ef..2521e8ff8 100644
--- a/deluge/ui/gtk3/glade/edit_trackers.edit.ui
+++ b/deluge/ui/gtk3/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="3.0"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="edit_tracker_entry">
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
@@ -10,11 +10,14 @@
     <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="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area7">
@@ -64,8 +67,8 @@
         <child>
           <object class="GtkBox" id="vbox2">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkBox" id="hbox3">
@@ -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/gtk3/glade/filtertree_menu.ui b/deluge/ui/gtk3/glade/filtertree_menu.ui
index 29d113c23..d2861e1b7 100644
--- a/deluge/ui/gtk3/glade/filtertree_menu.ui
+++ b/deluge/ui/gtk3/glade/filtertree_menu.ui
@@ -29,6 +29,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image22</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_select_all" swapped="no"/>
       </object>
     </child>
@@ -39,6 +40,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image22</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_pause_all" swapped="no"/>
       </object>
     </child>
@@ -50,6 +52,7 @@
         <property name="tooltip_text" translatable="yes">Resume selected torrents.</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image23</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_resume_all" swapped="no"/>
       </object>
     </child>
diff --git a/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui b/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui
index c73945df0..ddd8248f7 100644
--- a/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui
+++ b/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -52,6 +52,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image6</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_open_file_activate" swapped="no"/>
       </object>
     </child>
@@ -62,6 +63,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image7</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_show_file_activate" swapped="no"/>
       </object>
     </child>
@@ -78,6 +80,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image1</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_expand_all_activate" swapped="no"/>
       </object>
     </child>
@@ -94,6 +97,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image2</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_ignore_activate" swapped="no"/>
       </object>
     </child>
@@ -104,6 +108,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image5</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_low_activate" swapped="no"/>
       </object>
     </child>
@@ -114,6 +119,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image3</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_normal_activate" swapped="no"/>
       </object>
     </child>
@@ -124,6 +130,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image4</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_high_activate" swapped="no"/>
       </object>
     </child>
diff --git a/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui b/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui
index 55ea739b4..d35ef7752 100644
--- a/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui
+++ b/deluge/ui/gtk3/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="3.0"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="icon_name">list-add-symbolic</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>
@@ -19,6 +19,7 @@
         <property name="tooltip_text" translatable="yes">Add a peer by its IP</property>
         <property name="use_underline">True</property>
         <property name="image">image1</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_add_peer_activate" swapped="no"/>
       </object>
     </child>
diff --git a/deluge/ui/gtk3/glade/main_window.ui b/deluge/ui/gtk3/glade/main_window.ui
index a2a3cafe6..c6cac5571 100644
--- a/deluge/ui/gtk3/glade/main_window.ui
+++ b/deluge/ui/gtk3/glade/main_window.ui
@@ -96,10 +96,13 @@
       <group name="accelgroup1"/>
     </accel-groups>
     <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
             <property name="visible">True</property>
@@ -121,6 +124,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">add-image</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_addtorrent_activate" swapped="no"/>
                         <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -132,6 +136,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">new-image</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_createtorrent_activate" swapped="no"/>
                         <accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -147,6 +152,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">quit-daemon-image</property>
+                        <property name="use_stock">False</property>
                         <property name="always_show_image">True</property>
                         <signal name="activate" handler="on_menuitem_quitdaemon_activate" swapped="no"/>
                         <accelerator key="Q" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
@@ -165,6 +171,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">quit_image</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <signal name="activate" handler="on_menuitem_quit_activate" swapped="no"/>
                       </object>
@@ -190,6 +197,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">prefs-image</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <signal name="activate" handler="on_menuitem_preferences_activate" swapped="no"/>
                         <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -202,6 +210,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">connection-image</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_connectionmanager_activate" swapped="no"/>
                         <accelerator key="M" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -354,6 +363,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_homepage_activate" swapped="no"/>
                       </object>
                     </child>
@@ -364,6 +374,7 @@
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Frequently Asked Questions</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="on_menuitem_faq_activate" swapped="no"/>
                         <accelerator key="F1" signal="activate"/>
                       </object>
@@ -374,6 +385,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <property name="always_show_image">True</property>
                         <signal name="activate" handler="on_menuitem_community_activate" swapped="no"/>
                       </object>
@@ -391,6 +403,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">about-image</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <signal name="activate" handler="on_menuitem_about_activate" swapped="no"/>
                       </object>
@@ -467,6 +480,7 @@ This will filter torrents for the current selection on the sidebar.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
@@ -508,6 +522,7 @@ This will filter torrents for the current selection on the sidebar.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
@@ -549,6 +564,7 @@ This will filter torrents for the current selection on the sidebar.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
@@ -596,8 +612,8 @@ This will filter torrents for the current selection on the sidebar.</property>
             <child>
               <object class="GtkPaned" id="vpaned">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkPaned" id="main_window_hpaned">
                     <property name="visible">True</property>
@@ -615,10 +631,9 @@ This will filter torrents for the current selection on the sidebar.</property>
                     <child>
                       <object class="GtkBox" id="vbox2">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
                         <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <!-- <object class="Gtk H Box" id="search_box"> -->
                           <object class="GtkBox" id="search_box">
                             <property name="can_focus">False</property>
                             <child>
@@ -668,13 +683,9 @@ This will filter torrents for the current selection on the sidebar.</property>
 This will filter torrents for the current selection on the sidebar.</property>
                                 <property name="invisible_char">•</property>
                                 <property name="truncate_multiline">True</property>
-                                <property name="invisible_char_set">True</property>
                                 <property name="caps_lock_warning">False</property>
                                 <property name="secondary_icon_name">edit-clear-symbolic</property>
-                                <property name="primary_icon_activatable">True</property>
-                                <property name="secondary_icon_activatable">True</property>
                                 <property name="primary_icon_sensitive">False</property>
-                                <property name="secondary_icon_sensitive">True</property>
                                 <property name="secondary_icon_tooltip_text" translatable="yes">Clear the search</property>
                                 <property name="secondary_icon_tooltip_markup" translatable="yes">Clear the search</property>
                                 <signal name="changed" handler="on_search_torrents_entry_changed" swapped="no"/>
@@ -715,8 +726,6 @@ This will filter torrents for the current selection on the sidebar.</property>
                           <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">out</property>
                             <child>
                               <object class="GtkTreeView" id="torrent_view">
@@ -724,6 +733,9 @@ This will filter torrents for the current selection on the sidebar.</property>
                                 <property name="can_focus">True</property>
                                 <property name="rules_hint">True</property>
                                 <property name="enable_search">False</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection"/>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -752,8 +764,6 @@ This will filter torrents for the current selection on the sidebar.</property>
                     <property name="tab_pos">left</property>
                     <property name="show_border">False</property>
                     <property name="scrollable">True</property>
-                    <!-- <property name="tab_hborder">8</property>
-                    <property name="tab_vborder">0</property> -->
                   </object>
                   <packing>
                     <property name="resize">False</property>
diff --git a/deluge/ui/gtk3/glade/remove_torrent_dialog.ui b/deluge/ui/gtk3/glade/remove_torrent_dialog.ui
index 8fccaa422..4a9203794 100644
--- a/deluge/ui/gtk3/glade/remove_torrent_dialog.ui
+++ b/deluge/ui/gtk3/glade/remove_torrent_dialog.ui
@@ -11,12 +11,57 @@
     <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="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</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="cancel_button">
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="has_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="ok_button">
+                <property name="label" translatable="yes">_OK</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </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">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkBox" id="hbox1">
             <property name="visible">True</property>
@@ -58,14 +103,10 @@
           </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="ellipsize">end</property>
-            <property name="ellipsize">end</property>
             <attributes>
               <attribute name="style" value="italic"/>
             </attributes>
@@ -77,8 +118,10 @@
           </packing>
         </child>
         <child>
+          <placeholder/>
+        </child>
+        <child>
           <object class="GtkSeparator" id="hseparator2">
-            <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
           </object>
@@ -88,48 +131,6 @@
             <property name="position">4</property>
           </packing>
         </child>
-        <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="cancel_button">
-                <property name="label" translatable="yes">_Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="ok_button">
-                <property name="label" translatable="yes">_OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </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">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkBox" id="hbox2">
             <property name="visible">True</property>
diff --git a/deluge/ui/gtk3/glade/torrent_menu.options.ui b/deluge/ui/gtk3/glade/torrent_menu.options.ui
index c91c14ecb..df34445d5 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.options.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.options.ui
@@ -34,6 +34,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">download-limit-image</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -43,6 +44,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">upload-limit-image</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -52,6 +54,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">max-connections-image</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -61,6 +64,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">upload-slots-image</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
diff --git a/deluge/ui/gtk3/glade/torrent_menu.queue.ui b/deluge/ui/gtk3/glade/torrent_menu.queue.ui
index a6f0773bd..a120af270 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.queue.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.queue.ui
@@ -31,6 +31,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="image">image5</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_queue_top_activate" swapped="no"/>
       </object>
     </child>
@@ -40,6 +41,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="image">image6</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_queue_up_activate" swapped="no"/>
       </object>
     </child>
@@ -49,6 +51,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="image">image7</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_queue_down_activate" swapped="no"/>
       </object>
     </child>
@@ -58,6 +61,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="image">image8</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_queue_bottom_activate" swapped="no"/>
       </object>
     </child>
diff --git a/deluge/ui/gtk3/glade/torrent_menu.ui b/deluge/ui/gtk3/glade/torrent_menu.ui
index 490af1112..c1b77b4ad 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.ui
@@ -83,6 +83,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image7</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_open_folder_activate" swapped="no"/>
       </object>
     </child>
@@ -99,6 +100,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image14</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_pause_activate" swapped="no"/>
       </object>
     </child>
@@ -110,6 +112,7 @@
         <property name="tooltip_text" translatable="yes">Resume selected torrents.</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image13</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_resume_activate" swapped="no"/>
       </object>
     </child>
@@ -126,6 +129,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">image1</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -141,6 +145,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image19</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -156,6 +161,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image5</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_updatetracker_activate" swapped="no"/>
       </object>
     </child>
@@ -166,6 +172,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image12</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_edittrackers_activate" swapped="no"/>
       </object>
     </child>
@@ -182,6 +189,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image9</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_remove_activate" swapped="no"/>
       </object>
     </child>
@@ -198,6 +206,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image6</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_recheck_activate" swapped="no"/>
       </object>
     </child>
@@ -208,6 +217,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">menu-item-image8</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_move_activate" swapped="no"/>
       </object>
     </child>
diff --git a/deluge/ui/gtk3/glade/tray_menu.ui b/deluge/ui/gtk3/glade/tray_menu.ui
index d4e24888d..060b7a06f 100644
--- a/deluge/ui/gtk3/glade/tray_menu.ui
+++ b/deluge/ui/gtk3/glade/tray_menu.ui
@@ -68,6 +68,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">add-image</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_add_torrent_activate" swapped="no"/>
       </object>
     </child>
@@ -84,6 +85,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">pause-image</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_pause_session_activate" swapped="no"/>
       </object>
     </child>
@@ -94,6 +96,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">resume-image</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_resume_session_activate" swapped="no"/>
       </object>
     </child>
@@ -110,6 +113,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">download-limit-image</property>
+        <property name="use_stock">False</property>
         <property name="always_show_image">True</property>
       </object>
     </child>
@@ -120,6 +124,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">upload-limit-image</property>
+        <property name="use_stock">False</property>
         <property name="always_show_image">True</property>
       </object>
     </child>
@@ -136,6 +141,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">quit-daemon-image</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_menuitem_quitdaemon_activate" swapped="no"/>
       </object>
     </child>
@@ -152,6 +158,7 @@
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="image">quit-image</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
         <signal name="activate" handler="on_menuitem_quit_activate" swapped="no"/>
       </object>