From 6383df8dcaa210f742f42363ed4099c5ad2cc9f1 Mon Sep 17 00:00:00 2001
From: Xodetaetl <dev@ovocean.com>
Date: Mon, 17 Aug 2015 23:01:31 +0200
Subject: [PATCH] Replace deprecated Gtk.Stock stuff (partial fix #194),
 standardize some dialogs

---
 lutris/gui/config_boxes.py               |   4 +-
 lutris/gui/dialogs.py                    |  12 +--
 lutris/gui/logwindow.py                  |   2 +-
 lutris/gui/runnerinstalldialog.py        |   2 +-
 lutris/gui/sidebar.py                    |   3 +-
 lutris/gui/widgets.py                    |   9 +-
 share/lutris/ui/LutrisWindow.ui          | 110 ++++++++++++++++-------
 share/lutris/ui/dialog-lutris-login.ui   |  33 +++++--
 share/lutris/ui/dialog-pga-sources.ui    |  51 +++++++----
 share/lutris/ui/dialog-uninstall-game.ui |  24 ++++-
 10 files changed, 173 insertions(+), 77 deletions(-)

diff --git a/lutris/gui/config_boxes.py b/lutris/gui/config_boxes.py
index 5544fac05..8fd522a63 100644
--- a/lutris/gui/config_boxes.py
+++ b/lutris/gui/config_boxes.py
@@ -79,8 +79,8 @@ class ConfigBox(VBox):
             self.call_widget_generator(option, option_key, value, default)
 
             # Reset button
-            icon = Gtk.Image(stock=Gtk.STOCK_CLEAR)
-            reset_btn = Gtk.Button(image=icon)
+            reset_btn = Gtk.Button.new_from_icon_name('edit-clear',
+                                                      Gtk.IconSize.MENU)
             reset_btn.set_relief(Gtk.ReliefStyle.NONE)
             reset_btn.set_tooltip_text("Reset option to global or "
                                        "default config")
diff --git a/lutris/gui/dialogs.py b/lutris/gui/dialogs.py
index 928a6d624..daedc3c04 100644
--- a/lutris/gui/dialogs.py
+++ b/lutris/gui/dialogs.py
@@ -81,8 +81,8 @@ class DirectoryDialog(Gtk.FileChooserDialog):
         super(DirectoryDialog, self).__init__(
             title=message,
             action=Gtk.FileChooserAction.SELECT_FOLDER,
-            buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE,
-                     Gtk.STOCK_OK, Gtk.ResponseType.OK)
+            buttons=('_Cancel', Gtk.ResponseType.CLOSE,
+                     '_OK', Gtk.ResponseType.OK)
         )
         self.result = self.run()
         self.folder = self.get_current_folder()
@@ -96,8 +96,8 @@ class FileDialog(Gtk.FileChooserDialog):
             message = "Please choose a file"
         super(FileDialog, self).__init__(
             message, None, Gtk.FileChooserAction.OPEN,
-            (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-             Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
+            ('_Cancel', Gtk.ResponseType.CANCEL,
+             '_OK', Gtk.ResponseType.OK)
         )
         self.set_local_only(False)
         response = self.run()
@@ -171,8 +171,8 @@ class PgaSourceDialog(GtkBuilderDialog):
         chooser = Gtk.FileChooserDialog(
             "Select directory", self.dialog,
             Gtk.FileChooserAction.SELECT_FOLDER,
-            (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-             "Select", Gtk.ResponseType.OK)
+            ('_Cancel', Gtk.ResponseType.CANCEL,
+             '_OK', Gtk.ResponseType.OK)
         )
         chooser.set_local_only(False)
         response = chooser.run()
diff --git a/lutris/gui/logwindow.py b/lutris/gui/logwindow.py
index ab300ae92..c1d7e212a 100644
--- a/lutris/gui/logwindow.py
+++ b/lutris/gui/logwindow.py
@@ -34,7 +34,7 @@ class LogTextView(Gtk.TextView):
 class LogWindow(Dialog):
     def __init__(self, title, parent):
         super(LogWindow, self).__init__(title, parent, 0,
-                                        (Gtk.STOCK_OK, Gtk.ResponseType.OK))
+                                        ('_OK', Gtk.ResponseType.OK))
         self.set_size_request(640, 480)
         self.grid = Gtk.Grid()
         self.logtextview = LogTextView()
diff --git a/lutris/gui/runnerinstalldialog.py b/lutris/gui/runnerinstalldialog.py
index 344ded940..090297e0c 100644
--- a/lutris/gui/runnerinstalldialog.py
+++ b/lutris/gui/runnerinstalldialog.py
@@ -18,7 +18,7 @@ class RunnerInstallDialog(Dialog):
 
     def __init__(self, title, parent, runner):
         super(RunnerInstallDialog, self).__init__(
-            title, parent, 0, (Gtk.STOCK_OK, Gtk.ResponseType.OK)
+            title, parent, 0, ('_OK', Gtk.ResponseType.OK)
         )
         self.runner = runner
         self.runner_info = api.get_runners(self.runner)
diff --git a/lutris/gui/sidebar.py b/lutris/gui/sidebar.py
index 9be03a05c..6c5cd2968 100644
--- a/lutris/gui/sidebar.py
+++ b/lutris/gui/sidebar.py
@@ -91,8 +91,7 @@ class ContextualMenu(Gtk.Menu):
         for entry in entries:
             name = entry[0]
             label = entry[1]
-            action = Gtk.Action(name=name, label=label,
-                                tooltip=None, stock_id=None)
+            action = Gtk.Action(name=name, label=label)
             action.connect('activate', entry[2])
             menuitem = action.create_menu_item()
             menuitem.action_id = name
diff --git a/lutris/gui/widgets.py b/lutris/gui/widgets.py
index 6bc6e97ba..bd6fcf347 100644
--- a/lutris/gui/widgets.py
+++ b/lutris/gui/widgets.py
@@ -100,8 +100,7 @@ class ContextualMenu(Gtk.Menu):
         for entry in entries:
             name = entry[0]
             label = entry[1]
-            action = Gtk.Action(name=name, label=label,
-                                tooltip=None, stock_id=None)
+            action = Gtk.Action(name=name, label=label)
             action.connect('activate', entry[2])
             menuitem = action.create_menu_item()
             menuitem.action_id = name
@@ -485,7 +484,7 @@ class DownloadProgressBox(Gtk.VBox):
         self.progressbar.set_margin_right(10)
         progress_box.pack_start(self.progressbar, True, True, 0)
 
-        self.cancel_button = Gtk.Button(stock=Gtk.STOCK_CANCEL)
+        self.cancel_button = Gtk.Button('_Cancel')
         self.cancel_button.connect('clicked', self.cancel)
         if not cancelable:
             self.cancel_button.set_sensitive(False)
@@ -574,8 +573,8 @@ class FileChooserEntry(Gtk.Box):
         )
 
         self.file_chooser_dlg.add_buttons(
-            Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE,
-            Gtk.STOCK_OPEN, Gtk.ResponseType.OK
+            '_Cancel', Gtk.ResponseType.CLOSE,
+            '_OK', Gtk.ResponseType.OK
         )
         if default:
             self.file_chooser_dlg.set_current_folder(
diff --git a/share/lutris/ui/LutrisWindow.ui b/share/lutris/ui/LutrisWindow.ui
index f1c8e54a7..2520f0c57 100644
--- a/share/lutris/ui/LutrisWindow.ui
+++ b/share/lutris/ui/LutrisWindow.ui
@@ -6,12 +6,57 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-media-play</property>
+    <property name="icon_name">preferences-desktop</property>
+    <property name="use_fallback">True</property>
+    <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-file</property>
+    <property name="icon_name">text-x-generic</property>
+    <property name="use_fallback">True</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">application-exit</property>
+    <property name="use_fallback">True</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">media-playback-start</property>
+    <property name="use_fallback">True</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="icon_name">media-playback-stop</property>
+    <property name="use_fallback">True</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">list-add</property>
+    <property name="use_fallback">True</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">list-remove</property>
+    <property name="use_fallback">True</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="image8">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">help-about</property>
+    <property name="use_fallback">True</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkRadioAction" id="radioaction1">
@@ -126,24 +171,26 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="preferences_menuitem">
-                        <property name="label">gtk-preferences</property>
+                        <property name="label" translatable="yes">_Preferences</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
                         <property name="tooltip_markup" translatable="yes">configure the default options</property>
                         <property name="tooltip_text" translatable="yes">configure the default options</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image1</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="on_preferences_activate" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="quit_menuitem">
-                        <property name="label">gtk-quit</property>
+                        <property name="label">_Quit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image3</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="on_destroy" swapped="no"/>
                       </object>
                     </child>
@@ -165,7 +212,7 @@
                       <object class="GtkRadioMenuItem" id="gridview_menuitem">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Grid</property>
+                        <property name="label" translatable="yes">_Grid</property>
                         <property name="use_underline">True</property>
                         <property name="active">True</property>
                         <property name="draw_as_radio">True</property>
@@ -176,7 +223,7 @@
                       <object class="GtkRadioMenuItem" id="listview_menuitem">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">List</property>
+                        <property name="label" translatable="yes">_List</property>
                         <property name="use_underline">True</property>
                         <property name="draw_as_radio">True</property>
                         <property name="group">gridview_menuitem</property>
@@ -192,7 +239,7 @@
                       <object class="GtkMenuItem" id="icon_type_menuitem">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Icon style</property>
+                        <property name="label" translatable="yes">_Icon style</property>
                         <property name="use_underline">True</property>
                         <child type="submenu">
                           <object class="GtkMenu" id="menu1">
@@ -248,7 +295,7 @@
                       <object class="GtkCheckMenuItem" id="filter_installed">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Installed games only</property>
+                        <property name="label" translatable="yes">I_nstalled games only</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" handler="on_show_installed_games_toggled" swapped="no"/>
                       </object>
@@ -269,20 +316,23 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="playgame_menuitem">
-                        <property name="label" translatable="yes">Start</property>
+                        <property name="label" translatable="yes">_Play</property>
                         <property name="visible">True</property>
                         <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_game_run" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="stopgame_menuitem">
-                        <property name="label">gtk-media-stop</property>
+                        <property name="label">_Stop</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image5</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="reset" swapped="no"/>
                       </object>
                     </child>
@@ -294,21 +344,23 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="addgame_menuitem">
-                        <property name="label">gtk-add</property>
+                        <property name="label">_Add</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image6</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="add_game" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="removegame_menuitem">
-                        <property name="label">gtk-remove</property>
+                        <property name="label">_Remove</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image7</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="on_remove_game" swapped="no"/>
                       </object>
                     </child>
@@ -320,9 +372,10 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="view_game_log">
-                        <property name="label" translatable="yes">View log of last game</property>
+                        <property name="label" translatable="yes">View last game's _log</property>
                         <property name="visible">True</property>
                         <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_view_game_log_activate" swapped="no"/>
@@ -344,11 +397,12 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem10">
-                        <property name="label">gtk-about</property>
+                        <property name="label">_About</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image8</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="about" swapped="no"/>
                       </object>
                     </child>
@@ -375,8 +429,7 @@
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Play game</property>
                 <property name="label" translatable="yes">Play</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-media-play</property>
+                <property name="icon_name">media-playback-start</property>
                 <signal name="clicked" handler="on_game_run" swapped="no"/>
               </object>
               <packing>
@@ -390,8 +443,7 @@
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Stop game</property>
                 <property name="label" translatable="yes">Stop</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-media-stop</property>
+                <property name="icon_name">media-playback-stop</property>
                 <signal name="clicked" handler="reset" swapped="no"/>
               </object>
               <packing>
@@ -405,8 +457,7 @@
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Manually add a game</property>
                 <property name="label" translatable="yes">Add Game</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-add</property>
+                <property name="icon_name">list-add</property>
                 <signal name="clicked" handler="add_game" swapped="no"/>
               </object>
               <packing>
@@ -420,8 +471,7 @@
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Remove game from library</property>
                 <property name="label" translatable="yes">Remove</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-delete</property>
+                <property name="icon_name">edit-delete</property>
                 <signal name="clicked" handler="on_remove_game" swapped="no"/>
               </object>
               <packing>
@@ -452,8 +502,8 @@
                     <property name="has_focus">True</property>
                     <property name="invisible_char">•</property>
                     <property name="width_chars">30</property>
-                    <property name="primary_icon_stock">gtk-find</property>
-                    <property name="secondary_icon_stock">gtk-clear</property>
+                    <property name="primary_icon_name">edit-find</property>
+                    <property name="secondary_icon_name">edit-clear</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="primary_icon_sensitive">False</property>
                     <property name="primary_icon_tooltip_text" translatable="yes">Filter the list of games</property>
diff --git a/share/lutris/ui/dialog-lutris-login.ui b/share/lutris/ui/dialog-lutris-login.ui
index ea8c066ef..cff715652 100644
--- a/share/lutris/ui/dialog-lutris-login.ui
+++ b/share/lutris/ui/dialog-lutris-login.ui
@@ -2,6 +2,18 @@
 <!-- Generated with glade 3.16.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">network-wired</property>
+    <property name="use_fallback">True</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">dialog-cancel</property>
+    <property name="use_fallback">True</property>
+  </object>
   <object class="GtkDialog" id="lutris-login">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -19,7 +31,7 @@
               <object class="GtkLinkButton" id="linkbutton1">
                 <property name="label" translatable="yes">Forgot password?</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="has_tooltip">True</property>
                 <property name="relief">none</property>
@@ -33,11 +45,12 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label">C_ancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">image2</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -47,11 +60,14 @@
             </child>
             <child>
               <object class="GtkButton" id="connect_button">
-                <property name="label">gtk-connect</property>
+                <property name="label">_Connect</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</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="image">image1</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -85,8 +101,7 @@
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="row_spacing">30</property>
-                    <property name="column_spacing">40</property>
+                    <property name="column_spacing">14</property>
                     <property name="row_homogeneous">True</property>
                     <child>
                       <object class="GtkLabel" id="label2">
diff --git a/share/lutris/ui/dialog-pga-sources.ui b/share/lutris/ui/dialog-pga-sources.ui
index 9e0d8a660..3a8d8a0df 100644
--- a/share/lutris/ui/dialog-pga-sources.ui
+++ b/share/lutris/ui/dialog-pga-sources.ui
@@ -2,6 +2,18 @@
 <!-- Generated with glade 3.16.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">dialog-ok</property>
+    <property name="use_fallback">True</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">dialog-cancel</property>
+    <property name="use_fallback">True</property>
+  </object>
   <object class="GtkDialog" id="pga_dialog">
     <property name="width_request">640</property>
     <property name="height_request">400</property>
@@ -18,13 +30,14 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label">gtk-apply</property>
+              <object class="GtkButton" id="button1">
+                <property name="label">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_apply" swapped="no"/>
+                <property name="image">image2</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_close" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -33,13 +46,16 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">Appl_y</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</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>
-                <signal name="clicked" handler="on_close" swapped="no"/>
+                <property name="image">image1</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_apply" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -124,11 +140,12 @@
                     <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="add_source_button">
-                        <property name="label">gtk-add</property>
+                        <property name="label">_Add</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</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>
                         <signal name="clicked" handler="on_add_source_button_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -139,11 +156,11 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="remove_source_button">
-                        <property name="label">gtk-remove</property>
+                        <property name="label">_Remove</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">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_remove_source_button_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -176,8 +193,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button2</action-widget>
       <action-widget response="0">button1</action-widget>
+      <action-widget response="0">button2</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/share/lutris/ui/dialog-uninstall-game.ui b/share/lutris/ui/dialog-uninstall-game.ui
index 020db157c..f9133198f 100644
--- a/share/lutris/ui/dialog-uninstall-game.ui
+++ b/share/lutris/ui/dialog-uninstall-game.ui
@@ -2,6 +2,18 @@
 <!-- Generated with glade 3.16.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">dialog-ok</property>
+    <property name="use_fallback">True</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">dialog-cancel</property>
+    <property name="use_fallback">True</property>
+  </object>
   <object class="GtkDialog" id="uninstall-game-dialog">
     <property name="width_request">300</property>
     <property name="height_request">300</property>
@@ -25,12 +37,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">image2</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -40,12 +53,15 @@
             </child>
             <child>
               <object class="GtkButton" id="apply_button">
-                <property name="label">gtk-apply</property>
+                <property name="label">_Apply</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">image1</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>