diff --git a/elixir/apps/web/lib/web/components/core_components.ex b/elixir/apps/web/lib/web/components/core_components.ex
index f10fb92e0..580c0443a 100644
--- a/elixir/apps/web/lib/web/components/core_components.ex
+++ b/elixir/apps/web/lib/web/components/core_components.ex
@@ -159,10 +159,10 @@ defmodule Web.CoreComponents do
           <%= for tab <- @tab do %>
             <li class="mr-2" role="presentation">
               <button
-                class={~w[
-                inline-block p-4 border-b-2 border-transparent rounded-t
-                hover:text-neutral-600 hover:border-neutral-300
-              ]}
+                class={[
+                  "inline-block p-4 border-b-2 border-transparent rounded-t",
+                  "hover:text-neutral-600 hover:border-neutral-300"
+                ]}
                 id={"#{tab.id}-tab"}
                 data-tabs-target={"##{tab.id}"}
                 type="button"
@@ -844,7 +844,8 @@ defmodule Web.CoreComponents do
         "flex items-center justify-center",
         "font-medium text-sm text-white",
         "rounded-full",
-        (@connected? && "bg-green-500") || "bg-orange-400 cursor-progress"
+        "transition-colors",
+        (@connected? && "bg-accent-500") || "bg-primary-400 cursor-progress"
       ]}
       navigate={@navigate}
       {
diff --git a/elixir/apps/web/lib/web/live/policies/show.ex b/elixir/apps/web/lib/web/live/policies/show.ex
index 610a09c01..9a7731cda 100644
--- a/elixir/apps/web/lib/web/live/policies/show.ex
+++ b/elixir/apps/web/lib/web/live/policies/show.ex
@@ -38,7 +38,7 @@ defmodule Web.Policies.Show do
     <.section>
       <:title>
         <%= @page_title %>: <code><%= @policy.id %></code>
-        <span :if={not is_nil(@policy.disabled_at)} class="text-orange-600">(disabled)</span>
+        <span :if={not is_nil(@policy.disabled_at)} class="text-primary-600">(disabled)</span>
         <span :if={not is_nil(@policy.deleted_at)} class="text-red-600">(deleted)</span>
       </:title>
       <:action :if={is_nil(@policy.deleted_at)}>
diff --git a/elixir/apps/web/lib/web/live/settings/account.ex b/elixir/apps/web/lib/web/live/settings/account.ex
index 0c8555b46..f1f966b48 100644
--- a/elixir/apps/web/lib/web/live/settings/account.ex
+++ b/elixir/apps/web/lib/web/live/settings/account.ex
@@ -45,9 +45,7 @@ defmodule Web.Settings.Account do
           To disable your account and schedule it for deletion, please <.link
             class={link_style()}
             href="mailto:support@firezone.dev"
-          >
-        contact support
-      </.link>.
+          >contact support</.link>.
         </p>
       </:content>
     </.section>
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
index a8a00204a..764856ec2 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
@@ -29,7 +29,7 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.Show do
     <.section>
       <:title>
         Identity Provider <code><%= @provider.name %></code>
-        <span :if={not is_nil(@provider.disabled_at)} class="text-orange-600">(disabled)</span>
+        <span :if={not is_nil(@provider.disabled_at)} class="text-primary-600">(disabled)</span>
         <span :if={not is_nil(@provider.deleted_at)} class="text-red-600">(deleted)</span>
       </:title>
       <:action :if={is_nil(@provider.deleted_at)}>
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex
index c4b2826eb..9bcd7c7c6 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex
@@ -28,7 +28,7 @@ defmodule Web.Settings.IdentityProviders.OpenIDConnect.Show do
     <.section>
       <:title>
         Identity Provider <code><%= @provider.name %></code>
-        <span :if={not is_nil(@provider.disabled_at)} class="text-orange-600">(disabled)</span>
+        <span :if={not is_nil(@provider.disabled_at)} class="text-primary-600">(disabled)</span>
         <span :if={not is_nil(@provider.deleted_at)} class="text-red-600">(deleted)</span>
       </:title>
       <:action :if={is_nil(@provider.deleted_at)}>
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex
index 9df83682a..1ab645b58 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex
@@ -31,7 +31,7 @@ defmodule Web.Settings.IdentityProviders.System.Show do
     <.section>
       <:title>
         Identity Provider <code><%= @provider.name %></code>
-        <span :if={not is_nil(@provider.disabled_at)} class="text-orange-600">(disabled)</span>
+        <span :if={not is_nil(@provider.disabled_at)} class="text-primary-600">(disabled)</span>
         <span :if={not is_nil(@provider.deleted_at)} class="text-red-600">(deleted)</span>
       </:title>
       <:action :if={is_nil(@provider.deleted_at)}>