diff --git a/packages/app/src/components/comment-chip.tsx b/packages/app/src/components/comment-chip.tsx
index e2e227786d..d3074484f4 100644
--- a/packages/app/src/components/comment-chip.tsx
+++ b/packages/app/src/components/comment-chip.tsx
@@ -38,9 +38,9 @@ export const CommentChip: Component<CommentChipProps> = (props) => {
 
   return (
     <div
-      class={`group relative flex flex-col rounded-[6px] cursor-default bg-background-stronger ${
-        variant() === "full" ? "border border-border-weak-base" : "shadow-xs-border"
-      } ${variant() === "full" ? `pl-2 py-1 ${pad()}` : `pl-2 py-1 h-12 ${pad()}`} ${props.class ?? ""}`}
+      class={`group relative flex flex-col rounded-[6px] cursor-default bg-background-stronger border border-border-weak-base ${
+        variant() === "full" ? `pl-2 py-1 ${pad()}` : `pl-2 py-1 h-12 ${pad()}`
+      } ${props.class ?? ""}`}
       onClick={() => props.onOpen?.()}
     >
       <div class="flex items-center gap-1.5 min-w-0">
diff --git a/packages/app/src/components/prompt-input/image-attachments.tsx b/packages/app/src/components/prompt-input/image-attachments.tsx
index bfc192b0e1..294a830732 100644
--- a/packages/app/src/components/prompt-input/image-attachments.tsx
+++ b/packages/app/src/components/prompt-input/image-attachments.tsx
@@ -19,8 +19,8 @@ type PromptImageAttachmentProps = {
 }
 
 const fallbackClass =
-  "size-12 rounded-[6px] bg-background-stronger flex items-center justify-center shadow-xs-border cursor-default"
-const imageClass = "size-12 rounded-[6px] object-cover shadow-xs-border"
+  "size-12 rounded-[6px] bg-background-stronger flex items-center justify-center border border-border-weak-base cursor-default"
+const imageClass = "size-12 rounded-[6px] object-cover border border-border-weak-base"
 const removeClass =
   "absolute top-0 right-0 size-6 opacity-0 pointer-events-none transition-opacity group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto"
 const removeIconClass =