diff --git a/app/views/rules/index.html.erb b/app/views/rules/index.html.erb
index 05c5361dd..4c43de864 100644
--- a/app/views/rules/index.html.erb
+++ b/app/views/rules/index.html.erb
@@ -109,7 +109,7 @@
 
     <div class="overflow-x-auto">
       <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-3 text-left text-xs font-medium text-secondary uppercase tracking-wider">
               <%= t("rules.recent_runs.columns.date_time") %>
diff --git a/app/views/settings/ai_prompts/show.html.erb b/app/views/settings/ai_prompts/show.html.erb
index 60e11c9bb..bd4e1baa2 100644
--- a/app/views/settings/ai_prompts/show.html.erb
+++ b/app/views/settings/ai_prompts/show.html.erb
@@ -40,7 +40,7 @@
                 <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
               </summary>
               <pre class="whitespace-pre-wrap text-xs font-mono text-primary">[<%= Provider::Openai::DEFAULT_MODEL %>]</pre>
-              <div class="mt-2 px-3 py-2 bg-surface-default border border-primary rounded-lg">
+              <div class="mt-2 px-3 py-2 bg-surface border border-primary rounded-lg">
                 <pre class="whitespace-pre-wrap text-xs font-mono text-primary"><%= @assistant_config[:instructions] %></pre>
               </div>
             </details>
@@ -68,7 +68,7 @@
                 <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
               </summary>
               <pre class="whitespace-pre-wrap text-xs font-mono text-primary">[<%= Provider::Openai::DEFAULT_MODEL %>]</pre>
-              <div class="mt-2 px-3 py-2 bg-surface-default border border-primary rounded-lg">
+              <div class="mt-2 px-3 py-2 bg-surface border border-primary rounded-lg">
                 <pre class="whitespace-pre-wrap text-xs font-mono text-primary"><%= @assistant_config[:auto_categorizer]&.instructions || Provider::Openai::AutoCategorizer.new(nil).instructions %></pre>
               </div>
             </details>
@@ -96,7 +96,7 @@
                 <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
               </summary>
               <pre class="whitespace-pre-wrap text-xs font-mono text-primary">[<%= Provider::Openai::DEFAULT_MODEL %>]</pre>
-              <div class="mt-2 px-3 py-2 bg-surface-default border border-primary rounded-lg">
+              <div class="mt-2 px-3 py-2 bg-surface border border-primary rounded-lg">
                 <pre class="whitespace-pre-wrap text-xs font-mono text-primary"><%= @assistant_config[:auto_merchant]&.instructions || Provider::Openai::AutoMerchantDetector.new(nil, model: "", transactions: [], user_merchants: []).instructions %></pre>
               </div>
             </details>
diff --git a/app/views/settings/llm_usages/show.html.erb b/app/views/settings/llm_usages/show.html.erb
index d0b8e5967..a5574c116 100644
--- a/app/views/settings/llm_usages/show.html.erb
+++ b/app/views/settings/llm_usages/show.html.erb
@@ -106,7 +106,7 @@
     <div class="table-scroll rounded-lg" tabindex="0" role="region" aria-label="<%= t(".recent_usage") %>">
       <% if @llm_usages.any? %>
         <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-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".col_date") %></th>
               <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".col_operation") %></th>