diff --git a/packages/frontend-2/components/form/file-upload/ProgressRow.vue b/packages/frontend-2/components/form/file-upload/ProgressRow.vue
index c26179a4e..669b0f14b 100644
--- a/packages/frontend-2/components/form/file-upload/ProgressRow.vue
+++ b/packages/frontend-2/components/form/file-upload/ProgressRow.vue
@@ -60,7 +60,7 @@ const { errorMessage, progressBarClasses, progressBarStyle } =
 
 const containerClasses = computed(() => {
   const classParts = [
-    'bg-foundation-page dark:bg-foundation border rounded-lg p-1.5 pl-2 w-full max-w-full relative'
+    'bg-foundation-page dark:bg-foundation-2 border rounded-md p-1.5 pl-2 w-full max-w-full relative'
   ]
 
   if (errorMessage.value) {
diff --git a/packages/frontend-2/components/viewer/anchored-point/NewThread.vue b/packages/frontend-2/components/viewer/anchored-point/NewThread.vue
index 28c8dad09..86e7017ec 100644
--- a/packages/frontend-2/components/viewer/anchored-point/NewThread.vue
+++ b/packages/frontend-2/components/viewer/anchored-point/NewThread.vue
@@ -33,7 +33,7 @@
         <div
           v-if="modelValue.isExpanded && canPostComment"
           ref="threadContainer"
-          class="sm:absolute w-full sm:w-[260px] bg-foundation dark:bg-foundation-page border border-outline-2 sm:rounded-lg shadow-md"
+          class="sm:absolute w-full sm:w-[260px] bg-foundation dark:bg-foundation-2 border border-outline-2 sm:rounded-xl shadow-md"
         >
           <div class="relative">
             <ViewerCommentsEditor
@@ -48,12 +48,11 @@
             />
             <div class="w-full flex justify-between items-center p-1">
               <FormButton
-                v-tippy="'Attach'"
                 :icon-left="PaperClipIcon"
                 hide-text
                 :disabled="isPostingNewThread"
                 color="subtle"
-                class="!bg-foundation-page dark:!bg-foundation"
+                class="!bg-foundation dark:!bg-foundation-2"
                 @click="trackAttachAndOpenFilePicker()"
               />
               <FormButton
diff --git a/packages/frontend-2/components/viewer/anchored-point/Thread.vue b/packages/frontend-2/components/viewer/anchored-point/Thread.vue
index 0e48670cf..f98e57d77 100644
--- a/packages/frontend-2/components/viewer/anchored-point/Thread.vue
+++ b/packages/frontend-2/components/viewer/anchored-point/Thread.vue
@@ -43,7 +43,7 @@
         >
           <div
             :class="[
-              'relative bg-foundation dark:bg-foundation-page border border-outline-2 flex flex-col overflow-hidden sm:shadow-md cursor-auto sm:rounded-lg h-full transition-all duration-200',
+              'relative bg-foundation border border-outline-2 flex flex-col overflow-hidden sm:shadow-md cursor-auto sm:rounded-lg h-full transition-all duration-200',
               'group-[.is-dragging]:bg-foundation'
             ]"
           >
diff --git a/packages/frontend-2/components/viewer/anchored-point/thread/NewReply.vue b/packages/frontend-2/components/viewer/anchored-point/thread/NewReply.vue
index cee0add14..0af0a0417 100644
--- a/packages/frontend-2/components/viewer/anchored-point/thread/NewReply.vue
+++ b/packages/frontend-2/components/viewer/anchored-point/thread/NewReply.vue
@@ -16,7 +16,7 @@
           :disabled="loading"
           color="subtle"
           hide-text
-          class="!bg-foundation-page dark:!bg-foundation"
+          class="!bg-foundation dark:!bg-foundation-2"
           @click="trackAttachAndOpenFilePicker()"
         />
         <FormButton