diff --git a/packages/shadcn-registry/registry/assistant-ui/thread.tsx b/packages/shadcn-registry/registry/assistant-ui/thread.tsx
index 479db6d7d..909ff475e 100644
--- a/packages/shadcn-registry/registry/assistant-ui/thread.tsx
+++ b/packages/shadcn-registry/registry/assistant-ui/thread.tsx
@@ -14,7 +14,7 @@ import { TooltipIconButton } from "@/components/ui/assistant-ui/tooltip-icon-but
 export const Thread: FC = () => {
   return (
     <ThreadPrimitive.Root className="bg-background h-full">
-      <ThreadPrimitive.Viewport className="flex h-full flex-col items-center overflow-y-scroll scroll-smooth px-4 pt-8">
+      <ThreadPrimitive.Viewport className="flex h-full flex-col items-center overflow-y-scroll scroll-smooth bg-inherit px-4 pt-8">
         <ThreadWelcome />
 
         <ThreadPrimitive.Messages
diff --git a/packages/shadcn-registry/registry/assistant-ui/tooltip-icon-button.tsx b/packages/shadcn-registry/registry/assistant-ui/tooltip-icon-button.tsx
index 23bc2b046..7a09c3b7d 100644
--- a/packages/shadcn-registry/registry/assistant-ui/tooltip-icon-button.tsx
+++ b/packages/shadcn-registry/registry/assistant-ui/tooltip-icon-button.tsx
@@ -9,6 +9,7 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { Button, ButtonProps } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
 
 export type TooltipIconButtonProps = ButtonProps & {
   tooltip: string;
@@ -18,7 +19,7 @@ export type TooltipIconButtonProps = ButtonProps & {
 export const TooltipIconButton = forwardRef<
   HTMLButtonElement,
   TooltipIconButtonProps
->(({ children, tooltip, side = "bottom", ...rest }, ref) => {
+>(({ children, tooltip, side = "bottom", className, ...rest }, ref) => {
   return (
     <TooltipProvider>
       <Tooltip>
@@ -26,8 +27,8 @@ export const TooltipIconButton = forwardRef<
           <Button
             variant="ghost"
             size="icon"
-            className="size-6 p-1"
             {...rest}
+            className={cn("size-6 p-1", className)}
             ref={ref}
           >
             {children}