diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 4b0569b54..2591332d9 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -179,17 +179,20 @@
       display: none;
     }
 
-    & ~ .btn {
-      --btn-background: var(--card-color);
-      --btn-color: var(--color-ink-inverted);
-    }
-  }
-
-  .card-field__description {
     lexxy-toolbar {
       border-block-start: 1px solid var(--color-ink-light);
       margin-block-start: var(--block-space-half) !important;
     }
+
+    & ~ .btn.btn--reversed {
+      --btn-background: var(--card-color);
+      --btn-color: var(--color-ink-inverted);
+    }
+
+    & ~ .btn {
+      --btn-border-color: var(--card-color);
+      --btn-color: var(--card-color);
+    }
   }
 
   .card__stages {
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index de52542fe..814370bed 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -10,7 +10,7 @@
       </div>
     <% end %>
 
-    <%= link_to "Edit", edit_card_path(card), class: "btn btn--reversed fit-content", style: "--btn-background: #{card.color}" %>
+    <%= link_to "Edit", edit_card_path(card), class: "btn fit-content txt-small" %>
   <% end %>
 <% else %>
   <%= form_with model: card, id: "card_form", data: { controller: "autoresize auto-save" } do |form| %>
@@ -23,7 +23,7 @@
       <% end %>
     </h1>
 
-    <%= form.rich_textarea :description, class: "card-field__description rich-text-content",
+    <%= form.rich_textarea :description, class: "card__description rich-text-content",
           placeholder: "Add some notes, context, pictures, or video about this…",
           data: { action: "lexxy:change->auto-save#change focusout->auto-save#submit" } do %>
       <%= general_prompts(card.board) %>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index 1a1eda843..15de68c0b 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -9,13 +9,13 @@
       <% end %>
     </h1>
 
-    <%= form.rich_textarea :description, class: "card-field__description rich-text-content",
+    <%= form.rich_textarea :description, class: "card__description rich-text-content",
           placeholder: "Add some notes, context, pictures, or video about this…",
           data: { local_save_target: "input", action: "lexxy:change->local-save#save turbo:morph-element->local-save#restoreContent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do %>
       <%= general_prompts(@card.board) %>
     <% end %>
 
-    <%= form.button "Save changes", type: :submit, class: "btn btn--reversed fit-content", style: "--btn-background: #{@card.color}" %>
+    <%= form.button "Save changes", type: :submit, class: "btn btn--reversed fit-content txt-small" %>
     <%= link_to "Close editor and discard changes", @card, data: { form_target: "cancel" }, hidden: true %>
   <% end %>
 <% end %>