[GTK3] Replace stock icons for named icons

10 files changed, 196 insertions, 114 deletions

diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
index 2663b08a9..2391bff0b 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
@@ -78,7 +78,7 @@
                   <object class="GtkImage" id="image_dialog_magnet">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-revert-to-saved</property>
+                    <property name="icon_name">document-revert-symbolic</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 66ce8c16b..c401a85f4 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.ui
@@ -145,7 +145,7 @@
                                   <object class="GtkImage" id="image3">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-open</property>
+                                    <property name="icon_name">document-open-symbolic</property>
                                     <property name="icon_size">1</property>
                                   </object>
                                   <packing>
@@ -191,7 +191,7 @@
                                   <object class="GtkImage" id="image4">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-network</property>
+                                    <property name="icon_name">insert-link-symbolic</property>
                                     <property name="icon_size">1</property>
                                   </object>
                                   <packing>
@@ -237,7 +237,7 @@
                                   <object class="GtkImage" id="image5">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-revert-to-saved</property>
+                                    <property name="icon_name">document-revert-symbolic</property>
                                     <property name="icon_size">1</property>
                                   </object>
                                   <packing>
@@ -283,7 +283,7 @@
                                   <object class="GtkImage" id="image2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-remove</property>
+                                    <property name="icon_name">list-remove-symbolic</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -425,7 +425,7 @@
                           <object class="GtkImage" id="image9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="stock">gtk-open</property>
+                            <property name="icon_name">document-open-symbolic</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -878,7 +878,8 @@ used sparingly.</property>
                                           <object class="GtkImage" id="image7">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="stock">gtk-apply</property>
+                                            <property name="xalign">1</property>
+                                            <property name="icon_name">emblem-ok-symbolic</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -929,7 +930,7 @@ used sparingly.</property>
                                           <object class="GtkImage" id="image8">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="stock">gtk-revert-to-saved</property>
+                                            <property name="icon_name">document-revert-symbolic</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -982,7 +983,7 @@ used sparingly.</property>
                           <object class="GtkImage" id="image10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="stock">gtk-properties</property>
+                            <property name="icon_name">document-properties-symbolic</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui
index 55139d8eb..7c7cfbbd6 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui
@@ -78,7 +78,7 @@
                   <object class="GtkImage" id="image11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-add</property>
+                    <property name="icon_name">list-add-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
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 64e6d8bbb..e4534e5be 100644
--- a/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui
+++ b/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui
@@ -5,53 +5,65 @@
   <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_name">zoom-fit-best-symbolic</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_name">action-unavailable-symbolic</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_name">go-next-symbolic</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_name">go-up-symbolic</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_name">go-down-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">document-open-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">folder-open-symbolic</property>
   </object>
   <object class="GtkMenu" id="menu_file_tab">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_open_file">
-        <property name="label">gtk-open</property>
+        <property name="label">_Open File</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">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>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_show_file">
-        <property name="label">_Show</property>
+        <property name="label">_Show Folder</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">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>
diff --git a/deluge/ui/gtk3/glade/main_window.ui b/deluge/ui/gtk3/glade/main_window.ui
index 33731d905..3a8e879ff 100644
--- a/deluge/ui/gtk3/glade/main_window.ui
+++ b/deluge/ui/gtk3/glade/main_window.ui
@@ -1,8 +1,24 @@
 <?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">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-missing-image</property>
+  </object>
+  <object class="GtkImage" id="about-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">help-about-symbolic</property>
+  </object>
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="add-image">
+    <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>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">-1</property>
     <property name="upper">999999</property>
@@ -33,41 +49,50 @@
     <property name="step_increment">0.10000000000000001</property>
     <property name="page_increment">10</property>
   </object>
-  <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>
-  </object>
-  <object class="GtkImage" id="image2">
+  <object class="GtkImage" id="connection-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-no</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_name">preferences-system-network-symbolic</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-goto-top</property>
-    <property name="icon-size">1</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="image6">
     <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="new-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">document-new-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="prefs-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">preferences-system-symbolic</property>
+  </object>
+  <object class="GtkImage" id="quit-daemon-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">system-shutdown-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="quit_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">application-exit-symbolic</property>
   </object>
   <object class="GtkWindow" id="main_window">
     <property name="can_focus">False</property>
@@ -100,9 +125,10 @@
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
+                        <property name="image">add-image</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="on_menuitem_addtorrent_activate" swapped="no"/>
+                        <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -111,9 +137,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
+                        <property name="image">new-image</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="on_menuitem_createtorrent_activate" swapped="no"/>
+                        <accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -126,9 +153,11 @@
                         <property name="label" translatable="yes">Quit &amp; _Shutdown Daemon</property>
                         <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>
-                        <accelerator key="Q" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <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"/>
                       </object>
                     </child>
                     <child>
@@ -139,11 +168,12 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_quit">
-                        <property name="label">gtk-quit</property>
+                        <property name="label">_Quit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">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>
@@ -164,14 +194,15 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_preferences">
-                        <property name="label">gtk-preferences</property>
+                        <property name="label">_Preferences</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">prefs-image</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
-                        <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="on_menuitem_preferences_activate" swapped="no"/>
+                        <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -180,9 +211,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
+                        <property name="image">connection-image</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="M" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="on_menuitem_connectionmanager_activate" swapped="no"/>
+                        <accelerator key="M" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                   </object>
@@ -265,8 +297,8 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Find ...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="on_search_filter_toggle" swapped="no"/>
+                        <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -345,8 +377,8 @@
                         <property name="tooltip_text" translatable="yes">Frequently Asked Questions</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="F1" signal="activate"/>
                         <signal name="activate" handler="on_menuitem_faq_activate" swapped="no"/>
+                        <accelerator key="F1" signal="activate"/>
                       </object>
                     </child>
                     <child>
@@ -356,6 +388,7 @@
                         <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>
                     </child>
@@ -367,11 +400,12 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_about">
-                        <property name="label">gtk-about</property>
+                        <property name="label">_About</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">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>
@@ -391,6 +425,7 @@
           <object class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="icon_size">2</property>
             <child>
               <object class="GtkToolButton" id="toolbutton_add">
                 <property name="visible">True</property>
@@ -399,8 +434,7 @@
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Add torrent</property>
                 <property name="label" translatable="yes">Add Torrent</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-add</property>
+                <property name="icon_name">list-add-symbolic</property>
                 <signal name="clicked" handler="on_toolbutton_add_clicked" swapped="no"/>
               </object>
               <packing>
@@ -416,7 +450,7 @@
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Remove torrent</property>
                 <property name="label" translatable="yes">Remove Torrent</property>
-                <property name="stock_id">gtk-remove</property>
+                <property name="icon_name">list-remove-symbolic</property>
                 <signal name="clicked" handler="on_toolbutton_remove_clicked" swapped="no"/>
               </object>
               <packing>
@@ -431,11 +465,10 @@
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Filter torrents by name.
 This will filter torrents for the current selection on the sidebar.</property>
-                <property name="label" translatable="yes">_Filter</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-find</property>
-                <accelerator key="f" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                <property name="label" translatable="yes">Filter</property>
+                <property name="icon_name">system-search-symbolic</property>
                 <signal name="clicked" handler="on_search_filter_toggle" swapped="no"/>
+                <accelerator key="f" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -459,8 +492,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Pause the selected torrents</property>
                 <property name="label" translatable="yes">Pause</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-media-pause</property>
+                <property name="icon_name">media-playback-pause-symbolic</property>
                 <signal name="clicked" handler="on_toolbutton_pause_clicked" swapped="no"/>
               </object>
               <packing>
@@ -476,7 +508,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Resume the selected torrents</property>
                 <property name="label" translatable="yes">Resume</property>
-                <property name="stock_id">gtk-media-play</property>
+                <property name="icon_name">media-playback-start-symbolic</property>
                 <signal name="clicked" handler="on_toolbutton_resume_clicked" swapped="no"/>
               </object>
               <packing>
@@ -501,7 +533,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Queue Torrent Up</property>
                 <property name="label" translatable="yes">Queue Up</property>
-                <property name="stock_id">gtk-go-up</property>
+                <property name="icon_name">go-up-symbolic</property>
                 <signal name="clicked" handler="on_toolbutton_queue_up_clicked" swapped="no"/>
               </object>
               <packing>
@@ -517,7 +549,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Queue Torrent Down</property>
                 <property name="label" translatable="yes">Queue Down</property>
-                <property name="stock_id">gtk-go-down</property>
+                <property name="icon_name">go-down-symbolic</property>
                 <signal name="clicked" handler="on_toolbutton_queue_down_clicked" swapped="no"/>
               </object>
               <packing>
@@ -541,8 +573,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Preferences</property>
                 <property name="label" translatable="yes">Preferences</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-preferences</property>
+                <property name="icon_name">preferences-system-symbolic</property>
                 <signal name="clicked" handler="on_toolbutton_preferences_clicked" swapped="no"/>
               </object>
               <packing>
@@ -557,7 +588,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Connection Manager</property>
                 <property name="label" translatable="yes">Connection Manager</property>
-                <property name="stock_id">gtk-network</property>
+                <property name="icon_name">preferences-system-network-symbolic</property>
                 <signal name="clicked" handler="on_toolbutton_connectionmanager_clicked" swapped="no"/>
               </object>
               <packing>
@@ -619,7 +650,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="stock">gtk-close</property>
-                                    <property name="icon-size">2</property>
+                                    <property name="icon_size">2</property>
                                   </object>
                                 </child>
                               </object>
diff --git a/deluge/ui/gtk3/glade/path_combo_chooser.ui b/deluge/ui/gtk3/glade/path_combo_chooser.ui
index 27acc934d..f79685d26 100644
--- a/deluge/ui/gtk3/glade/path_combo_chooser.ui
+++ b/deluge/ui/gtk3/glade/path_combo_chooser.ui
@@ -539,7 +539,7 @@
                   <object class="GtkImage" id="image2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-open</property>
+                    <property name="icon_name">folder-open-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -968,7 +968,7 @@
                       <object class="GtkImage" id="image1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="stock">gtk-properties</property>
+                        <property name="icon_name">document-properties-symbolic</property>
                       </object>
                     </child>
                   </object>
diff --git a/deluge/ui/gtk3/glade/torrent_menu.options.ui b/deluge/ui/gtk3/glade/torrent_menu.options.ui
index abb9c3af1..df34445d5 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.options.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.options.ui
@@ -5,23 +5,23 @@
   <object class="GtkImage" id="download-limit-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-missing-image</property>
+    <property name="icon_name">deluge-downloading</property>
   </object>
   <object class="GtkImage" id="max-connections-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-network</property>
+    <property name="icon_name">network-transmit-receive-symbolic</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="stock">gtk-missing-image</property>
+    <property name="icon_name">deluge-seeding</property>
   </object>
   <object class="GtkImage" id="upload-slots-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-sort-ascending</property>
+    <property name="icon_name">view-sort-descending-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="options_torrent_menu">
diff --git a/deluge/ui/gtk3/glade/torrent_menu.queue.ui b/deluge/ui/gtk3/glade/torrent_menu.queue.ui
index 5fb394fbf..e955adea1 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.queue.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.queue.ui
@@ -2,46 +2,66 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">go-top-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">go-up-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">go-down-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image8">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">go-bottom-symbolic</property>
+  </object>
   <object class="GtkMenu" id="queue_torrent_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_top">
-        <property name="label">gtk-goto-top</property>
+        <property name="label">Top</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</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>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_up">
-        <property name="label">gtk-go-up</property>
+        <property name="label">Up</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</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>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_down">
-        <property name="label">gtk-go-down</property>
+        <property name="label">Down</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</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>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_bottom">
-        <property name="label">gtk-goto-bottom</property>
+        <property name="label">Bottom</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</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 a0c0e1e8e..c1b77b4ad 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.ui
@@ -6,60 +6,71 @@
   <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_name">preferences-system-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="menu-item-image1">
+    <property name="can_focus">False</property>
+    <property name="icon_name">media-playback-stop-symbolic</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_name">document-edit-symbolic</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_name">media-playback-start-symbolic</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_name">media-playback-pause-symbolic</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_name">media-playlist-shuffle-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="menu-item-image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">media-playlist-repeat-symbolic</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_name">view-refresh-symbolic</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_name">edit-redo-symbolic</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_name">folder-open-symbolic</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_name">document-save-as-symbolic</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_name">list-remove-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="torrent_menu">
diff --git a/deluge/ui/gtk3/glade/tray_menu.ui b/deluge/ui/gtk3/glade/tray_menu.ui
index 1147b72df..6b2053062 100644
--- a/deluge/ui/gtk3/glade/tray_menu.ui
+++ b/deluge/ui/gtk3/glade/tray_menu.ui
@@ -3,33 +3,39 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="add-image">
+    <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>
+  </object>
   <object class="GtkImage" id="download-limit-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="icon_size">1</property>
   </object>
-  <object class="GtkImage" id="menu-item-image1">
+  <object class="GtkImage" id="pause-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
+    <property name="icon_name">media-playback-stop-symbolic</property>
     <property name="icon_size">1</property>
   </object>
-  <object class="GtkImage" id="menu-item-image6">
+  <object class="GtkImage" id="quit-daemon-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-media-pause</property>
+    <property name="icon_name">system-shutdown-symbolic</property>
     <property name="icon_size">1</property>
   </object>
-  <object class="GtkImage" id="menu-item-image7">
+  <object class="GtkImage" id="quit-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-media-play</property>
+    <property name="icon_name">application-exit-symbolic</property>
     <property name="icon_size">1</property>
   </object>
-  <object class="GtkImage" id="menu-item-image8">
+  <object class="GtkImage" id="resume-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-quit</property>
+    <property name="icon_name">media-playlist-repeat-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="upload-limit-image">
@@ -61,7 +67,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
-        <property name="image">menu-item-image1</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>
@@ -78,7 +84,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
-        <property name="image">menu-item-image6</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>
@@ -89,7 +95,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
-        <property name="image">menu-item-image7</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>
@@ -134,7 +140,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
-        <property name="image">menu-item-image8</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>
@@ -147,11 +153,12 @@
     </child>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_quit">
-        <property name="label">gtk-quit</property>
+        <property name="label">_Quit</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">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>