diff --git a/front/components/WorkspacePicker.tsx b/front/components/WorkspacePicker.tsx
index 659c74365f1a..e0c8985fddac 100644
--- a/front/components/WorkspacePicker.tsx
+++ b/front/components/WorkspacePicker.tsx
@@ -35,6 +35,7 @@ export default function WorkspacePicker({
           <Button
             label={workspace ? workspace.name : "Select workspace"}
             variant="ghost"
+            size="xs"
             isSelect
           />
         </DropdownMenuTrigger>
diff --git a/sparkle/src/components/Input.tsx b/sparkle/src/components/Input.tsx
index 59c6ebf974aa..5467333066dc 100644
--- a/sparkle/src/components/Input.tsx
+++ b/sparkle/src/components/Input.tsx
@@ -85,7 +85,11 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
           : "default";
     return (
       <div className="s-flex s-flex-col s-gap-1">
-        {label && <Label htmlFor={props.name}>{label}</Label>}
+        {label && (
+          <Label htmlFor={props.name} className="s-mb-1">
+            {label}
+          </Label>
+        )}
         <input
           ref={ref}
           className={cn(inputStyleClasses({ state }), className)}
diff --git a/sparkle/src/components/TextArea.tsx b/sparkle/src/components/TextArea.tsx
index 19f4b19efec6..797c1da735e7 100644
--- a/sparkle/src/components/TextArea.tsx
+++ b/sparkle/src/components/TextArea.tsx
@@ -27,9 +27,9 @@ const textAreaVariants = cva(
         both: "s-resize",
       },
       error: {
-        true: "s-ring-warning-200 focus:s-ring-warning-300 dark:s-ring-warning-200-dark dark:focus:s-ring-warning-300-dark",
+        true: "focus:s-ring-warning-200 focus:s-ring-warning-300 dark:s-ring-warning-200-dark dark:focus:s-ring-warning-300-dark",
         false:
-          "s-ring-structure-200 dark:s-ring-structure-300-dark dark:focus:s-ring-action-300-dark",
+          "focus:s-ring-highlight-200 dark:s-ring-structure-300-dark dark:focus:s-ring-highlight-200-dark",
       },
       disabled: {
         true: "disabled:s-cursor-not-allowed disabled:s-text-muted-foreground",