diff --git a/packages/components/input/src/Input.styles.tsx b/packages/components/input/src/Input.styles.tsx
index f0a2d4575..cc3d419cd 100644
--- a/packages/components/input/src/Input.styles.tsx
+++ b/packages/components/input/src/Input.styles.tsx
@@ -17,34 +17,30 @@ export const inputStyles = cva(
   {
     variants: {
       intent: {
-        unstyled: [''],
+        none: [''],
         neutral: ['border-sm', 'focus:ring-1', 'focus:border-outline-high', 'ring-outline-high'],
         success: ['border-sm', 'focus:ring-1', 'border-success', 'ring-success'],
         alert: ['border-sm', 'focus:ring-1', 'border-alert', 'ring-alert'],
         error: ['border-sm', 'focus:ring-1', 'border-error', 'ring-error'],
       },
-      isHovered: {
-        true: [],
-        false: [],
-      },
       isDisabled: {
         true: ['bg-on-surface/dim-5', 'text-on-surface/dim-3', 'cursor-not-allowed'],
         false: ['bg-surface', 'text-on-surface'],
       },
       isLeftElementVisible: {
-        true: [],
+        true: ['pl-3xl'],
         false: [],
       },
       isRightElementVisible: {
-        true: [],
+        true: ['pr-3xl'],
         false: [],
       },
       isLeftAddonVisible: {
-        true: ['border-l-none', 'rounded-l-none'],
+        true: ['pl-md', 'border-l-none', 'rounded-l-none'],
         false: ['rounded-l-lg'],
       },
       isRightAddonVisible: {
-        true: ['border-r-none', 'rounded-r-none'],
+        true: ['pr-md', 'border-r-none', 'rounded-r-none'],
         false: ['rounded-r-lg'],
       },
     },
@@ -55,40 +51,20 @@ export const inputStyles = cva(
         class: 'border-outline',
       },
       {
-        isLeftElementVisible: false,
-        isLeftAddonVisible: false,
-        class: 'pl-lg',
+        intent: 'neutral',
+        isDisabled: false,
+        class: 'hover:border-outline-high',
       },
       {
         isLeftElementVisible: false,
-        isLeftAddonVisible: true,
-        class: 'pl-md',
-      },
-      {
-        isLeftElementVisible: true,
         isLeftAddonVisible: false,
-        class: 'pl-3xl',
+        class: 'pl-lg',
       },
       {
         isRightElementVisible: false,
         isRightAddonVisible: false,
         class: 'pr-lg',
       },
-      {
-        isRightElementVisible: false,
-        isRightAddonVisible: true,
-        class: 'pr-md',
-      },
-      {
-        isRightElementVisible: true,
-        isRightAddonVisible: false,
-        class: 'pr-3xl',
-      },
-      {
-        intent: 'neutral',
-        isDisabled: false,
-        class: 'hover:border-outline-high',
-      },
     ],
   }
 )
diff --git a/packages/components/input/src/Input.tsx b/packages/components/input/src/Input.tsx
index 6f512c461..65eb7f723 100644
--- a/packages/components/input/src/Input.tsx
+++ b/packages/components/input/src/Input.tsx
@@ -1,5 +1,5 @@
 import { useFormFieldState } from '@spark-ui/form-field'
-import { ComponentPropsWithoutRef, forwardRef, PropsWithChildren } from 'react'
+import { ComponentPropsWithoutRef, forwardRef } from 'react'
 
 import { inputStyles, InputStylesProps } from './Input.styles'
 import { useInputGroup } from './InputGroupContext'
@@ -16,16 +16,15 @@ export interface InputProps
     > {}
 
 export const Input = forwardRef<HTMLInputElement, InputProps>(
-  ({ className, intent: intentProp, disabled: disabledProp, ...others }, ref) => {
+  ({ className, intent: intentProp = 'neutral', disabled: disabledProp, ...others }, ref) => {
     const field = useFormFieldState()
     const group = useInputGroup() || {}
 
     const { isLeftAddonVisible, isRightAddonVisible, isLeftElementVisible, isRightElementVisible } =
       group
     const { id, name, isInvalid, isRequired, description } = field
-
-    const intent = isInvalid ? 'error' : intentProp || 'neutral'
-    const isDisabled = disabledProp ?? group.isDisabled
+    const intent = isInvalid && intentProp !== 'none' ? 'error' : intentProp
+    const isDisabled = group.isDisabled ?? disabledProp
 
     return (
       <input
diff --git a/packages/components/input/src/InputContainer.styles.ts b/packages/components/input/src/InputContainer.styles.ts
index c5ba4185d..416e2ec45 100644
--- a/packages/components/input/src/InputContainer.styles.ts
+++ b/packages/components/input/src/InputContainer.styles.ts
@@ -15,16 +15,23 @@ export const inputContainerStyles = cva(
   {
     variants: {
       intent: {
-        neutral: [
-          'border-outline',
-          'peer-hover:border-outline-high',
-          'peer-focus:border-outline-high',
-        ],
+        neutral: ['border-outline', 'peer-focus:border-outline-high'],
         success: ['border-success'],
         alert: ['border-alert'],
         error: ['border-error'],
       },
+      isDisabled: {
+        true: [],
+        false: [],
+      },
     },
+    compoundVariants: [
+      {
+        intent: 'neutral',
+        isDisabled: false,
+        class: 'peer-hover:border-outline-high',
+      },
+    ],
   }
 )
 
diff --git a/packages/components/input/src/InputContainer.tsx b/packages/components/input/src/InputContainer.tsx
index 216f79a06..aa26eb65a 100644
--- a/packages/components/input/src/InputContainer.tsx
+++ b/packages/components/input/src/InputContainer.tsx
@@ -10,10 +10,12 @@ export interface InputContainerProps
 }
 
 export const InputContainer = forwardRef<HTMLDivElement, PropsWithChildren<InputContainerProps>>(
-  ({ className, intent, asChild, ...others }, ref) => {
+  ({ className, intent, isDisabled, asChild, ...others }, ref) => {
     const Component = asChild ? Slot : 'div'
 
-    return <Component ref={ref} className={inputContainerStyles({ intent })} {...others} />
+    return (
+      <Component ref={ref} className={inputContainerStyles({ intent, isDisabled })} {...others} />
+    )
   }
 )
 
diff --git a/packages/components/input/src/InputGroup.tsx b/packages/components/input/src/InputGroup.tsx
index 02b8e1df2..ac36e141c 100644
--- a/packages/components/input/src/InputGroup.tsx
+++ b/packages/components/input/src/InputGroup.tsx
@@ -26,13 +26,13 @@ export const InputGroup = forwardRef<HTMLDivElement, PropsWithChildren<InputGrou
       return element ? (element.type as FC).displayName : ''
     }
 
-    const findElement = (values: string[]) => {
+    const findElement = (...values: string[]) => {
       return children.find(child => values.includes(getDisplayName(child) || ''))
     }
 
-    const input = findElement(['Input', 'TextField'])
-    const left = findElement(['InputGroup.LeftAddon', 'InputGroup.LeftElement'])
-    const right = findElement(['InputGroup.RightAddon', 'InputGroup.RightElement'])
+    const input = findElement('Input', 'TextField')
+    const left = findElement('InputGroup.LeftAddon', 'InputGroup.LeftElement')
+    const right = findElement('InputGroup.RightAddon', 'InputGroup.RightElement')
     const isLeftAddonVisible = getDisplayName(left) === 'InputGroup.LeftAddon'
     const isRightAddonVisible = getDisplayName(right) === 'InputGroup.RightAddon'
     const isLeftElementVisible = getDisplayName(left) === 'InputGroup.LeftElement'
@@ -68,22 +68,28 @@ export const InputGroup = forwardRef<HTMLDivElement, PropsWithChildren<InputGrou
 
           {isInput ? (
             <>
-              {cloneElement(input as any, { intent: 'unstyled' })}
-              <InputContainer intent={intent} />
+              {cloneElement(input as ReactElement, { intent: 'none' })}
+
+              <InputContainer intent={intent} isDisabled={isDisabled} />
+
               {isLeftElementVisible && left}
-              {right}
+
+              {isRightElementVisible && right}
             </>
           ) : (
-            cloneElement(input as any, {
+            cloneElement(input as ReactElement, {
               intent,
               children: (
                 <>
                   {isLeftElementVisible && left}
-                  {right}
+
+                  {isRightElementVisible && right}
                 </>
               ),
             })
           )}
+
+          {isRightAddonVisible && right}
         </div>
       </InputGroupContext.Provider>
     )
diff --git a/packages/components/input/src/InputLeftAddon.tsx b/packages/components/input/src/InputLeftAddon.tsx
index 9eb0ee1be..6d03155d9 100644
--- a/packages/components/input/src/InputLeftAddon.tsx
+++ b/packages/components/input/src/InputLeftAddon.tsx
@@ -7,7 +7,7 @@ export type InputLeftAddonProps = InputAddonProps
 
 export const InputLeftAddon = forwardRef<HTMLDivElement, InputLeftAddonProps>(
   ({ className, ...others }, ref) => {
-    return <InputAddon ref={ref} className={cx(className, 'pl-lg')} {...others} />
+    return <InputAddon ref={ref} className={cx(className, 'pl-lg rounded-l-lg')} {...others} />
   }
 )
 
diff --git a/packages/components/input/src/InputRightAddon.tsx b/packages/components/input/src/InputRightAddon.tsx
index 47a61bffc..9fb4f3977 100644
--- a/packages/components/input/src/InputRightAddon.tsx
+++ b/packages/components/input/src/InputRightAddon.tsx
@@ -7,7 +7,7 @@ export type InputRightAddonProps = InputAddonProps
 
 export const InputRightAddon = forwardRef<HTMLDivElement, InputRightAddonProps>(
   ({ className, ...others }, ref) => {
-    return <InputAddon ref={ref} className={cx(className, 'pr-lg')} {...others} />
+    return <InputAddon ref={ref} className={cx(className, 'pr-lg rounded-r-lg')} {...others} />
   }
 )