diff --git a/lib/banchan_web/components/view_switcher.ex b/lib/banchan_web/components/view_switcher.ex
index 1e5944f6..765b851e 100644
--- a/lib/banchan_web/components/view_switcher.ex
+++ b/lib/banchan_web/components/view_switcher.ex
@@ -80,7 +80,7 @@ defmodule BanchanWeb.Components.ViewSwitcher do
           </span>
           <Icon name="chevron-down" />
         </summary>
-        <ul class="p-2 menu absolute left-0 mt-4 z-[1] bg-base-100 rounded-box w-full bordered border-base-300">
+        <ul class="p-2 menu absolute left-0 mt-4 z-[1] bg-base-100 rounded-box w-full bordered border-base-content border-opacity-10">
           <li>
             <LiveRedirect to={~p"/"} class={active: @context == :client}>
               {render_client_view(assigns)}
diff --git a/lib/banchan_web/live/commission_live/components/comment.ex b/lib/banchan_web/live/commission_live/components/comment.ex
index d62e0370..dff44514 100644
--- a/lib/banchan_web/live/commission_live/components/comment.ex
+++ b/lib/banchan_web/live/commission_live/components/comment.ex
@@ -148,7 +148,7 @@ defmodule BanchanWeb.CommissionLive.Components.Comment do
 
   def render(assigns) do
     ~F"""
-    <div class="pb-4 border-2 bg-base-200 rounded-box border-base-300">
+    <div class="pb-4 border-2 bg-base-200 rounded-box border-base-content border-opacity-10">
       <div class="flex flex-row px-2 pt-2 -mb-4 text-sm">
         <div class="inline-flex flex-wrap items-center space-x-1 grow">
           <UserHandle user={@actor} />
diff --git a/lib/banchan_web/live/commission_live/components/commission.ex b/lib/banchan_web/live/commission_live/components/commission.ex
index b5f6f42d..f7132321 100644
--- a/lib/banchan_web/live/commission_live/components/commission.ex
+++ b/lib/banchan_web/live/commission_live/components/commission.ex
@@ -183,16 +183,13 @@ defmodule BanchanWeb.CommissionLive.Components.Commission do
   def render(assigns) do
     ~F"""
     <div class="relative">
-      <h1 class="sticky z-30 flex flex-row items-center px-4 pb-2 text-3xl border-b-2 opacity-100 top-16 bg-base-100 border-base-content border-opacity-10">
-        <LivePatch
-          class="px-2 pb-4"
-          to={if is_nil(@studio) do
-            ~p"/commissions"
-          else
-            ~p"/studios/#{@studio.handle}/commissions"
-          end}
-        >
-          <Icon name="arrow-left" size="4" />
+      <h1 class="sticky z-30 flex flex-row items-center p-4 text-3xl border-b-2 opacity-100 bg-base-200 top-16 border-base-content border-opacity-10">
+        <LivePatch to={if is_nil(@studio) do
+          ~p"/commissions"
+        else
+          ~p"/studios/#{@studio.handle}/commissions"
+        end}>
+          <Icon name="arrow-left" size="6" label="back" />
         </LivePatch>
         {#if @title_changeset}
           <Form for={@title_changeset} class="w-full" change="change_title" submit="submit_title">
diff --git a/lib/banchan_web/live/commission_live/components/status_box.ex b/lib/banchan_web/live/commission_live/components/status_box.ex
index eae386e4..3c2034fd 100644
--- a/lib/banchan_web/live/commission_live/components/status_box.ex
+++ b/lib/banchan_web/live/commission_live/components/status_box.ex
@@ -99,7 +99,7 @@ defmodule BanchanWeb.CommissionLive.Components.StatusBox do
     has_transitions? = !Enum.empty?(assigns.statuses)
 
     ~F"""
-    <div class="flex flex-col gap-2 w-full bg-base-200 rounded-box p-4 border-base-300 border-2">
+    <div class="flex flex-col gap-2 w-full bg-base-200 rounded-box p-4 border-base-content border-opacity-10 border-2">
       <h3 class="text-lg font-medium">Commission Status</h3>
       {#if has_transitions?}
         <Form for={@status_state} change="update_status">
diff --git a/lib/banchan_web/live/commission_live/components/summary_box.ex b/lib/banchan_web/live/commission_live/components/summary_box.ex
index b849ef72..9374178b 100644
--- a/lib/banchan_web/live/commission_live/components/summary_box.ex
+++ b/lib/banchan_web/live/commission_live/components/summary_box.ex
@@ -304,7 +304,10 @@ defmodule BanchanWeb.CommissionLive.Components.SummaryBox do
 
   def render(assigns) do
     ~F"""
-    <div id={@id} class="bg-base-200 rounded-box p-4 border-base-300 border-2 flex flex-col gap-2">
+    <div
+      id={@id}
+      class="bg-base-200 rounded-box p-4 border-base-content border-opacity-10 border-2 flex flex-col gap-2"
+    >
       {#if @open_final_invoice}
         <div class="text-lg font-medium pb-2">Final Invoice</div>
         <div class="text-sm">Attachments will be released on payment. All deposits will be immediately released, along with this payment, and the commission will be closed.</div>
diff --git a/lib/banchan_web/live/commission_live/components/timeline.ex b/lib/banchan_web/live/commission_live/components/timeline.ex
index f21ab5da..cc9bc5af 100644
--- a/lib/banchan_web/live/commission_live/components/timeline.ex
+++ b/lib/banchan_web/live/commission_live/components/timeline.ex
@@ -50,7 +50,7 @@ defmodule BanchanWeb.CommissionLive.Components.Timeline do
                     <div class="relative flex items-start md:space-x-3">
                       <div class="hidden md:flex">
                         <Avatar
-                          class="h-10 w-10 items-center justify-center border border-base-300"
+                          class="h-10 w-10 items-center justify-center border border-base-content border-opacity-10"
                           user={Map.get(@users, event.actor_id)}
                           link={false}
                         />
diff --git a/lib/banchan_web/live/commission_live/components/timeline_item.ex b/lib/banchan_web/live/commission_live/components/timeline_item.ex
index 75cf0860..5aaa3e23 100644
--- a/lib/banchan_web/live/commission_live/components/timeline_item.ex
+++ b/lib/banchan_web/live/commission_live/components/timeline_item.ex
@@ -39,7 +39,7 @@ defmodule BanchanWeb.CommissionLive.Components.TimelineItem do
         <div class="relative flex items-start space-x-3">
           <div>
             <div class="relative px-1">
-              <div class="flex h-8 w-8 items-center justify-center rounded-full bg-base-200 ring-base-100 border-2 border-base-300">
+              <div class="flex h-8 w-8 items-center justify-center rounded-full bg-base-200 ring-base-100 border-2 border-base-content border-opacity-10">
                 <span class="text-base-content opacity-50 text-center align-middle" aria-hidden="true">
                   <#slot {@icon} />
                 </span>