diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index c31a1fb61..5e5a0ec0a 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -12,7 +12,7 @@
         <%= f.label :role, t(".filters.role"), class: "block text-sm font-medium text-primary mb-1" %>
         <%= f.select :role,
             options_for_select(
-              [[t(".filters.role_all"), ""], [t(".roles.guest"), "guest"], [t(".roles.member", default: "Member"), "member"], [t(".roles.admin"), "admin"], [t(".roles.super_admin"), "super_admin"]],
+              [[t(".filters.role_all"), ""], [t(".roles.guest"), "guest"], [t(".roles.member"), "member"], [t(".roles.admin"), "admin"], [t(".roles.super_admin"), "super_admin"]],
               params[:role]
             ),
             {},
@@ -75,7 +75,7 @@
                   </span>
                 <% elsif sub %>
                   <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium
-                    <%= sub.active? ? "bg-green-100 text-green-800" : "bg-surface text-secondary" %>">
+                    <%= sub.active? ? "bg-success/10 text-success" : "bg-surface text-secondary" %>">
                     <%= sub.status.humanize %>
                   </span>
                 <% else %>
@@ -87,7 +87,7 @@
 
             <div class="border-t border-primary">
               <table class="w-full">
-                <thead class="bg-surface-default border-b border-primary">
+                <thead class="bg-surface border-b border-primary">
                   <tr>
                     <th class="px-4 py-2 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.user") %></th>
                     <th class="px-4 py-2 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.last_login") %></th>
@@ -123,7 +123,7 @@
                             <%= form.select :role,
                                 options_for_select([
                                   [t(".roles.guest"), "guest"],
-                                  [t(".roles.member", default: "Member"), "member"],
+                                  [t(".roles.member"), "member"],
                                   [t(".roles.admin"), "admin"],
                                   [t(".roles.super_admin"), "super_admin"]
                                 ], user.role),
@@ -139,7 +139,7 @@
                 <% if pending_invitations.any? %>
                   <tbody class="divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200 border-t border-dashed border-primary">
                     <% pending_invitations.each do |invitation| %>
-                      <tr class="bg-red-50/30 dark:bg-red-950/20">
+                      <tr class="bg-destructive/5">
                         <td class="px-4 py-3">
                           <div class="flex items-center gap-3">
                             <%= icon "mail", class: "w-5 h-5 text-secondary shrink-0" %>
@@ -160,7 +160,7 @@
                             <button type="submit"
                                     data-admin-invitation-delete-target="button"
                                     data-action="click->admin-invitation-delete#handleClick"
-                                    class="text-sm text-red-600 hover:text-red-800 border border-red-300 rounded-lg px-2 py-1 hover:bg-red-50 transition-colors">
+                                    class="text-sm text-destructive border border-destructive rounded-lg px-2 py-1 hover:bg-destructive/10 transition-colors">
                               <%= t(".invitations.delete") %>
                             </button>
                           <% end %>
@@ -198,9 +198,9 @@
       </div>
       <div class="flex items-start gap-3">
         <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-surface text-primary shrink-0">
-          <%= t(".roles.member", default: "Member") %>
+          <%= t(".roles.member") %>
         </span>
-        <p class="text-secondary"><%= t(".role_descriptions.member", default: "Basic user access. Can manage their own accounts, transactions, and settings.") %></p>
+        <p class="text-secondary"><%= t(".role_descriptions.member") %></p>
       </div>
       <div class="flex items-start gap-3">
         <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-surface text-primary shrink-0">
@@ -209,7 +209,7 @@
         <p class="text-secondary"><%= t(".role_descriptions.admin") %></p>
       </div>
       <div class="flex items-start gap-3">
-        <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800 shrink-0">
+        <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-success/10 text-success shrink-0">
           <%= t(".roles.super_admin") %>
         </span>
         <p class="text-secondary"><%= t(".role_descriptions.super_admin") %></p>
diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb
index e71d84b6f..78950bd76 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/imports/new.html.erb
@@ -122,7 +122,7 @@
             <%= render "imports/import_option",
               type: "TransactionImport",
               icon_name: "bar-chart-2",
-              icon_bg_class: "bg-gray-tint-5",
+              icon_bg_class: "bg-surface-inset",
               icon_text_class: "text-subdued",
               label: t(".import_ynab"),
               enabled: false,