diff --git a/deluge/ui/gtk3/addtorrentdialog.py b/deluge/ui/gtk3/addtorrentdialog.py
index 7f49a4130..fd78676a0 100644
--- a/deluge/ui/gtk3/addtorrentdialog.py
+++ b/deluge/ui/gtk3/addtorrentdialog.py
@@ -96,7 +96,7 @@ class AddTorrentDialog(component.Component):
         column = Gtk.TreeViewColumn(_('Filename'))
         render = Gtk.CellRendererPixbuf()
         column.pack_start(render, False)
-        column.add_attribute(render, 'stock-id', 5)
+        column.add_attribute(render, 'icon-name', 5)
         render = Gtk.CellRendererText()
         render.set_property('editable', True)
         render.connect('edited', self._on_filename_edited)
@@ -372,7 +372,7 @@ class AddTorrentDialog(component.Component):
         for key, value in split_files.items():
             if key.endswith(os.path.sep):
                 chunk_iter = self.files_treestore.append(
-                    parent_iter, [True, key, 0, -1, False, Gtk.STOCK_DIRECTORY]
+                    parent_iter, [True, key, 0, -1, False, 'folder-symbolic']
                 )
                 chunk_size = self.add_files(chunk_iter, value)
                 self.files_treestore.set(chunk_iter, 2, chunk_size)
@@ -380,7 +380,14 @@ class AddTorrentDialog(component.Component):
             else:
                 self.files_treestore.append(
                     parent_iter,
-                    [value[2], key, value[1]['size'], value[0], False, Gtk.STOCK_FILE],
+                    [
+                        value[2],
+                        key,
+                        value[1]['size'],
+                        value[0],
+                        False,
+                        'text-x-generic-symbolic',
+                    ],
                 )
                 ret += value[1]['size']
         if parent_iter and self.files_treestore.iter_has_child(parent_iter):
@@ -656,9 +663,9 @@ class AddTorrentDialog(component.Component):
             None,
             Gtk.FileChooserAction.OPEN,
             buttons=(
-                Gtk.STOCK_CANCEL,
+                _('_Cancel'),
                 Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_OPEN,
+                _('_Open'),
                 Gtk.ResponseType.OK,
             ),
         )
@@ -977,7 +984,7 @@ class AddTorrentDialog(component.Component):
                 split_text = new_text.split(os.path.sep)
                 for s in split_text[:-1]:
                     parent = self.files_treestore.append(
-                        parent, [True, s, 0, -1, False, Gtk.STOCK_DIRECTORY]
+                        parent, [True, s, 0, -1, False, 'folder-symbolic']
                     )
 
                 self.files_treestore[itr][1] = split_text[-1]
@@ -1036,8 +1043,7 @@ class AddTorrentDialog(component.Component):
                     # We don't iterate over the last item because we'll just use
                     # the existing itr and change the text
                     parent = self.files_treestore.append(
-                        parent,
-                        [True, s + os.path.sep, 0, -1, False, Gtk.STOCK_DIRECTORY],
+                        parent, [True, s + os.path.sep, 0, -1, False, 'folder-symbolic']
                     )
 
                 self.files_treestore[itr][1] = split_text[-1] + os.path.sep
diff --git a/deluge/ui/gtk3/connectionmanager.py b/deluge/ui/gtk3/connectionmanager.py
index 6496a4f3d..b86420139 100644
--- a/deluge/ui/gtk3/connectionmanager.py
+++ b/deluge/ui/gtk3/connectionmanager.py
@@ -212,11 +212,11 @@ class ConnectionManager(component.Component):
         self.builder.get_object('button_edithost').set_sensitive(False)
         self.builder.get_object('button_removehost').set_sensitive(False)
         self.builder.get_object('button_startdaemon').set_sensitive(False)
-        self.builder.get_object('image_startdaemon').set_from_stock(
-            Gtk.STOCK_EXECUTE, Gtk.IconSize.MENU
+        self.builder.get_object('image_startdaemon').set_from_icon_name(
+            'system-run-symbolic', Gtk.IconSize.BUTTON
         )
         self.builder.get_object('label_startdaemon').set_text_with_mnemonic(
-            '_Start Daemon'
+            _('_Start Daemon')
         )
 
         model, row = self.treeview.get_selection().get_selected()
@@ -242,8 +242,8 @@ class ConnectionManager(component.Component):
         # Check to see if the host is online
         if status == 'Connected' or status == 'Online':
             self.builder.get_object('button_connect').set_sensitive(True)
-            self.builder.get_object('image_startdaemon').set_from_stock(
-                Gtk.STOCK_STOP, Gtk.IconSize.MENU
+            self.builder.get_object('image_startdaemon').set_from_icon_name(
+                'process-stop-symbolic', Gtk.IconSize.MENU
             )
             self.builder.get_object('label_startdaemon').set_text_with_mnemonic(
                 _('_Stop Daemon')
diff --git a/deluge/ui/gtk3/createtorrentdialog.py b/deluge/ui/gtk3/createtorrentdialog.py
index 5017024e7..1e5e73cb6 100644
--- a/deluge/ui/gtk3/createtorrentdialog.py
+++ b/deluge/ui/gtk3/createtorrentdialog.py
@@ -62,7 +62,7 @@ class CreateTorrentDialog(object):
         column = Gtk.TreeViewColumn(_('Filename'))
         render = Gtk.CellRendererPixbuf()
         column.pack_start(render, False)
-        column.add_attribute(render, 'stock-id', 1)
+        column.add_attribute(render, 'icon-name', 1)
         render = Gtk.CellRendererText()
         column.pack_start(render, True)
         column.add_attribute(render, 'text', 0)
@@ -129,9 +129,9 @@ class CreateTorrentDialog(object):
             self.dialog,
             Gtk.FileChooserAction.OPEN,
             buttons=(
-                Gtk.STOCK_CANCEL,
+                _('_Cancel'),
                 Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_OPEN,
+                _('_Open'),
                 Gtk.ResponseType.OK,
             ),
         )
@@ -152,7 +152,9 @@ class CreateTorrentDialog(object):
         path = decode_bytes(result)
 
         self.files_treestore.clear()
-        self.files_treestore.append(None, [result, Gtk.STOCK_FILE, get_path_size(path)])
+        self.files_treestore.append(
+            None, [result, 'text-x-generic-symbolic', get_path_size(path)]
+        )
         self.adjust_piece_size()
         chooser.destroy()
 
@@ -164,9 +166,9 @@ class CreateTorrentDialog(object):
             self.dialog,
             Gtk.FileChooserAction.SELECT_FOLDER,
             buttons=(
-                Gtk.STOCK_CANCEL,
+                _('_Cancel'),
                 Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_OPEN,
+                _('_Open'),
                 Gtk.ResponseType.OK,
             ),
         )
@@ -186,7 +188,9 @@ class CreateTorrentDialog(object):
         path = decode_bytes(result)
 
         self.files_treestore.clear()
-        self.files_treestore.append(None, [result, Gtk.STOCK_OPEN, get_path_size(path)])
+        self.files_treestore.append(
+            None, [result, 'document-open-symbolic', get_path_size(path)]
+        )
         self.adjust_piece_size()
         chooser.destroy()
 
@@ -206,7 +210,9 @@ class CreateTorrentDialog(object):
                 log.debug('size: %s', size)
                 if size > 0:
                     self.files_treestore.clear()
-                    self.files_treestore.append(None, [result, Gtk.STOCK_NETWORK, size])
+                    self.files_treestore.append(
+                        None, [result, 'network-workgroup-symbolic', size]
+                    )
                     self.adjust_piece_size()
 
             client.core.get_path_size(result).addCallback(_on_get_path_size)
@@ -227,7 +233,7 @@ class CreateTorrentDialog(object):
         path = self.files_treestore[0][0].rstrip('\\/')
         torrent_filename = '%s.torrent' % os.path.split(path)[-1]
 
-        is_remote = self.files_treestore[0][1] == Gtk.STOCK_NETWORK
+        is_remote = 'network' in self.files_treestore[0][1]
 
         if is_remote:
             # This is a remote path
@@ -249,9 +255,9 @@ class CreateTorrentDialog(object):
                 self.dialog,
                 Gtk.FileChooserAction.SAVE,
                 buttons=(
-                    Gtk.STOCK_CANCEL,
+                    _('_Cancel'),
                     Gtk.ResponseType.CANCEL,
-                    Gtk.STOCK_SAVE,
+                    _('_Save'),
                     Gtk.ResponseType.OK,
                 ),
             )
diff --git a/deluge/ui/gtk3/dialogs.py b/deluge/ui/gtk3/dialogs.py
index 21709723f..77c38ed50 100644
--- a/deluge/ui/gtk3/dialogs.py
+++ b/deluge/ui/gtk3/dialogs.py
@@ -30,7 +30,7 @@ class BaseDialog(Gtk.Dialog):
         :param header: str, the header portion of the dialog
         :param text: str, the text body of the dialog
         :param icon: icon name from icon theme or icon filename.
-        :param buttons: tuple, of gtk stock ids and responses
+        :param buttons: tuple, of icon name and responses
         :param parent: gtkWindow, the parent window, if None it will default to the
             MainWindow
         """
@@ -55,9 +55,9 @@ class BaseDialog(Gtk.Dialog):
             # Hack for Windows since it doesn't support svg
             if icon.endswith('.svg') and windows_check():
                 icon = icon.rpartition('.svg')[0] + '16.png'
-            image.set_from_pixbuf(get_pixbuf_at_size(icon, Gtk.IconSize.DIALOG))
+            image.set_from_pixbuf(get_pixbuf_at_size(icon, 24))
         else:
-            image.set_from_icon_name(icon, Gtk.IconSize.DIALOG)
+            image.set_from_icon_name(icon, Gtk.IconSize.LARGE_TOOLBAR)
         image.set_alignment(0.5, 0.0)
         hbox.pack_start(image, False, False, 0)
         vbox = Gtk.VBox(spacing=5)
@@ -106,8 +106,8 @@ class YesNoDialog(BaseDialog):
         super(YesNoDialog, self).__init__(
             header,
             text,
-            Gtk.STOCK_DIALOG_QUESTION,
-            (Gtk.STOCK_NO, Gtk.ResponseType.NO, Gtk.STOCK_YES, Gtk.ResponseType.YES),
+            'dialog-question',
+            (_('_No'), Gtk.ResponseType.NO, _('_Yes'), Gtk.ResponseType.YES),
             parent,
         )
 
@@ -128,8 +128,8 @@ class InformationDialog(BaseDialog):
         super(InformationDialog, self).__init__(
             header,
             text,
-            Gtk.STOCK_DIALOG_INFO,
-            (Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE),
+            'dialog-information',
+            (_('_Close'), Gtk.ResponseType.CLOSE),
             parent,
         )
 
@@ -153,11 +153,7 @@ class ErrorDialog(BaseDialog):
         :type traceback: bool
         """
         super(ErrorDialog, self).__init__(
-            header,
-            text,
-            Gtk.STOCK_DIALOG_ERROR,
-            (Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE),
-            parent,
+            header, text, 'dialog-error', (_('_Close'), Gtk.ResponseType.CLOSE), parent
         )
 
         if traceback:
@@ -203,13 +199,8 @@ class AuthenticationDialog(BaseDialog):
         super(AuthenticationDialog, self).__init__(
             _('Authenticate'),
             err_msg,
-            Gtk.STOCK_DIALOG_AUTHENTICATION,
-            (
-                Gtk.STOCK_CANCEL,
-                Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_CONNECT,
-                Gtk.ResponseType.OK,
-            ),
+            'dialog-password',
+            (_('_Cancel'), Gtk.ResponseType.CANCEL, _('C_onnect'), Gtk.ResponseType.OK),
             parent,
         )
 
@@ -265,11 +256,11 @@ class AccountDialog(BaseDialog):
             super(AccountDialog, self).__init__(
                 _('Edit Account'),
                 _('Edit existing account'),
-                Gtk.STOCK_DIALOG_INFO,
+                'dialog-information',
                 (
-                    Gtk.STOCK_CANCEL,
+                    _('_Cancel'),
                     Gtk.ResponseType.CANCEL,
-                    Gtk.STOCK_APPLY,
+                    _('_Apply'),
                     Gtk.ResponseType.OK,
                 ),
                 parent,
@@ -278,13 +269,8 @@ class AccountDialog(BaseDialog):
             super(AccountDialog, self).__init__(
                 _('New Account'),
                 _('Create a new account'),
-                Gtk.STOCK_DIALOG_INFO,
-                (
-                    Gtk.STOCK_CANCEL,
-                    Gtk.ResponseType.CANCEL,
-                    Gtk.STOCK_ADD,
-                    Gtk.ResponseType.OK,
-                ),
+                'dialog-information',
+                (_('_Cancel'), Gtk.ResponseType.CANCEL, _('_Add'), Gtk.ResponseType.OK),
                 parent,
             )
 
@@ -369,18 +355,13 @@ class OtherDialog(BaseDialog):
             raise TypeError('default value needs to be an int or float')
 
         if not icon:
-            icon = Gtk.STOCK_DIALOG_INFO
+            icon = 'dialog-information'
 
         super(OtherDialog, self).__init__(
             header,
             text,
             icon,
-            (
-                Gtk.STOCK_CANCEL,
-                Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_APPLY,
-                Gtk.ResponseType.OK,
-            ),
+            (_('_Cancel'), Gtk.ResponseType.CANCEL, _('_Apply'), Gtk.ResponseType.OK),
             parent,
         )
 
@@ -439,16 +420,16 @@ class PasswordDialog(BaseDialog):
         :type password_msg: string
         """
         super(PasswordDialog, self).__init__(
-            _('Password Protected'),
-            password_msg,
-            Gtk.STOCK_DIALOG_AUTHENTICATION,
-            (
-                Gtk.STOCK_CANCEL,
+            header=_('Password Protected'),
+            text=password_msg,
+            icon='dialog-password',
+            buttons=(
+                _('_Cancel'),
                 Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_CONNECT,
+                _('_OK'),
                 Gtk.ResponseType.OK,
             ),
-            parent,
+            parent=parent,
         )
 
         table = Gtk.Table(1, 2, False)
diff --git a/deluge/ui/gtk3/files_tab.py b/deluge/ui/gtk3/files_tab.py
index 216e5a7c1..9413b0a5d 100644
--- a/deluge/ui/gtk3/files_tab.py
+++ b/deluge/ui/gtk3/files_tab.py
@@ -372,9 +372,9 @@ class FilesTab(Tab):
             else:
                 mime_type, uncertain = Gio.content_type_guess(key, None)
                 if not uncertain and mime_type:
-                    mime_icon = Gio.content_type_get_icon(mime_type)
+                    mime_icon = Gio.content_type_get_symbolic_icon(mime_type)
                 else:
-                    mime_icon = Gio.content_type_get_icon('text/plain')
+                    mime_icon = Gio.content_type_get_symbolic_icon('text/plain')
                 self.treestore.append(
                     parent_iter, [key, value[1]['size'], '', 0, 0, value[0], mime_icon]
                 )
diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
index 2391bff0b..3e91a7cfb 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui
@@ -27,11 +27,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_magnet_add_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -41,13 +41,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button_magnet_add_ok">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</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 c401a85f4..c103cca28 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.ui
@@ -48,11 +48,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
               </object>
               <packing>
@@ -63,11 +63,11 @@
             </child>
             <child>
               <object class="GtkButton" id="button_add">
-                <property name="label">gtk-add</property>
+                <property name="label" translatable="yes">_Add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
               </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 7c7cfbbd6..af5efaaae 100644
--- a/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui
+++ b/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui
@@ -27,11 +27,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_add_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -41,13 +41,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button_add_ok">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/connect_peer_dialog.ui b/deluge/ui/gtk3/glade/connect_peer_dialog.ui
index 9321dc890..9ba2a9ea9 100644
--- a/deluge/ui/gtk3/glade/connect_peer_dialog.ui
+++ b/deluge/ui/gtk3/glade/connect_peer_dialog.ui
@@ -24,11 +24,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -38,13 +38,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -75,7 +75,7 @@
                   <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_name">list-add-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/connection_manager.addhost.ui b/deluge/ui/gtk3/glade/connection_manager.addhost.ui
index 1c7f130c7..641a71cc1 100644
--- a/deluge/ui/gtk3/glade/connection_manager.addhost.ui
+++ b/deluge/ui/gtk3/glade/connection_manager.addhost.ui
@@ -32,11 +32,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_addhost_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -46,7 +46,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button_addhost_add">
-                <property name="label">_Save</property>
+                <property name="label" translatable="yes">_Save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/deluge/ui/gtk3/glade/connection_manager.ui b/deluge/ui/gtk3/glade/connection_manager.ui
index 7d1b30e05..0e7271d43 100644
--- a/deluge/ui/gtk3/glade/connection_manager.ui
+++ b/deluge/ui/gtk3/glade/connection_manager.ui
@@ -46,7 +46,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_close">
-                <property name="label">_Close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -61,7 +61,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button_connect">
-                <property name="label">C_onnect</property>
+                <property name="label" translatable="yes">C_onnect</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -144,11 +144,11 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="button_addhost">
-                            <property name="label">gtk-add</property>
+                            <property name="label" translatable="yes">_Add</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_addhost_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -159,11 +159,11 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_edithost">
-                            <property name="label">gtk-edit</property>
+                            <property name="label" translatable="yes">_Edit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_edithost_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -174,11 +174,11 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_removehost">
-                            <property name="label">gtk-remove</property>
+                            <property name="label" translatable="yes">_Remove</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_removehost_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -189,11 +189,11 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_refresh">
-                            <property name="label">gtk-refresh</property>
+                            <property name="label" translatable="yes">_Refresh</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_refresh_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -229,7 +229,7 @@
                                   <object class="GtkImage" id="image_startdaemon">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-execute</property>
+                                    <property name="icon_name">system-run-symbolic</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -242,7 +242,7 @@
                                   <object class="GtkLabel" id="label_startdaemon">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Start</property>
+                                    <property name="label" translatable="yes">_Start Daemon</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
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 cdca95bcb..6595752c6 100644
--- a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui
+++ b/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui
@@ -24,11 +24,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_add_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -38,13 +38,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button_add_ok">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -75,7 +75,7 @@
                   <object class="GtkImage" id="image11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-network</property>
+                    <property name="icon_name">network-workgroup-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</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 5586bb426..23cebc3a9 100644
--- a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_save.ui
+++ b/deluge/ui/gtk3/glade/create_torrent_dialog.remote_save.ui
@@ -24,11 +24,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_add_cancel1">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -38,13 +38,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button_add_ok1">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -75,7 +75,7 @@
                   <object class="GtkImage" id="image2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-network</property>
+                    <property name="icon_name">network-workgroup-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/create_torrent_dialog.ui b/deluge/ui/gtk3/glade/create_torrent_dialog.ui
index 82db1cefb..c27a4b866 100644
--- a/deluge/ui/gtk3/glade/create_torrent_dialog.ui
+++ b/deluge/ui/gtk3/glade/create_torrent_dialog.ui
@@ -63,7 +63,7 @@
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-new</property>
+                <property name="icon_name">document-new-symbolic</property>
                 <property name="icon_size">5</property>
               </object>
               <packing>
@@ -168,7 +168,7 @@
                                   <object class="GtkImage" id="image3">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-new</property>
+                                    <property name="icon_name">document-new-symbolic</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -213,7 +213,7 @@
                                   <object class="GtkImage" id="image4">
                                     <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>
@@ -258,7 +258,7 @@
                                   <object class="GtkImage" id="image5">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-network</property>
+                                    <property name="icon_name">network-workgroup-symbolic</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -422,7 +422,7 @@
                   <object class="GtkImage" id="image6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-info</property>
+                    <property name="icon_name">dialog-information-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -490,11 +490,11 @@
                         <property name="layout_style">center</property>
                         <child>
                           <object class="GtkButton" id="button_up">
-                            <property name="label">gtk-go-up</property>
+                            <property name="label" translatable="yes">_Up</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_up_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -505,11 +505,11 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_add">
-                            <property name="label">gtk-add</property>
+                            <property name="label" translatable="yes">_Add</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -520,11 +520,11 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_remove">
-                            <property name="label">gtk-remove</property>
+                            <property name="label" translatable="yes">_Remove</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -535,11 +535,11 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button_down">
-                            <property name="label">gtk-go-down</property>
+                            <property name="label" translatable="yes">_Down</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="use_underline">True</property>
                             <signal name="clicked" handler="on_button_down_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -571,7 +571,7 @@
                   <object class="GtkImage" id="image7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-edit</property>
+                    <property name="icon_name">text-editor-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -632,7 +632,7 @@
                   <object class="GtkImage" id="image8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-network</property>
+                    <property name="icon_name">network-workgroup-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -760,7 +760,7 @@
                   <object class="GtkImage" id="image9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-preferences</property>
+                    <property name="icon_name">preferences-other-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -804,11 +804,11 @@
                 <property name="layout_style">end</property>
                 <child>
                   <object class="GtkButton" id="button_cancel">
-                    <property name="label">gtk-cancel</property>
+                    <property name="label" translatable="yes">_Cancel</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
+                    <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
                   </object>
                   <packing>
@@ -819,11 +819,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="button_save">
-                    <property name="label">gtk-save</property>
+                    <property name="label" translatable="yes">_Save</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
+                    <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_button_save_clicked" swapped="no"/>
                   </object>
                   <packing>
diff --git a/deluge/ui/gtk3/glade/edit_trackers.add.ui b/deluge/ui/gtk3/glade/edit_trackers.add.ui
index 7326db5cb..cdf3acce2 100644
--- a/deluge/ui/gtk3/glade/edit_trackers.add.ui
+++ b/deluge/ui/gtk3/glade/edit_trackers.add.ui
@@ -24,11 +24,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_add_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_add_cancel_clicked" swapped="no"/>
               </object>
               <packing>
@@ -39,13 +39,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button_add_ok">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_add_ok_clicked" swapped="no"/>
               </object>
               <packing>
@@ -77,7 +77,7 @@
                   <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_name">list-add-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/edit_trackers.edit.ui b/deluge/ui/gtk3/glade/edit_trackers.edit.ui
index baf874e8f..f6279b2ef 100644
--- a/deluge/ui/gtk3/glade/edit_trackers.edit.ui
+++ b/deluge/ui/gtk3/glade/edit_trackers.edit.ui
@@ -23,11 +23,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_add_cancel1">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_edit_cancel_clicked" swapped="no"/>
               </object>
               <packing>
@@ -38,13 +38,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button_add_ok1">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_edit_ok_clicked" swapped="no"/>
               </object>
               <packing>
@@ -76,7 +76,7 @@
                   <object class="GtkImage" id="image2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-edit</property>
+                    <property name="icon_name">text-editor-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/edit_trackers.ui b/deluge/ui/gtk3/glade/edit_trackers.ui
index 17a2f6dd6..afad60022 100644
--- a/deluge/ui/gtk3/glade/edit_trackers.ui
+++ b/deluge/ui/gtk3/glade/edit_trackers.ui
@@ -28,11 +28,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -42,11 +42,11 @@
             </child>
             <child>
               <object class="GtkButton" id="button_ok">
-                <property name="label">gtk-ok</property>
+                <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_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -77,7 +77,7 @@
                   <object class="GtkImage" id="image3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-edit</property>
+                    <property name="icon_name">text-editor-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -144,11 +144,11 @@
                     <property name="layout_style">center</property>
                     <child>
                       <object class="GtkButton" id="button_up">
-                        <property name="label">gtk-go-up</property>
+                        <property name="label" translatable="yes">_Up</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_button_up_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -159,11 +159,11 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="button_add">
-                        <property name="label">gtk-add</property>
+                        <property name="label" translatable="yes">_Add</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -174,11 +174,11 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="button_exit">
-                        <property name="label">gtk-edit</property>
+                        <property name="label" translatable="yes">_Edit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_button_edit_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -189,11 +189,11 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="button_remove">
-                        <property name="label">gtk-remove</property>
+                        <property name="label" translatable="yes">_Remove</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -204,11 +204,11 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="button_down">
-                        <property name="label">gtk-go-down</property>
+                        <property name="label" translatable="yes">_Down</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_button_down_clicked" swapped="no"/>
                       </object>
                       <packing>
diff --git a/deluge/ui/gtk3/glade/filtertree_menu.ui b/deluge/ui/gtk3/glade/filtertree_menu.ui
index d2e9241f4..29d113c23 100644
--- a/deluge/ui/gtk3/glade/filtertree_menu.ui
+++ b/deluge/ui/gtk3/glade/filtertree_menu.ui
@@ -5,18 +5,18 @@
   <object class="GtkImage" id="image22">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-select-all</property>
+    <property name="icon_name">edit-select-all-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image22">
     <property name="can_focus">False</property>
-    <property name="stock">gtk-media-pause</property>
+    <property name="icon_name">media-playback-pause-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="menu-item-image23">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-media-play</property>
+    <property name="icon_name">media-playback-start-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkMenu" id="filtertree_menu">
@@ -29,7 +29,6 @@
         <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>
@@ -40,7 +39,6 @@
         <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>
@@ -52,7 +50,6 @@
         <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.new_release.ui b/deluge/ui/gtk3/glade/main_window.new_release.ui
index da7ebd008..f9c7fd533 100644
--- a/deluge/ui/gtk3/glade/main_window.new_release.ui
+++ b/deluge/ui/gtk3/glade/main_window.new_release.ui
@@ -25,11 +25,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_close_new_release">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -75,7 +75,7 @@
                   <object class="GtkImage" id="image_new_release">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-missing-image</property>
+                    <property name="icon_name">image-missing</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 e4534e5be..c73945df0 100644
--- a/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui
+++ b/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui
@@ -47,23 +47,21 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_open_file">
-        <property name="label">_Open File</property>
+        <property name="label" translatable="yes">_Open File</property>
         <property name="visible">True</property>
         <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>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_show_file">
-        <property name="label">_Show Folder</property>
+        <property name="label" translatable="yes">_Show Folder</property>
         <property name="visible">True</property>
         <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>
@@ -80,7 +78,6 @@
         <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>
@@ -97,7 +94,6 @@
         <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>
@@ -108,7 +104,6 @@
         <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>
@@ -119,7 +114,6 @@
         <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>
@@ -130,7 +124,6 @@
         <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 31968eaee..55ea739b4 100644
--- a/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui
+++ b/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui
@@ -5,7 +5,7 @@
   <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_name">list-add-symbolic</property>
     <property name="icon-size">1</property>
   </object>
   <object class="GtkMenu" id="menu_peer_tab">
@@ -19,7 +19,6 @@
         <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.tabs.ui b/deluge/ui/gtk3/glade/main_window.tabs.ui
index 46da59e6c..233cc6b2d 100644
--- a/deluge/ui/gtk3/glade/main_window.tabs.ui
+++ b/deluge/ui/gtk3/glade/main_window.tabs.ui
@@ -1216,7 +1216,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkButton" id="button_apply">
-                                        <property name="label">_Apply</property>
+                                        <property name="label" translatable="yes">_Apply</property>
                                         <property name="visible">True</property>
                                         <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
diff --git a/deluge/ui/gtk3/glade/main_window.ui b/deluge/ui/gtk3/glade/main_window.ui
index 3a8e879ff..a2a3cafe6 100644
--- a/deluge/ui/gtk3/glade/main_window.ui
+++ b/deluge/ui/gtk3/glade/main_window.ui
@@ -2,11 +2,6 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
-  <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>
@@ -57,19 +52,19 @@
   <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_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-goto-top</property>
+    <property name="icon_name">go-top-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="stock">gtk-zoom-fit</property>
+    <property name="icon_name">zoom-fit-best-symbolic</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="new-image">
@@ -126,7 +121,6 @@
                         <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>
@@ -138,7 +132,6 @@
                         <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>
@@ -154,7 +147,6 @@
                         <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"/>
@@ -168,12 +160,11 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_quit">
-                        <property name="label">_Quit</property>
+                        <property name="label" translatable="yes">_Quit</property>
                         <property name="visible">True</property>
                         <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>
@@ -194,12 +185,11 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_preferences">
-                        <property name="label">_Preferences</property>
+                        <property name="label" translatable="yes">_Preferences</property>
                         <property name="visible">True</property>
                         <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"/>
@@ -212,7 +202,6 @@
                         <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>
@@ -365,7 +354,6 @@
                         <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>
@@ -376,7 +364,6 @@
                         <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>
@@ -387,7 +374,6 @@
                         <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>
@@ -400,12 +386,11 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_about">
-                        <property name="label">_About</property>
+                        <property name="label" translatable="yes">_About</property>
                         <property name="visible">True</property>
                         <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>
@@ -649,7 +634,7 @@ This will filter torrents for the current selection on the sidebar.</property>
                                   <object class="GtkImage" id="close_search_image">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-close</property>
+                                    <property name="icon_name">window-close-symbolic</property>
                                     <property name="icon_size">2</property>
                                   </object>
                                 </child>
@@ -685,7 +670,7 @@ This will filter torrents for the current selection on the sidebar.</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_stock">gtk-clear</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>
diff --git a/deluge/ui/gtk3/glade/move_storage_dialog.ui b/deluge/ui/gtk3/glade/move_storage_dialog.ui
index 55c42c513..542d40a3f 100644
--- a/deluge/ui/gtk3/glade/move_storage_dialog.ui
+++ b/deluge/ui/gtk3/glade/move_storage_dialog.ui
@@ -26,11 +26,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -40,13 +40,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button_ok">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -77,7 +77,7 @@
                   <object class="GtkImage" id="image1">
                     <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>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/other_dialog.ui b/deluge/ui/gtk3/glade/other_dialog.ui
index 74a7ecf26..26d3d08bf 100644
--- a/deluge/ui/gtk3/glade/other_dialog.ui
+++ b/deluge/ui/gtk3/glade/other_dialog.ui
@@ -35,11 +35,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button3">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -49,13 +49,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button4">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/preferences_dialog.ui b/deluge/ui/gtk3/glade/preferences_dialog.ui
index 01b2631ce..81c2dc9ce 100644
--- a/deluge/ui/gtk3/glade/preferences_dialog.ui
+++ b/deluge/ui/gtk3/glade/preferences_dialog.ui
@@ -261,11 +261,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
               </object>
               <packing>
@@ -276,11 +276,11 @@
             </child>
             <child>
               <object class="GtkButton" id="button_apply">
-                <property name="label">gtk-apply</property>
+                <property name="label" translatable="yes">_Apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_apply_clicked" swapped="no"/>
               </object>
               <packing>
@@ -291,11 +291,11 @@
             </child>
             <child>
               <object class="GtkButton" id="button_ok">
-                <property name="label">gtk-ok</property>
+                <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_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_ok_clicked" swapped="no"/>
               </object>
               <packing>
@@ -616,13 +616,13 @@ and daemon (does not apply in Standalone mode).</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkButton" id="revert_color_completed">
-                                                        <property name="label">gtk-revert-to-saved</property>
+                                                        <property name="label" translatable="yes">_Revert</property>
                                                         <property name="visible">True</property>
                                                         <property name="sensitive">False</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
                                                         <property name="tooltip_text" translatable="yes">Revert color to default</property>
-                                                        <property name="use_stock">True</property>
+                                                        <property name="use_underline">True</property>
                                                         <property name="image_position">right</property>
                                                         <signal name="clicked" handler="on_revert_color_completed_clicked" swapped="no"/>
                                                       </object>
@@ -633,13 +633,13 @@ and daemon (does not apply in Standalone mode).</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkButton" id="revert_color_downloading">
-                                                        <property name="label">gtk-revert-to-saved</property>
+                                                        <property name="label" translatable="yes">_Revert</property>
                                                         <property name="visible">True</property>
                                                         <property name="sensitive">False</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
                                                         <property name="tooltip_text" translatable="yes">Revert color to default</property>
-                                                        <property name="use_stock">True</property>
+                                                        <property name="use_underline">True</property>
                                                         <property name="image_position">right</property>
                                                         <signal name="clicked" handler="on_revert_color_downloading_clicked" swapped="no"/>
                                                       </object>
@@ -650,13 +650,13 @@ and daemon (does not apply in Standalone mode).</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkButton" id="revert_color_waiting">
-                                                        <property name="label">gtk-revert-to-saved</property>
+                                                        <property name="label" translatable="yes">_Revert</property>
                                                         <property name="visible">True</property>
                                                         <property name="sensitive">False</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
                                                         <property name="tooltip_text" translatable="yes">Revert color to default</property>
-                                                        <property name="use_stock">True</property>
+                                                        <property name="use_underline">True</property>
                                                         <property name="image_position">right</property>
                                                         <signal name="clicked" handler="on_revert_color_waiting_clicked" swapped="no"/>
                                                       </object>
@@ -667,13 +667,13 @@ and daemon (does not apply in Standalone mode).</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkButton" id="revert_color_missing">
-                                                        <property name="label">gtk-revert-to-saved</property>
+                                                        <property name="label" translatable="yes">_Revert</property>
                                                         <property name="visible">True</property>
                                                         <property name="sensitive">False</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
                                                         <property name="tooltip_text" translatable="yes">Revert color to default</property>
-                                                        <property name="use_stock">True</property>
+                                                        <property name="use_underline">True</property>
                                                         <property name="image_position">right</property>
                                                         <signal name="clicked" handler="on_revert_color_missing_clicked" swapped="no"/>
                                                       </object>
@@ -2735,7 +2735,7 @@ used sparingly.</property>
                                                 <child>
                                                   <object class="GtkImage" id="port_img">
                                                     <property name="can_focus">False</property>
-                                                    <property name="stock">gtk-dialog-question</property>
+                                                    <property name="icon_name">dialog-question-symbolic</property>
                                                   </object>
                                                 </child>
                                               </object>
@@ -4074,11 +4074,11 @@ the proxy instead of using the local DNS service</property>
                                             <property name="layout_style">start</property>
                                             <child>
                                               <object class="GtkButton" id="button_cache_refresh">
-                                                <property name="label">gtk-refresh</property>
+                                                <property name="label" translatable="yes">_Refresh</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_stock">True</property>
+                                                <property name="use_underline">True</property>
                                                 <signal name="clicked" handler="on_button_cache_refresh_clicked" swapped="no"/>
                                               </object>
                                               <packing>
@@ -4337,7 +4337,7 @@ the proxy instead of using the local DNS service</property>
                                               <object class="GtkImage" id="image_magnet">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="stock">gtk-missing-image</property>
+                                                <property name="icon_name">image-missing</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">True</property>
@@ -4603,11 +4603,11 @@ the proxy instead of using the local DNS service</property>
                                             <property name="layout_style">start</property>
                                             <child>
                                               <object class="GtkButton" id="accounts_add">
-                                                <property name="label">gtk-add</property>
+                                                <property name="label" translatable="yes">_Add</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_stock">True</property>
+                                                <property name="use_underline">True</property>
                                                 <signal name="clicked" handler="on_accounts_add_clicked" swapped="no"/>
                                               </object>
                                               <packing>
@@ -4618,12 +4618,12 @@ the proxy instead of using the local DNS service</property>
                                             </child>
                                             <child>
                                               <object class="GtkButton" id="accounts_edit">
-                                                <property name="label">gtk-edit</property>
+                                                <property name="label" translatable="yes">_Edit</property>
                                                 <property name="visible">True</property>
                                                 <property name="sensitive">False</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_stock">True</property>
+                                                <property name="use_underline">True</property>
                                                 <signal name="clicked" handler="on_accounts_edit_clicked" swapped="no"/>
                                               </object>
                                               <packing>
@@ -4634,12 +4634,12 @@ the proxy instead of using the local DNS service</property>
                                             </child>
                                             <child>
                                               <object class="GtkButton" id="accounts_delete">
-                                                <property name="label">gtk-delete</property>
+                                                <property name="label" translatable="yes">_Delete</property>
                                                 <property name="visible">True</property>
                                                 <property name="sensitive">False</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_stock">True</property>
+                                                <property name="use_underline">True</property>
                                                 <signal name="clicked" handler="on_accounts_delete_clicked" swapped="no"/>
                                               </object>
                                               <packing>
diff --git a/deluge/ui/gtk3/glade/queuedtorrents.ui b/deluge/ui/gtk3/glade/queuedtorrents.ui
index 6d374746e..333d45ab2 100644
--- a/deluge/ui/gtk3/glade/queuedtorrents.ui
+++ b/deluge/ui/gtk3/glade/queuedtorrents.ui
@@ -27,11 +27,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_close">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
               </object>
               <packing>
@@ -42,7 +42,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button_add">
-                <property name="label">gtk-add</property>
+                <property name="label" translatable="yes">_Add</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -51,7 +51,7 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
               </object>
               <packing>
@@ -83,7 +83,7 @@
                   <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_name">list-add-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -144,11 +144,11 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="button_remove">
-                    <property name="label">gtk-remove</property>
+                    <property name="label" translatable="yes">_Remove</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
+                    <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_button_remove_clicked" swapped="no"/>
                   </object>
                   <packing>
@@ -159,11 +159,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="button_clear">
-                    <property name="label">gtk-clear</property>
+                    <property name="label" translatable="yes">_Clear</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
+                    <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_button_clear_clicked" swapped="no"/>
                   </object>
                   <packing>
diff --git a/deluge/ui/gtk3/glade/remove_torrent_dialog.ui b/deluge/ui/gtk3/glade/remove_torrent_dialog.ui
index e49b032f1..8fccaa422 100644
--- a/deluge/ui/gtk3/glade/remove_torrent_dialog.ui
+++ b/deluge/ui/gtk3/glade/remove_torrent_dialog.ui
@@ -25,7 +25,7 @@
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon_name">dialog-warning-symbolic</property>
                 <property name="icon_size">6</property>
               </object>
               <packing>
@@ -95,12 +95,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <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_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -110,11 +110,11 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
+                <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_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/deluge/ui/gtk3/glade/torrent_menu.options.ui b/deluge/ui/gtk3/glade/torrent_menu.options.ui
index df34445d5..c91c14ecb 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.options.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.options.ui
@@ -34,7 +34,6 @@
         <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>
@@ -44,7 +43,6 @@
         <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>
@@ -54,7 +52,6 @@
         <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>
@@ -64,7 +61,6 @@
         <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 e955adea1..a6f0773bd 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.queue.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.queue.ui
@@ -27,41 +27,37 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_top">
-        <property name="label">Top</property>
+        <property name="label" translatable="yes">Top</property>
         <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>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_up">
-        <property name="label">Up</property>
+        <property name="label" translatable="yes">Up</property>
         <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>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_down">
-        <property name="label">Down</property>
+        <property name="label" translatable="yes">Down</property>
         <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>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_queue_bottom">
-        <property name="label">Bottom</property>
+        <property name="label" translatable="yes">Bottom</property>
         <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 c1b77b4ad..490af1112 100644
--- a/deluge/ui/gtk3/glade/torrent_menu.ui
+++ b/deluge/ui/gtk3/glade/torrent_menu.ui
@@ -83,7 +83,6 @@
         <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>
@@ -100,7 +99,6 @@
         <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>
@@ -112,7 +110,6 @@
         <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>
@@ -129,7 +126,6 @@
         <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>
@@ -145,7 +141,6 @@
         <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>
@@ -161,7 +156,6 @@
         <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>
@@ -172,7 +166,6 @@
         <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>
@@ -189,7 +182,6 @@
         <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>
@@ -206,7 +198,6 @@
         <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>
@@ -217,7 +208,6 @@
         <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 6b2053062..d4e24888d 100644
--- a/deluge/ui/gtk3/glade/tray_menu.ui
+++ b/deluge/ui/gtk3/glade/tray_menu.ui
@@ -68,7 +68,6 @@
         <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>
@@ -85,7 +84,6 @@
         <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>
@@ -96,7 +94,6 @@
         <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>
@@ -113,7 +110,6 @@
         <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>
@@ -124,7 +120,6 @@
         <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>
@@ -141,7 +136,6 @@
         <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>
@@ -153,12 +147,11 @@
     </child>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_quit">
-        <property name="label">_Quit</property>
+        <property name="label" translatable="yes">_Quit</property>
         <property name="visible">True</property>
         <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>
diff --git a/deluge/ui/gtk3/menubar.py b/deluge/ui/gtk3/menubar.py
index f2430bc90..e98181bbf 100644
--- a/deluge/ui/gtk3/menubar.py
+++ b/deluge/ui/gtk3/menubar.py
@@ -459,13 +459,13 @@ class MenuBar(component.Component):
                 _('Incoming Connections'),
                 _('Set the maximum incoming connections'),
                 '',
-                Gtk.STOCK_NETWORK,
+                'network-transmit-receive-symbolic',
             ],
             'menuitem_upload_slots': [
                 _('Peer Upload Slots'),
                 _('Set the maximum upload slots'),
                 '',
-                Gtk.STOCK_SORT_ASCENDING,
+                'view-sort-descending-symbolic',
             ],
             'menuitem_stop_seed_at_ratio': [
                 _('Stop Seed At Ratio'),
diff --git a/deluge/ui/gtk3/new_release_dialog.py b/deluge/ui/gtk3/new_release_dialog.py
index dffff61e8..6aa328260 100644
--- a/deluge/ui/gtk3/new_release_dialog.py
+++ b/deluge/ui/gtk3/new_release_dialog.py
@@ -9,6 +9,8 @@
 
 from __future__ import unicode_literals
 
+from gi.repository.Gtk import IconSize
+
 import deluge.common
 import deluge.component as component
 from deluge.configmanager import ConfigManager
@@ -29,7 +31,9 @@ class NewReleaseDialog(object):
                 deluge.common.get_pixmap('deluge16.png')
             )
         else:
-            main_builder.get_object('image_new_release').set_from_icon_name('deluge', 4)
+            main_builder.get_object('image_new_release').set_from_icon_name(
+                'deluge', IconSize.LARGE_TOOLBAR
+            )
         main_builder.get_object('label_available_version').set_text(available_version)
         main_builder.get_object('label_client_version').set_text(
             deluge.common.get_version()
diff --git a/deluge/ui/gtk3/preferences.py b/deluge/ui/gtk3/preferences.py
index 12370ed99..fb3935a90 100644
--- a/deluge/ui/gtk3/preferences.py
+++ b/deluge/ui/gtk3/preferences.py
@@ -1091,11 +1091,13 @@ class Preferences(component.Component):
 
         def on_get_test(status):
             if status:
-                self.builder.get_object('port_img').set_from_stock(Gtk.STOCK_YES, 4)
+                self.builder.get_object('port_img').set_from_icon_name(
+                    'emblem-ok-symbolic', Gtk.IconSize.MENU
+                )
                 self.builder.get_object('port_img').show()
             else:
-                self.builder.get_object('port_img').set_from_stock(
-                    Gtk.STOCK_DIALOG_WARNING, 4
+                self.builder.get_object('port_img').set_from_icon_name(
+                    'dialog-warning-symbolic', Gtk.IconSize.MENU
                 )
                 self.builder.get_object('port_img').show()
 
@@ -1152,9 +1154,9 @@ class Preferences(component.Component):
             self.pref_dialog,
             Gtk.FileChooserAction.OPEN,
             buttons=(
-                Gtk.STOCK_CANCEL,
+                _('_Cancel'),
                 Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_OPEN,
+                _('_Open'),
                 Gtk.ResponseType.OK,
             ),
         )
diff --git a/deluge/ui/gtk3/queuedtorrents.py b/deluge/ui/gtk3/queuedtorrents.py
index a7c2dbe60..0f08c24c6 100644
--- a/deluge/ui/gtk3/queuedtorrents.py
+++ b/deluge/ui/gtk3/queuedtorrents.py
@@ -13,13 +13,7 @@ import logging
 import os.path
 
 from gi.repository.GLib import timeout_add
-from gi.repository.Gtk import (
-    STOCK_SORT_DESCENDING,
-    Builder,
-    CellRendererText,
-    ListStore,
-    TreeViewColumn,
-)
+from gi.repository.Gtk import Builder, CellRendererText, ListStore, TreeViewColumn
 
 import deluge.common
 import deluge.component as component
@@ -129,7 +123,7 @@ class QueuedTorrents(component.Component):
         # have already been added.
         if self.status_item is None:
             self.status_item = component.get('StatusBar').add_item(
-                stock=STOCK_SORT_DESCENDING,
+                icon='view-sort-descending',
                 text=label,
                 callback=self.on_statusbar_click,
             )