diff --git a/lib/towerops_web/live/admin/org_live/index.html.heex b/lib/towerops_web/live/admin/org_live/index.html.heex
index 3d9a1304..c7500bdc 100644
--- a/lib/towerops_web/live/admin/org_live/index.html.heex
+++ b/lib/towerops_web/live/admin/org_live/index.html.heex
@@ -95,15 +95,15 @@
         </:col>
         <:col :let={org} label="">
           <div class="flex items-center gap-3">
-            <button
+            <.button
               id={"edit-overrides-#{org.id}"}
               phx-click="edit_overrides"
               phx-value-id={org.id}
-              class="text-sm text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300"
+              variant="secondary"
             >
               {t_admin("Edit")}
-            </button>
-            <button
+            </.button>
+            <.button
               phx-click="delete_org"
               phx-value-id={org.id}
               data-confirm={
@@ -111,10 +111,10 @@
                   "Are you sure? This will delete all sites, device, and data for this organization."
                 )
               }
-              class="text-sm text-red-600 dark:text-red-400 hover:text-red-800 dark:hover:text-red-300"
+              variant="danger"
             >
               {t("Delete")}
-            </button>
+            </.button>
           </div>
         </:col>
       </.table>
diff --git a/lib/towerops_web/live/admin/security_live/index.html.heex b/lib/towerops_web/live/admin/security_live/index.html.heex
index ba2be32c..32915e15 100644
--- a/lib/towerops_web/live/admin/security_live/index.html.heex
+++ b/lib/towerops_web/live/admin/security_live/index.html.heex
@@ -108,14 +108,14 @@
                 {ToweropsWeb.TimeHelpers.format_date(entry.inserted_at, @timezone)}
               </:col>
               <:col :let={entry} label="">
-                <button
+                <.button
                   phx-click="remove_whitelist"
                   phx-value-id={entry.id}
                   data-confirm={t("Remove this IP/CIDR from the allowlist?")}
-                  class="text-sm text-red-600 dark:text-red-400 hover:text-red-800 dark:hover:text-red-300"
+                  variant="danger"
                 >
                   {t("Remove")}
-                </button>
+                </.button>
               </:col>
             </.table>
           <% end %>
diff --git a/lib/towerops_web/live/admin/user_live/index.html.heex b/lib/towerops_web/live/admin/user_live/index.html.heex
index fae7cba7..9d1bef46 100644
--- a/lib/towerops_web/live/admin/user_live/index.html.heex
+++ b/lib/towerops_web/live/admin/user_live/index.html.heex
@@ -28,15 +28,15 @@
                 {t("Impersonate")}
               </button>
             </form>
-            <button
+            <.button
               phx-click="delete_user"
               phx-value-id={user.id}
               data-confirm={t("Are you sure you want to delete this user?")}
               disabled={user.is_superuser}
-              class="text-sm text-red-600 dark:text-red-400 hover:text-red-800 dark:hover:text-red-300 disabled:text-gray-400 disabled:cursor-not-allowed"
+              variant="danger"
             >
               {t("Delete")}
-            </button>
+            </.button>
           </div>
         </:col>
       </.table>
diff --git a/lib/towerops_web/live/agent_live/index.html.heex b/lib/towerops_web/live/agent_live/index.html.heex
index b3937d3f..769aaafc 100644
--- a/lib/towerops_web/live/agent_live/index.html.heex
+++ b/lib/towerops_web/live/agent_live/index.html.heex
@@ -150,7 +150,7 @@
               >
                 {t("View Setup")}
               </.button>
-              <button
+              <.button
                 type="button"
                 phx-click="delete_agent"
                 phx-value-id={agent.id}
@@ -159,10 +159,10 @@
                     "Are you sure you want to delete this agent? All device assignments will be removed, and devices will fall back to site/organization defaults or cloud polling."
                   )
                 }
-                class="text-sm font-medium text-red-600 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"
+                variant="danger"
               >
                 {t("Delete")}
-              </button>
+              </.button>
             </div>
           <% else %>
             <span class="text-xs text-gray-500 dark:text-gray-400">Disabled</span>
@@ -266,7 +266,7 @@
               >
                 {t("View Setup")}
               </.button>
-              <button
+              <.button
                 type="button"
                 phx-click="delete_agent"
                 phx-value-id={agent.id}
@@ -275,10 +275,10 @@
                     "Are you sure you want to delete this cloud poller? This will affect all organizations using it."
                   )
                 }
-                class="text-sm font-medium text-red-600 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"
+                variant="danger"
               >
                 {t("Delete")}
-              </button>
+              </.button>
             </div>
           <% else %>
             <span class="text-xs text-gray-500 dark:text-gray-400">Disabled</span>
diff --git a/lib/towerops_web/live/device_live/show.html.heex b/lib/towerops_web/live/device_live/show.html.heex
index 3f51b9d5..f4f8a083 100644
--- a/lib/towerops_web/live/device_live/show.html.heex
+++ b/lib/towerops_web/live/device_live/show.html.heex
@@ -2090,7 +2090,7 @@
                               <.icon name="hero-arrow-down-tray" class="h-4 w-4" /> Download
                             </button>
                             <%= if ToweropsWeb.Permissions.owner?(@current_scope) do %>
-                              <button
+                              <.button
                                 phx-click="delete_backup"
                                 phx-value-id={backup.id}
                                 data-confirm={
@@ -2098,10 +2098,10 @@
                                     "Are you sure you want to delete this backup? This action cannot be undone."
                                   )
                                 }
-                                class="inline-flex items-center gap-1 px-2 py-1 text-xs font-medium text-red-600 hover:text-red-800 dark:text-red-400 dark:hover:text-red-300"
+                                variant="danger"
                               >
                                 <.icon name="hero-trash" class="h-4 w-4" /> Delete
-                              </button>
+                              </.button>
                             <% end %>
                           </div>
                         </td>
diff --git a/lib/towerops_web/live/org/settings_live.html.heex b/lib/towerops_web/live/org/settings_live.html.heex
index d502bc2b..50158759 100644
--- a/lib/towerops_web/live/org/settings_live.html.heex
+++ b/lib/towerops_web/live/org/settings_live.html.heex
@@ -840,15 +840,15 @@
                               </option>
                             </select>
                           </form>
-                          <button
+                          <.button
                             type="button"
                             phx-click="remove_member"
                             phx-value-user-id={member.user_id}
                             data-confirm={t("Remove this member from the organization?")}
-                            class="text-red-600 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"
+                            variant="danger"
                           >
                             {t("Remove")}
-                          </button>
+                          </.button>
                         </div>
                       <% end %>
                     </td>