diff --git a/lib/music_library_web/live/artist_live/show.html.heex b/lib/music_library_web/live/artist_live/show.html.heex
index 46af8160..771f51d5 100644
--- a/lib/music_library_web/live/artist_live/show.html.heex
+++ b/lib/music_library_web/live/artist_live/show.html.heex
@@ -79,7 +79,7 @@
         <.play_count play_count={lastfm_artist_info.play_count} />
       </.async_result>
       <.button variant="solid" patch={~p"/artists/#{@artist.musicbrainz_id}/import"}>
-        <.icon name="hero-plus" class="h-4 w-4 mr-2" aria-hidden="true" data-slot="icon" />
+        <.icon name="hero-plus" class="icon" aria-hidden="true" data-slot="icon" />
         {gettext("Add more")}
       </.button>
     </div>
diff --git a/lib/music_library_web/live/collection_live/index.html.heex b/lib/music_library_web/live/collection_live/index.html.heex
index e56b5453..308e4de1 100644
--- a/lib/music_library_web/live/collection_live/index.html.heex
+++ b/lib/music_library_web/live/collection_live/index.html.heex
@@ -8,7 +8,7 @@
           size="sm"
           patch={~p"/collection/import"}
         >
-          <.icon name="hero-plus" class="h-4 w-4 mr-2" aria-hidden="true" data-slot="icon" />
+          <.icon name="hero-plus" class="icon" aria-hidden="true" data-slot="icon" />
           {gettext("Add")}
         </.button>
         <.button
@@ -16,7 +16,7 @@
           size="sm"
           patch={~p"/collection/scan"}
         >
-          <.barcode_icon class="mr-2 fill-current" />
+          <.barcode_icon class="icon fill-current" />
           {gettext("Scan")}
         </.button>
       </.button_group>
@@ -34,7 +34,7 @@
       >
         <.icon
           name="hero-banknotes-solid"
-          class="mr-1 h-4 w-4"
+          class="icon"
           aria-hidden="true"
           data-slot="icon"
         />
@@ -47,7 +47,7 @@
           @record_list_params.order == :alphabetical && "!bg-zinc-100 dark:!bg-zinc-700"
         ]}
       >
-        <.icon name="hero-user-solid" class="mr-1 h-4 w-4" aria-hidden="true" data-slot="icon" />
+        <.icon name="hero-user-solid" class="icon" aria-hidden="true" data-slot="icon" />
         {gettext("A->Z")}
       </.button>
     </.button_group>
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 5797eab4..c790549b 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
@@ -7,7 +7,7 @@
     </div>
     <div>
       <.button variant="solid" size="sm" patch={~p"/online-store-templates/new"}>
-        <.icon name="hero-plus" class="h-4 w-4 mr-2" aria-hidden="true" data-slot="icon" />
+        <.icon name="hero-plus" class="icon" aria-hidden="true" data-slot="icon" />
         {gettext("New Template")}
       </.button>
     </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 269e39a6..1841fefd 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
@@ -12,7 +12,7 @@
           size="sm"
           patch={~p"/scrobble-rules/new"}
         >
-          <.icon name="hero-plus" class="h-4 w-4 mr-2" aria-hidden="true" data-slot="icon" />
+          <.icon name="hero-plus" class="icon" aria-hidden="true" data-slot="icon" />
           {gettext("New Rule")}
         </.button>
         <.button
@@ -20,7 +20,7 @@
           size="sm"
           phx-click="apply_all_rules"
         >
-          <.icon name="hero-play" class="h-4 w-4 mr-2" />
+          <.icon name="hero-play" class="icon" />
           {gettext("Apply All")}
         </.button>
       </.button_group>
diff --git a/lib/music_library_web/live/wishlist_live/index.html.heex b/lib/music_library_web/live/wishlist_live/index.html.heex
index cb14d78d..341b2508 100644
--- a/lib/music_library_web/live/wishlist_live/index.html.heex
+++ b/lib/music_library_web/live/wishlist_live/index.html.heex
@@ -7,7 +7,7 @@
         size="sm"
         patch={~p"/wishlist/import"}
       >
-        <.icon name="hero-plus" class="h-4 w-4 mr-2" aria-hidden="true" data-slot="icon" />
+        <.icon name="hero-plus" class="icon" aria-hidden="true" data-slot="icon" />
         {gettext("Add")}
       </.button>
     </div>
@@ -23,7 +23,7 @@
           @record_list_params.order == :insertion && "!bg-zinc-100 dark:!bg-zinc-700"
         ]}
       >
-        <.icon name="hero-star" class="mr-1 h-4 w-4" aria-hidden="true" data-slot="icon" />
+        <.icon name="hero-star" class="icon" aria-hidden="true" data-slot="icon" />
         {gettext("Insertion")}
       </.button>
       <.button
@@ -34,7 +34,7 @@
           @record_list_params.order == :alphabetical && "!bg-zinc-100 dark:!bg-zinc-700"
         ]}
       >
-        <.icon name="hero-user-solid" class="mr-1 h-4 w-4" aria-hidden="true" data-slot="icon" />
+        <.icon name="hero-user-solid" class="icon" aria-hidden="true" data-slot="icon" />
         {gettext("A->Z")}
       </.button>
     </.button_group>