diff --git a/app/views/admin/sso_providers/index.html.erb b/app/views/admin/sso_providers/index.html.erb
index 6120b52ea..8ea545eb5 100644
--- a/app/views/admin/sso_providers/index.html.erb
+++ b/app/views/admin/sso_providers/index.html.erb
@@ -64,13 +64,8 @@
 
   <% if @legacy_providers.any? %>
     <%= settings_section title: t("admin.sso_providers.index.legacy_providers_title"), collapsible: true, open: true do %>
-      <div class="bg-amber-50 border border-amber-200 rounded-lg p-3 mb-4 theme-dark:bg-amber-500/10 theme-dark:border-amber-500/30">
-        <div class="flex gap-2">
-          <%= icon "alert-triangle", class: "w-5 h-5 text-amber-600 shrink-0 theme-dark:text-amber-400" %>
-          <p class="text-sm text-amber-800 theme-dark:text-amber-200">
-            <%= t("admin.sso_providers.index.legacy_providers_notice") %>
-          </p>
-        </div>
+      <div class="mb-4">
+        <%= render DS::Alert.new(message: t("admin.sso_providers.index.legacy_providers_notice"), variant: :warning) %>
       </div>
 
       <div class="divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200">
@@ -90,9 +85,7 @@
               </div>
             </div>
             <div class="flex items-center gap-2">
-              <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-amber-100 text-amber-800 theme-dark:bg-amber-500/15 theme-dark:text-amber-200">
-                <%= t("admin.sso_providers.index.env_configured") %>
-              </span>
+              <%= render DS::Pill.new(label: t("admin.sso_providers.index.env_configured"), tone: :warning, marker: false) %>
             </div>
           </div>
         <% end %>
diff --git a/app/views/settings/securities/show.html.erb b/app/views/settings/securities/show.html.erb
index f94878cd4..d1c0fc828 100644
--- a/app/views/settings/securities/show.html.erb
+++ b/app/views/settings/securities/show.html.erb
@@ -160,11 +160,8 @@
         <% end %>
       </div>
       <% if @oidc_identities.count == 1 && Current.user.password_digest.blank? %>
-        <div class="mt-4 p-3 bg-amber-50 border border-amber-200 rounded-lg theme-dark:bg-amber-500/10 theme-dark:border-amber-500/30">
-          <div class="flex items-start gap-2">
-            <%= icon "alert-triangle", class: "w-5 h-5 text-amber-600 shrink-0 mt-0.5 theme-dark:text-amber-400" %>
-            <p class="text-sm text-amber-800 theme-dark:text-amber-200"><%= t(".sso_warning_message") %></p>
-          </div>
+        <div class="mt-4">
+          <%= render DS::Alert.new(message: t(".sso_warning_message"), variant: :warning) %>
         </div>
       <% end %>
     <% else %>