diff --git a/lib/live_beats_web/components/core_components.ex b/lib/live_beats_web/components/core_components.ex
index c2cee70..80baff3 100644
--- a/lib/live_beats_web/components/core_components.ex
+++ b/lib/live_beats_web/components/core_components.ex
@@ -517,15 +517,21 @@ defmodule LiveBeatsWeb.CoreComponents do
   def button(%{patch: _} = assigns) do
     ~H"""
     <%= if @primary do %>
-      <%= live_patch [to: @patch, class: "order-0 inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-purple-600 hover:bg-purple-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-purple-500 sm:order-1 sm:ml-3"] ++
-        Map.to_list(@rest) do %>
+      <.link
+        patch={@patch} 
+        class="order-0 inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-purple-600 hover:bg-purple-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-purple-500 sm:order-1 sm:ml-3"
+        {@rest}
+      >
         <%= render_slot(@inner_block) %>
-      <% end %>
+      </.link>
     <% else %>
-      <%= live_patch [to: @patch, class: "order-1 inline-flex items-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-purple-500 sm:order-0 sm:ml-0 lg:ml-3"] ++
-        assigns_to_attributes(assigns, [:primary, :patch]) do %>
+      <.link
+        patch={@patch}
+        class="order-1 inline-flex items-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-purple-500 sm:order-0 sm:ml-0 lg:ml-3"
+        {@rest}
+      >
         <%= render_slot(@inner_block) %>
-      <% end %>
+      </.link>
     <% end %>
     """
   end