diff --git a/lib/music_library_web/live/online_store_template_live/index.html.heex b/lib/music_library_web/live/online_store_template_live/index.html.heex
index 2f7c6c40..9c90a402 100644
--- a/lib/music_library_web/live/online_store_template_live/index.html.heex
+++ b/lib/music_library_web/live/online_store_template_live/index.html.heex
@@ -9,7 +9,7 @@
       <div>
         <.button variant="solid" size="sm" patch={~p"/online-store-templates/new"}>
           <.icon name="hero-plus" class="icon" aria-hidden="true" data-slot="icon" />
-          {gettext("New Template")}
+          {gettext("Add")}
         </.button>
       </div>
     </div>
diff --git a/lib/music_library_web/live/scrobble_rules_live/index.html.heex b/lib/music_library_web/live/scrobble_rules_live/index.html.heex
index 824721b7..8eaeb64e 100644
--- a/lib/music_library_web/live/scrobble_rules_live/index.html.heex
+++ b/lib/music_library_web/live/scrobble_rules_live/index.html.heex
@@ -14,7 +14,7 @@
             patch={~p"/scrobble-rules/new"}
           >
             <.icon name="hero-plus" class="icon" aria-hidden="true" data-slot="icon" />
-            {gettext("New Rule")}
+            {gettext("Add")}
           </.button>
           <.button
             variant="solid"
@@ -22,7 +22,7 @@
             phx-click="apply_all_rules"
           >
             <.icon name="hero-play" class="icon" />
-            {gettext("Apply All")}
+            {gettext("Apply")}
           </.button>
         </.button_group>
       </div>
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index c5a9bdd0..7973981a 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -588,6 +588,8 @@ msgid "Some records could not be imported: %{summary}"
 msgstr ""
 
 #: lib/music_library_web/live/collection_live/index.html.heex
+#: lib/music_library_web/live/online_store_template_live/index.html.heex
+#: lib/music_library_web/live/scrobble_rules_live/index.html.heex
 #: lib/music_library_web/live/wishlist_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Add"
@@ -1013,11 +1015,6 @@ msgstr ""
 msgid "Match Value"
 msgstr ""
 
-#: lib/music_library_web/live/scrobble_rules_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "New Rule"
-msgstr ""
-
 #: lib/music_library_web/live/scrobble_rules_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "New Scrobble Rule"
@@ -1154,11 +1151,6 @@ msgstr ""
 msgid "Dominant Colors"
 msgstr ""
 
-#: lib/music_library_web/live/scrobble_rules_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Apply All"
-msgstr ""
-
 #: lib/music_library_web/components/record_form.ex
 #: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
 #, elixir-autogen, elixir-format
@@ -1261,11 +1253,6 @@ msgstr ""
 msgid "Enable template"
 msgstr ""
 
-#: lib/music_library_web/live/online_store_template_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "New Template"
-msgstr ""
-
 #: lib/music_library_web/components/layouts/root.html.heex
 #, elixir-autogen, elixir-format
 msgid "Data sourced from"
@@ -1672,3 +1659,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "No scrobble rules found"
 msgstr ""
+
+#: lib/music_library_web/live/scrobble_rules_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Apply"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 4ddd048c..d89ba2f3 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -588,6 +588,8 @@ msgid "Some records could not be imported: %{summary}"
 msgstr ""
 
 #: lib/music_library_web/live/collection_live/index.html.heex
+#: lib/music_library_web/live/online_store_template_live/index.html.heex
+#: lib/music_library_web/live/scrobble_rules_live/index.html.heex
 #: lib/music_library_web/live/wishlist_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Add"
@@ -1013,11 +1015,6 @@ msgstr ""
 msgid "Match Value"
 msgstr ""
 
-#: lib/music_library_web/live/scrobble_rules_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "New Rule"
-msgstr ""
-
 #: lib/music_library_web/live/scrobble_rules_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "New Scrobble Rule"
@@ -1154,11 +1151,6 @@ msgstr ""
 msgid "Dominant Colors"
 msgstr ""
 
-#: lib/music_library_web/live/scrobble_rules_live/index.html.heex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Apply All"
-msgstr ""
-
 #: lib/music_library_web/components/record_form.ex
 #: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
 #, elixir-autogen, elixir-format
@@ -1261,11 +1253,6 @@ msgstr ""
 msgid "Enable template"
 msgstr ""
 
-#: lib/music_library_web/live/online_store_template_live/index.html.heex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "New Template"
-msgstr ""
-
 #: lib/music_library_web/components/layouts/root.html.heex
 #, elixir-autogen, elixir-format
 msgid "Data sourced from"
@@ -1672,3 +1659,8 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No scrobble rules found"
 msgstr ""
+
+#: lib/music_library_web/live/scrobble_rules_live/index.html.heex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Apply"
+msgstr ""
diff --git a/test/music_library_web/live/scrobble_rules_live/index_test.exs b/test/music_library_web/live/scrobble_rules_live/index_test.exs
index 7a7a1951..85b303a4 100644
--- a/test/music_library_web/live/scrobble_rules_live/index_test.exs
+++ b/test/music_library_web/live/scrobble_rules_live/index_test.exs
@@ -40,7 +40,7 @@ defmodule MusicLibraryWeb.ScrobbleRulesLiveTest do
     test "saves new scrobble_rule", %{conn: conn} do
       {:ok, index_live, _html} = live(conn, ~p"/scrobble-rules")
 
-      assert index_live |> element("a", "New Rule") |> render_click() =~
+      assert index_live |> element("a", "Add") |> render_click() =~
                "New Scrobble Rule"
 
       assert_patch(index_live, ~p"/scrobble-rules/new")
@@ -140,7 +140,7 @@ defmodule MusicLibraryWeb.ScrobbleRulesLiveTest do
     test "shows validation errors for missing required fields", %{conn: conn} do
       {:ok, index_live, _html} = live(conn, ~p"/scrobble-rules")
 
-      assert index_live |> element("a", "New Rule") |> render_click()
+      assert index_live |> element("a", "Add") |> render_click()
 
       assert index_live
              |> form("#scrobble_rule-form",
@@ -152,7 +152,7 @@ defmodule MusicLibraryWeb.ScrobbleRulesLiveTest do
     test "shows validation errors for invalid MusicBrainz ID", %{conn: conn} do
       {:ok, index_live, _html} = live(conn, ~p"/scrobble-rules")
 
-      assert index_live |> element("a", "New Rule") |> render_click()
+      assert index_live |> element("a", "Add") |> render_click()
 
       assert index_live
              |> form("#scrobble_rule-form",
@@ -168,7 +168,7 @@ defmodule MusicLibraryWeb.ScrobbleRulesLiveTest do
     test "updates form labels based on rule type", %{conn: conn} do
       {:ok, index_live, _html} = live(conn, ~p"/scrobble-rules")
 
-      assert index_live |> element("a", "New Rule") |> render_click()
+      assert index_live |> element("a", "Add") |> render_click()
 
       # Select album type
       html =