diff --git a/data/gtk/details_window.blp b/data/gtk/details_window.blp
index 35f6746..573d937 100644
--- a/data/gtk/details_window.blp
+++ b/data/gtk/details_window.blp
@@ -54,6 +54,7 @@ template $DetailsWindow : Adw.Window {
                             [overlay]
                             Button cover_button_edit {
                                 icon-name: "document-edit-symbolic";
+                                tooltip-text: _("New Cover");
                                 halign: end;
                                 valign: end;
                                 margin-bottom: 6;
@@ -71,6 +72,7 @@ template $DetailsWindow : Adw.Window {
 
                                 Button cover_button_delete {
                                     icon-name: "user-trash-symbolic";
+                                    tooltip-text: _("Delete Cover");
                                     halign: end;
                                     valign: end;
                                     margin-bottom: 6;
@@ -99,14 +101,22 @@ template $DetailsWindow : Adw.Window {
                 title: _("Title");
                 description: _("The title of the game");
 
-                Entry name {}
+                Entry name {
+                    accessibility {
+                        label: _("Title");
+                    }
+                }
             }
 
             Adw.PreferencesGroup developer_group {
                 title: _("Developer");
                 description: _("The developer or publisher (optional)");
 
-                Entry developer {}
+                Entry developer {
+                    accessibility {
+                        label: _("Developer");
+                    }
+                }
             }
 
             Adw.PreferencesGroup exec_group {
@@ -137,7 +147,11 @@ template $DetailsWindow : Adw.Window {
                     ]
                 }
 
-                Entry executable {}
+                Entry executable {
+                    accessibility {
+                        label: _("Executable");
+                    }
+                }
             }
         }
     }
diff --git a/data/gtk/game.blp b/data/gtk/game.blp
index 0806730..60c3518 100644
--- a/data/gtk/game.blp
+++ b/data/gtk/game.blp
@@ -55,6 +55,10 @@ template $Game : Box {
           name: "cover_button";
           overflow: hidden;
 
+          accessibility {
+            labelled-by: title;
+          }
+
           Overlay {
             [overlay]
             Spinner spinner {
diff --git a/src/details_window.py b/src/details_window.py
index f5f2fa7..df56f0f 100644
--- a/src/details_window.py
+++ b/src/details_window.py
@@ -52,12 +52,6 @@ class DetailsWindow(Adw.Window):
 
     cover_changed = False
 
-    def delete_pixbuf(self, *_args):
-        self.game_cover.new_cover()
-
-        self.cover_button_delete_revealer.set_reveal_child(False)
-        self.cover_changed = True
-
     def __init__(self, game=None, **kwargs):
         super().__init__(**kwargs)
 
@@ -127,6 +121,12 @@ class DetailsWindow(Adw.Window):
         self.set_focus(self.name)
         self.present()
 
+    def delete_pixbuf(self, *_args):
+        self.game_cover.new_cover()
+
+        self.cover_button_delete_revealer.set_reveal_child(False)
+        self.cover_changed = True
+
     def apply_preferences(self, *_args):
         final_name = self.name.get_text()
         final_developer = self.developer.get_text()