diff --git a/data/ui/album_editor.blp b/data/ui/album_editor.blp
index 3f8dc36..7eb7d79 100644
--- a/data/ui/album_editor.blp
+++ b/data/ui/album_editor.blp
@@ -45,18 +45,11 @@ template $MusicusAlbumEditor: Adw.NavigationPage {
             "boxed-list"
           ]
 
-          Adw.ActionRow {
+          Adw.ButtonRow {
             title: _("Add _recording");
+            start-icon-name: "list-add-symbolic";
             use-underline: true;
-            activatable: true;
             activated => $select_recording() swapped;
-
-            [prefix]
-            Gtk.Box select_recording_box {
-              Gtk.Image {
-                icon-name: "list-add-symbolic";
-              }
-            }
           }
         }
 
diff --git a/data/ui/recording_editor.blp b/data/ui/recording_editor.blp
index 06b8606..3a79f2b 100644
--- a/data/ui/recording_editor.blp
+++ b/data/ui/recording_editor.blp
@@ -22,7 +22,7 @@ template $MusicusRecordingEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "heading"
+              "heading",
             ]
           }
 
@@ -31,7 +31,7 @@ template $MusicusRecordingEditor: Adw.NavigationPage {
             margin-top: 12;
 
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
             Adw.ActionRow work_row {
@@ -68,7 +68,7 @@ template $MusicusRecordingEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "heading"
+              "heading",
             ]
           }
 
@@ -77,21 +77,14 @@ template $MusicusRecordingEditor: Adw.NavigationPage {
             margin-top: 12;
 
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
-            Adw.ActionRow {
+            Adw.ButtonRow {
               title: _("Add _performer");
+              start-icon-name: "list-add-symbolic";
               use-underline: true;
-              activatable: true;
               activated => $select_person() swapped;
-
-              [prefix]
-              Gtk.Box select_person_box {
-                Gtk.Image {
-                  icon-name: "list-add-symbolic";
-                }
-              }
             }
           }
 
@@ -101,7 +94,7 @@ template $MusicusRecordingEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "heading"
+              "heading",
             ]
           }
 
@@ -110,21 +103,14 @@ template $MusicusRecordingEditor: Adw.NavigationPage {
             margin-top: 12;
 
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
-            Adw.ActionRow {
+            Adw.ButtonRow {
               title: _("Add _ensemble");
               use-underline: true;
-              activatable: true;
+              start-icon-name: "list-add-symbolic";
               activated => $select_ensemble() swapped;
-
-              [prefix]
-              Gtk.Box select_ensemble_box {
-                Gtk.Image {
-                  icon-name: "list-add-symbolic";
-                }
-              }
             }
           }
 
@@ -133,7 +119,7 @@ template $MusicusRecordingEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
             Adw.ButtonRow save_row {
diff --git a/data/ui/tracks_editor.blp b/data/ui/tracks_editor.blp
index b0f736c..d466b41 100644
--- a/data/ui/tracks_editor.blp
+++ b/data/ui/tracks_editor.blp
@@ -70,16 +70,11 @@ template $MusicusTracksEditor: Adw.NavigationPage {
               "boxed-list"
             ]
 
-            Adw.ActionRow {
+            Adw.ButtonRow {
               title: _("Add _files");
+              start-icon-name: "list-add-symbolic";
               use-underline: true;
-              activatable: true;
               activated => $add_files() swapped;
-
-              [prefix]
-              Gtk.Image {
-                icon-name: "list-add-symbolic";
-              }
             }
           }
 
diff --git a/data/ui/translation_editor.blp b/data/ui/translation_editor.blp
index 687f7de..395e233 100644
--- a/data/ui/translation_editor.blp
+++ b/data/ui/translation_editor.blp
@@ -14,17 +14,11 @@ template $MusicusTranslationEditor: Adw.Bin {
       use-underline: true;
     }
 
-    Adw.ActionRow {
-      title: _("Add translation");
-      activatable: true;
+    Adw.ButtonRow {
+      title: _("Add _translation");
+      start-icon-name: "list-add-symbolic";
+      use-underline: true;
       activated => $add_translation() swapped;
-
-      [prefix]
-      Gtk.Box select_person_box {
-        Gtk.Image {
-          icon-name: "list-add-symbolic";
-        }
-      }
     }
   }
 }
diff --git a/data/ui/work_editor.blp b/data/ui/work_editor.blp
index d7413cf..3dd1dcc 100644
--- a/data/ui/work_editor.blp
+++ b/data/ui/work_editor.blp
@@ -22,7 +22,7 @@ template $MusicusWorkEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "heading"
+              "heading",
             ]
           }
 
@@ -36,7 +36,7 @@ template $MusicusWorkEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "heading"
+              "heading",
             ]
           }
 
@@ -45,21 +45,14 @@ template $MusicusWorkEditor: Adw.NavigationPage {
             margin-top: 12;
 
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
-            Adw.ActionRow {
+            Adw.ButtonRow {
               title: _("Add _composer");
+              start-icon-name: "list-add-symbolic";
               use-underline: true;
-              activatable: true;
               activated => $add_person() swapped;
-
-              [prefix]
-              Gtk.Box select_person_box {
-                Gtk.Image {
-                  icon-name: "list-add-symbolic";
-                }
-              }
             }
           }
 
@@ -69,7 +62,7 @@ template $MusicusWorkEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "heading"
+              "heading",
             ]
           }
 
@@ -78,19 +71,14 @@ template $MusicusWorkEditor: Adw.NavigationPage {
             margin-top: 12;
 
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
-            Adw.ActionRow {
+            Adw.ButtonRow {
               title: _("Add _part");
+              start-icon-name: "list-add-symbolic";
               use-underline: true;
-              activatable: true;
               activated => $add_part() swapped;
-
-              [prefix]
-              Gtk.Image {
-                icon-name: "list-add-symbolic";
-              }
             }
           }
 
@@ -100,7 +88,7 @@ template $MusicusWorkEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "heading"
+              "heading",
             ]
           }
 
@@ -110,21 +98,14 @@ template $MusicusWorkEditor: Adw.NavigationPage {
             margin-bottom: 24;
 
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
-            Adw.ActionRow {
+            Adw.ButtonRow {
               title: _("Add _instrument");
+              start-icon-name: "list-add-symbolic";
               use-underline: true;
-              activatable: true;
               activated => $add_instrument() swapped;
-
-              [prefix]
-              Gtk.Box select_instrument_box {
-                Gtk.Image {
-                  icon-name: "list-add-symbolic";
-                }
-              }
             }
           }
 
@@ -133,7 +114,7 @@ template $MusicusWorkEditor: Adw.NavigationPage {
             margin-top: 24;
 
             styles [
-              "boxed-list"
+              "boxed-list",
             ]
 
             Adw.ButtonRow save_row {
diff --git a/src/editor/recording_editor.rs b/src/editor/recording_editor.rs
index 09de126..e3f9fd0 100644
--- a/src/editor/recording_editor.rs
+++ b/src/editor/recording_editor.rs
@@ -232,17 +232,17 @@ impl MusicusRecordingEditor {
     }
 
     #[template_callback]
-    fn select_work(&self, _: &adw::ActionRow) {
+    fn select_work(&self) {
         self.imp().work_selector_popover.get().unwrap().popup();
     }
 
     #[template_callback]
-    fn select_person(&self, _: &adw::ActionRow) {
+    fn select_person(&self) {
         self.imp().persons_popover.get().unwrap().popup();
     }
 
     #[template_callback]
-    fn select_ensemble(&self, _: &adw::ActionRow) {
+    fn select_ensemble(&self) {
         self.imp().ensembles_popover.get().unwrap().popup();
     }
 
diff --git a/src/editor/translation_editor.rs b/src/editor/translation_editor.rs
index aa2577b..4911c45 100644
--- a/src/editor/translation_editor.rs
+++ b/src/editor/translation_editor.rs
@@ -72,7 +72,7 @@ impl MusicusTranslationEditor {
     }
 
     #[template_callback]
-    fn add_translation(&self, _: &adw::ActionRow) {
+    fn add_translation(&self) {
         self.add_entry(&util::LANG, &self.imp().entry_row.text());
     }
 
diff --git a/src/editor/work_editor.rs b/src/editor/work_editor.rs
index 7dbe949..102ea4b 100644
--- a/src/editor/work_editor.rs
+++ b/src/editor/work_editor.rs
@@ -212,12 +212,12 @@ impl MusicusWorkEditor {
     }
 
     #[template_callback]
-    fn add_person(&self, _: &adw::ActionRow) {
+    fn add_person(&self) {
         self.imp().persons_popover.get().unwrap().popup();
     }
 
     #[template_callback]
-    fn add_part(&self, _: &adw::ActionRow) {
+    fn add_part(&self) {
         let editor = MusicusWorkEditor::new(&self.navigation(), &self.library(), None, true);
 
         editor.connect_created(clone!(
@@ -232,7 +232,7 @@ impl MusicusWorkEditor {
     }
 
     #[template_callback]
-    fn add_instrument(&self, _: &adw::ActionRow) {
+    fn add_instrument(&self) {
         self.imp().instruments_popover.get().unwrap().popup();
     }