diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/workflow-mcp-servers/workflow-mcp-servers.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/workflow-mcp-servers/workflow-mcp-servers.tsx
index c0bbd87f022..62348517213 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/workflow-mcp-servers/workflow-mcp-servers.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/workflow-mcp-servers/workflow-mcp-servers.tsx
@@ -18,6 +18,7 @@ import {
   ChipSelect,
   Code,
   type ComboboxOption,
+  FieldCard,
   Label,
   useCopyToClipboard,
 } from '@sim/emcn'
@@ -713,36 +714,29 @@ function ServerDetailView({
                 return hasParams ? (
                   <div className='flex flex-col gap-2'>
                     {Object.entries(properties).map(([name, prop]) => (
-                      <div
+                      <FieldCard
                         key={name}
-                        className='overflow-hidden rounded-sm border border-[var(--border-1)]'
+                        title={name}
+                        badge={
+                          <Badge variant='type' size='sm'>
+                            {prop.type || 'any'}
+                          </Badge>
+                        }
                       >
-                        <div className='flex items-center justify-between bg-[var(--surface-4)] px-2.5 py-[5px]'>
-                          <div className='flex min-w-0 flex-1 items-center gap-2'>
-                            <span className='block truncate text-[var(--text-tertiary)] text-base'>
-                              {name}
-                            </span>
-                            <Badge variant='type' size='sm'>
-                              {prop.type || 'any'}
-                            </Badge>
-                          </div>
-                        </div>
-                        <div className='rounded-b-[4px] border-[var(--border-1)] border-t bg-[var(--surface-2)] px-2.5 pt-1.5 pb-2.5'>
-                          <div className='flex flex-col gap-1.5'>
-                            <Label>Description</Label>
-                            <ChipInput
-                              value={editingParameterDescriptions[name] || ''}
-                              onChange={(e) =>
-                                setEditingParameterDescriptions((prev) => ({
-                                  ...prev,
-                                  [name]: e.target.value,
-                                }))
-                              }
-                              placeholder={`Enter description for ${name}`}
-                            />
-                          </div>
+                        <div className='flex flex-col gap-1.5'>
+                          <Label>Description</Label>
+                          <ChipInput
+                            value={editingParameterDescriptions[name] || ''}
+                            onChange={(e) =>
+                              setEditingParameterDescriptions((prev) => ({
+                                ...prev,
+                                [name]: e.target.value,
+                              }))
+                            }
+                            placeholder={`Enter description for ${name}`}
+                          />
                         </div>
-                      </div>
+                      </FieldCard>
                     ))}
                   </div>
                 ) : (
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/api-info-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/api-info-modal.tsx
index 7a21bfd9882..255f810eb13 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/api-info-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/api-info-modal.tsx
@@ -13,6 +13,7 @@ import {
   ChipModalField,
   ChipModalFooter,
   ChipModalHeader,
+  FieldCard,
   Label,
 } from '@sim/emcn'
 import { getErrorMessage } from '@sim/utils/errors'
@@ -237,31 +238,24 @@ export function ApiInfoModal({ open, onOpenChange, workflowId }: ApiInfoModalPro
             <ChipModalField type='custom' title={`Parameters (${inputFormat.length})`}>
               <div className='flex flex-col gap-2'>
                 {inputFormat.map((field) => (
-                  <div
+                  <FieldCard
                     key={field.name}
-                    className='overflow-hidden rounded-sm border border-[var(--border-1)]'
+                    title={field.name}
+                    badge={
+                      <Badge variant='type' size='sm'>
+                        {field.type || 'string'}
+                      </Badge>
+                    }
                   >
-                    <div className='flex items-center justify-between bg-[var(--surface-4)] px-2.5 py-[5px]'>
-                      <div className='flex min-w-0 flex-1 items-center gap-2'>
-                        <span className='block truncate text-[var(--text-tertiary)] text-sm'>
-                          {field.name}
-                        </span>
-                        <Badge variant='type' size='sm'>
-                          {field.type || 'string'}
-                        </Badge>
-                      </div>
+                    <div className='flex flex-col gap-1.5'>
+                      <Label className='text-small'>Description</Label>
+                      <ChipInput
+                        value={paramDescriptions[field.name] || ''}
+                        onChange={(e) => handleParamDescriptionChange(field.name, e.target.value)}
+                        placeholder={`Enter description for ${field.name}`}
+                      />
                     </div>
-                    <div className='rounded-b-[4px] border-[var(--border-1)] border-t bg-[var(--surface-2)] px-2.5 pt-1.5 pb-2.5'>
-                      <div className='flex flex-col gap-1.5'>
-                        <Label className='text-small'>Description</Label>
-                        <ChipInput
-                          value={paramDescriptions[field.name] || ''}
-                          onChange={(e) => handleParamDescriptionChange(field.name, e.target.value)}
-                          placeholder={`Enter description for ${field.name}`}
-                        />
-                      </div>
-                    </div>
-                  </div>
+                  </FieldCard>
                 ))}
               </div>
             </ChipModalField>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/mcp/mcp.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/mcp/mcp.tsx
index b02d1cc1606..353ed8aad66 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/mcp/mcp.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/mcp/mcp.tsx
@@ -8,6 +8,7 @@ import {
   ChipInput,
   ChipModalField,
   type ComboboxOption,
+  FieldCard,
   Skeleton,
 } from '@sim/emcn'
 import { createLogger } from '@sim/logger'
@@ -578,38 +579,31 @@ export function McpDeploy({
           </p>
           <div className='flex flex-col gap-2'>
             {inputFormat.map((field) => (
-              <div
+              <FieldCard
                 key={field.name}
-                className='overflow-hidden rounded-sm border border-[var(--border-1)]'
+                title={field.name}
+                badge={
+                  <Badge variant='type' size='sm'>
+                    {field.type}
+                  </Badge>
+                }
               >
-                <div className='flex items-center justify-between bg-[var(--surface-4)] px-2.5 py-[5px]'>
-                  <div className='flex min-w-0 flex-1 items-center gap-2'>
-                    <span className='block truncate text-[var(--text-tertiary)] text-sm'>
-                      {field.name}
-                    </span>
-                    <Badge variant='type' size='sm'>
-                      {field.type}
-                    </Badge>
-                  </div>
-                </div>
-                <div className='rounded-b-[4px] border-[var(--border-1)] border-t bg-[var(--surface-2)] px-2.5 pt-1.5 pb-2.5'>
-                  <ChipModalField
-                    type='input'
-                    title='Description'
-                    flush
-                    value={
-                      parameterDescriptions[field.name] ?? startBlockDescriptions[field.name] ?? ''
-                    }
-                    onChange={(value) =>
-                      setParameterDescriptions((prev) => ({
-                        ...prev,
-                        [field.name]: value,
-                      }))
-                    }
-                    placeholder={startBlockDescriptions[field.name] || `Describe ${field.name}`}
-                  />
-                </div>
-              </div>
+                <ChipModalField
+                  type='input'
+                  title='Description'
+                  flush
+                  value={
+                    parameterDescriptions[field.name] ?? startBlockDescriptions[field.name] ?? ''
+                  }
+                  onChange={(value) =>
+                    setParameterDescriptions((prev) => ({
+                      ...prev,
+                      [field.name]: value,
+                    }))
+                  }
+                  placeholder={startBlockDescriptions[field.name] || `Describe ${field.name}`}
+                />
+              </FieldCard>
             ))}
           </div>
         </ChipModalField>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
index 41fccf4943f..dede5811704 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
@@ -969,7 +969,7 @@ export function ConditionInput({
                         disabled ||
                         (!isRouterMode && isElseConditionTitle(block.title))
                       }
-                      className='h-auto p-0'
+                      size='icon'
                     >
                       <Plus className='size-[14px]' />
                       <span className='sr-only'>Add Block</span>
@@ -989,7 +989,7 @@ export function ConditionInput({
                         disabled ||
                         (!isRouterMode && isElseConditionTitle(block.title))
                       }
-                      className='h-auto p-0'
+                      size='icon'
                     >
                       <ChevronUp className='size-[14px]' />
                       <span className='sr-only'>Move Up</span>
@@ -1011,7 +1011,7 @@ export function ConditionInput({
                           isElseConditionTitle(conditionalBlocks[index + 1]?.title)) ||
                         (!isRouterMode && isElseConditionTitle(block.title))
                       }
-                      className='h-auto p-0'
+                      size='icon'
                     >
                       <ChevronDown className='size-[14px]' />
                       <span className='sr-only'>Move Down</span>
@@ -1028,7 +1028,7 @@ export function ConditionInput({
                       disabled={
                         isPreview || disabled || conditionalBlocks.length <= (isRouterMode ? 1 : 2)
                       }
-                      className='h-auto p-0'
+                      size='icon'
                     >
                       <Trash className='size-[14px]' />
                       <span className='sr-only'>Delete Block</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
index 7023aa4f226..9decc0cce59 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
@@ -257,12 +257,7 @@ export function DocumentTagEntry({
 
   const renderActions = (tag: DocumentTag) => (
     <>
-      <Button
-        variant='ghost'
-        onClick={addTag}
-        disabled={isReadOnly || !canAddMoreTags}
-        className='h-auto p-0'
-      >
+      <Button variant='ghost' onClick={addTag} disabled={isReadOnly || !canAddMoreTags} size='icon'>
         <Plus className='size-[14px]' />
         <span className='sr-only'>Add Tag</span>
       </Button>
@@ -270,7 +265,7 @@ export function DocumentTagEntry({
         variant='ghost-destructive'
         onClick={() => removeTag(tag.id)}
         disabled={isReadOnly}
-        className='h-auto p-0'
+        size='icon'
       >
         <Trash className='size-[14px]' />
         <span className='sr-only'>Delete Tag</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
index 652f79b6e3a..a8c87277a31 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
@@ -147,7 +147,7 @@ export function EvalInput({
               variant='ghost'
               onClick={addMetric}
               disabled={isPreview || disabled}
-              className='h-auto p-0'
+              size='icon'
             >
               <Plus className='size-[14px]' />
               <span className='sr-only'>Add Metric</span>
@@ -162,7 +162,7 @@ export function EvalInput({
               variant='ghost-destructive'
               onClick={() => removeMetric(metric.id)}
               disabled={isPreview || disabled || metrics.length === 1}
-              className='h-auto p-0'
+              size='icon'
             >
               <Trash className='size-[14px]' />
               <span className='sr-only'>Delete Metric</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/field-mode-toggle/field-mode-toggle.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/field-mode-toggle/field-mode-toggle.tsx
new file mode 100644
index 00000000000..e7916f529d2
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/field-mode-toggle/field-mode-toggle.tsx
@@ -0,0 +1,37 @@
+import type { ButtonHTMLAttributes } from 'react'
+import { cn, Tooltip } from '@sim/emcn'
+import { ArrowLeftRight } from '@sim/emcn/icons'
+
+interface FieldModeToggleProps {
+  label: string
+  active: boolean
+  disabled?: boolean
+  onClick: ButtonHTMLAttributes<HTMLButtonElement>['onClick']
+}
+
+/** Shared field-mode affordance; the caller owns the mode and its stored values. */
+export function FieldModeToggle({ label, active, disabled, onClick }: FieldModeToggleProps) {
+  return (
+    <Tooltip.Root>
+      <Tooltip.Trigger asChild>
+        <button
+          type='button'
+          className='flex size-[12px] shrink-0 items-center justify-center bg-transparent p-0 focus-visible:ring-2 focus-visible:ring-[color-mix(in_srgb,var(--text-muted)_30%,transparent)] focus-visible:ring-offset-2 focus-visible:ring-offset-[var(--surface-2)] disabled:cursor-not-allowed disabled:opacity-50'
+          onClick={onClick}
+          disabled={disabled}
+          aria-label={label}
+        >
+          <ArrowLeftRight
+            className={cn(
+              'size-[12px]! transition-colors',
+              active ? 'text-[var(--text-primary)]' : 'text-[var(--text-secondary)]'
+            )}
+          />
+        </button>
+      </Tooltip.Trigger>
+      <Tooltip.Content side='top'>
+        <p>{label}</p>
+      </Tooltip.Content>
+    </Tooltip.Root>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx
index 7e0e4375b3b..33a1fc95fc7 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx
@@ -129,7 +129,7 @@ export function FilterRuleRow({
 
   const renderActions = () => (
     <>
-      <Button variant='ghost' onClick={onAdd} disabled={isReadOnly} className='h-auto p-0'>
+      <Button variant='ghost' onClick={onAdd} disabled={isReadOnly} size='icon'>
         <Plus className='size-[14px]' />
         <span className='sr-only'>Add Condition</span>
       </Button>
@@ -137,7 +137,7 @@ export function FilterRuleRow({
         variant='ghost-destructive'
         onClick={() => onRemove(rule.id)}
         disabled={isReadOnly}
-        className='h-auto p-0'
+        size='icon'
       >
         <Trash className='size-[14px]' />
         <span className='sr-only'>Delete Condition</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
index dc4e6b62c34..0621ae5171b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
@@ -257,7 +257,7 @@ export function KnowledgeTagFilters({
           addFilter()
         }}
         disabled={isReadOnly}
-        className='h-auto p-0'
+        size='icon'
       >
         <Plus className='size-[14px]' />
         <span className='sr-only'>Add Filter</span>
@@ -269,7 +269,7 @@ export function KnowledgeTagFilters({
           removeFilter(filter.id)
         }}
         disabled={isReadOnly}
-        className='h-auto p-0'
+        size='icon'
       >
         <Trash className='size-[14px]' />
         <span className='sr-only'>Delete Filter</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
index 3130bf0f9ca..c94d01c12d9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
@@ -263,7 +263,8 @@ export function SelectorCombobox({
                 <Button
                   type='button'
                   variant='ghost'
-                  className='h-auto shrink-0 p-0'
+                  size='icon'
+                  className='shrink-0'
                   disabled={disabled || readOnly}
                   aria-label={`Remove ${optionMap.get(id)?.label ?? id}`}
                   onClick={() => handleMultiChange(selectedValues.filter((v) => v !== id))}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx
index d831a90a785..5d6d1208ce9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx
@@ -88,7 +88,7 @@ export function SortRuleRow({
 
   const renderActions = () => (
     <>
-      <Button variant='ghost' onClick={onAdd} disabled={isReadOnly} className='h-auto p-0'>
+      <Button variant='ghost' onClick={onAdd} disabled={isReadOnly} size='icon'>
         <Plus className='size-[14px]' />
         <span className='sr-only'>Add Sort</span>
       </Button>
@@ -96,7 +96,7 @@ export function SortRuleRow({
         variant='ghost-destructive'
         onClick={() => onRemove(rule.id)}
         disabled={isReadOnly}
-        className='h-auto p-0'
+        size='icon'
       >
         <Trash className='size-[14px]' />
         <span className='sr-only'>Delete Sort</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
index c23c18ba66c..a949d97a61b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
@@ -14,15 +14,15 @@ import {
   Label,
   languages,
   OverflowText,
-  Tooltip,
 } from '@sim/emcn'
-import { ArrowLeftRight, Plus, Trash } from '@sim/emcn/icons'
+import { Plus, Trash } from '@sim/emcn/icons'
 import Editor from 'react-simple-code-editor'
 import {
   createDefaultInputFormatField,
   isFileFieldType,
   parseInputFormatFiles,
 } from '@/lib/workflows/input-format'
+import { FieldModeToggle } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/field-mode-toggle/field-mode-toggle'
 import { FileUpload } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import {
@@ -166,32 +166,17 @@ export function FieldFormat({
     if (!canUseUploader) return null
     const label = mode === 'upload' ? 'Switch to JSON' : 'Switch to file uploader'
     return (
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          <button
-            type='button'
-            className='flex size-[12px] shrink-0 items-center justify-center bg-transparent p-0 disabled:cursor-not-allowed disabled:opacity-50'
-            onClick={() =>
-              setFileFieldModes((prev) => ({
-                ...prev,
-                [field.id]: mode === 'upload' ? 'json' : 'upload',
-              }))
-            }
-            disabled={isReadOnly}
-            aria-label={label}
-          >
-            <ArrowLeftRight
-              className={cn(
-                'h-[12px]! w-[12px]!',
-                mode === 'json' ? 'text-[var(--text-primary)]' : 'text-[var(--text-secondary)]'
-              )}
-            />
-          </button>
-        </Tooltip.Trigger>
-        <Tooltip.Content side='top'>
-          <p>{label}</p>
-        </Tooltip.Content>
-      </Tooltip.Root>
+      <FieldModeToggle
+        active={mode === 'json'}
+        label={label}
+        disabled={isReadOnly}
+        onClick={() =>
+          setFileFieldModes((prev) => ({
+            ...prev,
+            [field.id]: mode === 'upload' ? 'json' : 'upload',
+          }))
+        }
+      />
     )
   }
 
@@ -647,12 +632,7 @@ export function FieldFormat({
           animated
           actions={
             <>
-              <Button
-                variant='ghost'
-                onClick={addField}
-                disabled={isReadOnly}
-                className='h-auto p-0'
-              >
+              <Button variant='ghost' onClick={addField} disabled={isReadOnly} size='icon'>
                 <Plus className='size-[14px]' />
                 <span className='sr-only'>Add {title}</span>
               </Button>
@@ -660,7 +640,8 @@ export function FieldFormat({
                 variant='ghost-destructive'
                 onClick={() => removeField(field.id)}
                 disabled={isReadOnly}
-                className='h-auto p-0 hover-hover:opacity-90'
+                size='icon'
+                className='hover-hover:opacity-90'
               >
                 <Trash className='size-[14px]' />
                 <span className='sr-only'>Delete Field</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tools/usage-control.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tools/usage-control.tsx
index e79ab62abcd..684602b559c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tools/usage-control.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tools/usage-control.tsx
@@ -1,7 +1,7 @@
-import { Combobox, cn, Label, Tooltip } from '@sim/emcn'
-import { ArrowLeftRight } from '@sim/emcn/icons'
+import { Combobox, Label } from '@sim/emcn'
 import type { CanonicalMode } from '@/lib/workflows/subblocks/visibility'
 import type { StoredTool } from '@/lib/workflows/tool-input/types'
+import { FieldModeToggle } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/field-mode-toggle/field-mode-toggle'
 import { ShortInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input'
 import type { SubBlockConfig } from '@/blocks/types'
 
@@ -63,29 +63,12 @@ export function ToolUsageControl({
       <div className='flex items-center justify-between gap-1.5 pl-0.5'>
         <Label className='flex items-baseline gap-1.5 whitespace-nowrap'>Permission Mode</Label>
         <div className='flex min-w-0 flex-1 items-center justify-end gap-1.5'>
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <button
-                type='button'
-                className='flex size-[12px] shrink-0 items-center justify-center bg-transparent p-0 disabled:cursor-not-allowed disabled:opacity-50'
-                onClick={onModeToggle}
-                disabled={disabled}
-                aria-label={toggleLabel}
-              >
-                <ArrowLeftRight
-                  className={cn(
-                    'size-[12px]!',
-                    mode === 'advanced'
-                      ? 'text-[var(--text-primary)]'
-                      : 'text-[var(--text-secondary)]'
-                  )}
-                />
-              </button>
-            </Tooltip.Trigger>
-            <Tooltip.Content side='top'>
-              <p>{toggleLabel}</p>
-            </Tooltip.Content>
-          </Tooltip.Root>
+          <FieldModeToggle
+            active={mode === 'advanced'}
+            label={toggleLabel}
+            onClick={onModeToggle}
+            disabled={disabled}
+          />
         </div>
       </div>
       {mode === 'advanced' ? (
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
index 85da29e76f4..84b832a7cbb 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
@@ -10,11 +10,11 @@ import {
   Label,
   OverflowText,
   Textarea,
-  Tooltip,
 } from '@sim/emcn'
-import { ArrowLeftRight, FileText, Plus, Trash } from '@sim/emcn/icons'
+import { FileText, Plus, Trash } from '@sim/emcn/icons'
 import { generateId } from '@sim/utils/id'
 import { useParams } from 'next/navigation'
+import { FieldModeToggle } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/field-mode-toggle/field-mode-toggle'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import {
   checkTagTrigger,
@@ -416,7 +416,7 @@ export function VariablesInput({
                         addAssignment()
                       }}
                       disabled={isReadOnly || allVariablesAssigned}
-                      className='h-auto p-0'
+                      size='icon'
                     >
                       <Plus className='size-[14px]' />
                       <span className='sr-only'>Add Variable</span>
@@ -428,7 +428,7 @@ export function VariablesInput({
                         removeAssignment(assignment.id)
                       }}
                       disabled={isReadOnly}
-                      className='h-auto p-0'
+                      size='icon'
                     >
                       <Trash className='size-[14px]' />
                       <span className='sr-only'>Delete Variable</span>
@@ -460,36 +460,17 @@ export function VariablesInput({
                   <div className='flex items-center justify-between'>
                     <Label className='text-small'>Value</Label>
                     {assignment.type === 'boolean' && (
-                      <Tooltip.Root>
-                        <Tooltip.Trigger asChild>
-                          <button
-                            type='button'
-                            className='flex size-[12px] shrink-0 items-center justify-center bg-transparent p-0 disabled:cursor-not-allowed disabled:opacity-50'
-                            onClick={() =>
-                              setManualBooleanModes((prev) => ({
-                                ...prev,
-                                [assignment.id]: !isManualBoolean,
-                              }))
-                            }
-                            disabled={isReadOnly}
-                            aria-label={
-                              isManualBoolean ? 'Switch to selector' : 'Switch to manual value'
-                            }
-                          >
-                            <ArrowLeftRight
-                              className={cn(
-                                'h-[12px]! w-[12px]!',
-                                isManualBoolean
-                                  ? 'text-[var(--text-primary)]'
-                                  : 'text-[var(--text-secondary)]'
-                              )}
-                            />
-                          </button>
-                        </Tooltip.Trigger>
-                        <Tooltip.Content side='top'>
-                          <p>{isManualBoolean ? 'Switch to selector' : 'Switch to manual value'}</p>
-                        </Tooltip.Content>
-                      </Tooltip.Root>
+                      <FieldModeToggle
+                        active={isManualBoolean}
+                        label={isManualBoolean ? 'Switch to selector' : 'Switch to manual value'}
+                        disabled={isReadOnly}
+                        onClick={() =>
+                          setManualBooleanModes((prev) => ({
+                            ...prev,
+                            [assignment.id]: !isManualBoolean,
+                          }))
+                        }
+                      />
                     )}
                   </div>
                   {assignment.type === 'boolean' && !isManualBoolean ? (
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
index 4795928d1c6..88bb88e2ace 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
@@ -1,13 +1,6 @@
 import { type JSX, type MouseEvent, memo, useCallback, useMemo, useRef, useState } from 'react'
 import { Button, cn, Input, Label, Tooltip } from '@sim/emcn'
-import {
-  ArrowLeftRight,
-  ArrowUp,
-  Check,
-  Clipboard,
-  SquareArrowUpRight,
-  TriangleAlert,
-} from '@sim/emcn/icons'
+import { ArrowUp, Check, Clipboard, SquareArrowUpRight, TriangleAlert } from '@sim/emcn/icons'
 import { isEqual } from 'es-toolkit'
 import { useParams } from 'next/navigation'
 import type { FilterRule, SortRule } from '@/lib/table/query-builder/constants'
@@ -54,6 +47,7 @@ import {
   WorkflowSelectorInput,
   WorkspaceFolderSelector,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components'
+import { FieldModeToggle } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/field-mode-toggle/field-mode-toggle'
 import { MODAL_REGISTRY } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/modal-registry'
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import type { SubBlockConfig } from '@/blocks/types'
@@ -377,37 +371,14 @@ const renderLabel = (
           </Tooltip.Root>
         )}
         {showCanonicalToggle && (
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <button
-                type='button'
-                className='flex size-[12px] shrink-0 items-center justify-center bg-transparent p-0 disabled:cursor-not-allowed disabled:opacity-50'
-                onClick={canonicalToggle?.onToggle}
-                disabled={canonicalToggleDisabledResolved}
-                aria-label={
-                  canonicalToggle?.mode === 'advanced'
-                    ? 'Switch to selector'
-                    : 'Switch to manual ID'
-                }
-              >
-                <ArrowLeftRight
-                  className={cn(
-                    'h-[12px]! w-[12px]!',
-                    canonicalToggle?.mode === 'advanced'
-                      ? 'text-[var(--text-primary)]'
-                      : 'text-[var(--text-secondary)]'
-                  )}
-                />
-              </button>
-            </Tooltip.Trigger>
-            <Tooltip.Content side='top'>
-              <p>
-                {canonicalToggle?.mode === 'advanced'
-                  ? 'Switch to selector'
-                  : 'Switch to manual ID'}
-              </p>
-            </Tooltip.Content>
-          </Tooltip.Root>
+          <FieldModeToggle
+            active={canonicalToggle?.mode === 'advanced'}
+            label={
+              canonicalToggle?.mode === 'advanced' ? 'Switch to selector' : 'Switch to manual ID'
+            }
+            disabled={canonicalToggleDisabledResolved}
+            onClick={canonicalToggle?.onToggle}
+          />
         )}
       </div>
     </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx
index 61ca1967060..a836389a65b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx
@@ -457,7 +457,7 @@ export function Variables({ readOnly = false }: VariablesProps) {
                         e.stopPropagation()
                         handleRemoveVariable(variable.id)
                       }}
-                      className='h-auto p-0'
+                      size='icon'
                       disabled={readOnly}
                       aria-label={`Delete ${variable.name || `variable ${index + 1}`}`}
                     >
diff --git a/packages/emcn/src/components/collapsible-card/collapsible-card.test.tsx b/packages/emcn/src/components/collapsible-card/collapsible-card.test.tsx
index 2a46d78eaef..a61dba4b2eb 100644
--- a/packages/emcn/src/components/collapsible-card/collapsible-card.test.tsx
+++ b/packages/emcn/src/components/collapsible-card/collapsible-card.test.tsx
@@ -1,6 +1,6 @@
 /** @vitest-environment jsdom */
 import { act, type ReactNode, useState } from 'react'
-import { CollapsibleCard } from '@sim/emcn'
+import { CollapsibleCard, FieldCard } from '@sim/emcn'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
@@ -103,3 +103,19 @@ describe('CollapsibleCard', () => {
     expect(parentClick).not.toHaveBeenCalled()
   })
 })
+
+it('keeps static FieldCard content visible without a collapse target', () => {
+  mount(
+    <FieldCard title='query' badge={<span>string</span>} data-field='query'>
+      <input aria-label='Description' defaultValue='Search terms' />
+    </FieldCard>
+  )
+  const card = container!.querySelector('[data-field="query"]')!
+  const input = card.querySelector('input')!
+  expect(card.textContent).toContain('query')
+  expect(card.textContent).toContain('string')
+  expect(card.querySelector('[role="button"], button, [aria-expanded]')).toBeNull()
+  act(() => card.querySelector<HTMLElement>('[data-overflow-text]')!.click())
+  expect(card.querySelector('input')).toBe(input)
+  expect(input.value).toBe('Search terms')
+})
diff --git a/packages/emcn/src/components/collapsible-card/collapsible-card.tsx b/packages/emcn/src/components/collapsible-card/collapsible-card.tsx
index a2e9a640c68..9104661a7ea 100644
--- a/packages/emcn/src/components/collapsible-card/collapsible-card.tsx
+++ b/packages/emcn/src/components/collapsible-card/collapsible-card.tsx
@@ -4,6 +4,7 @@ import type * as React from 'react'
 import { cn } from '../../lib/cn'
 import { handleKeyboardActivation } from '../../lib/keyboard'
 import { Expandable, ExpandableContent } from '../expandable/expandable'
+import { FieldCardContent, FieldCardFrame } from '../field-card/field-card'
 import { OverflowText, overflowTextClipClass } from '../overflow-text/overflow-text'
 
 export interface CollapsibleCardProps
@@ -28,6 +29,7 @@ export interface CollapsibleCardProps
  * A collapsible field card: a `--surface-4` header (click / keyboard to toggle)
  * with a fade-clipped title + optional badge, over a `--surface-2` body. Shared by
  * the workflow input-mapping rows and the enrichment output-column config.
+ * Its frame and body are also used by the always-open FieldCard.
  *
  * @example
  * <CollapsibleCard title='Condition' collapsed={collapsed} onToggleCollapse={toggle}
@@ -47,67 +49,55 @@ export function CollapsibleCard({
   className,
   ...props
 }: CollapsibleCardProps) {
-  const content = (
-    <div
-      {...contentProps}
-      className={cn(
-        'flex flex-col gap-2 rounded-b-[4px] border-[var(--border-1)] border-t bg-[var(--surface-2)] px-2.5 pt-1.5 pb-2.5',
-        contentProps?.className
-      )}
-    >
-      {children}
-    </div>
-  )
+  const content = <FieldCardContent {...contentProps}>{children}</FieldCardContent>
   return (
-    <div
+    <FieldCardFrame
       {...props}
-      className={cn(
-        'rounded-sm border border-[var(--border-1)]',
-        collapsed ? 'overflow-hidden' : 'overflow-visible',
-        className
-      )}
-    >
-      <div className='flex items-center justify-between rounded-t-[4px] bg-[var(--surface-4)]'>
-        <div
-          role='button'
-          tabIndex={0}
-          aria-expanded={!collapsed}
-          aria-controls={contentProps?.id}
-          className={cn(
-            'flex min-w-0 flex-1 cursor-pointer items-center gap-2 px-2.5 py-[5px]',
-            actions && 'pr-2'
-          )}
-          onClick={onToggleCollapse}
-          onKeyDown={(event) => {
-            if (event.target !== event.currentTarget) return
-            handleKeyboardActivation(event, onToggleCollapse)
-          }}
-        >
-          {typeof title === 'string' || typeof title === 'number' ? (
-            <OverflowText
-              label={String(title)}
-              className='flex-1 text-[var(--text-tertiary)] text-sm'
-              focusTarget='nearest-interactive'
-            />
-          ) : (
-            <span
-              className={cn(overflowTextClipClass, 'flex-1 text-[var(--text-tertiary)] text-sm')}
-            >
-              {title}
-            </span>
-          )}
-          {badge}
-        </div>
-        {actions && (
+      className={cn(collapsed ? 'overflow-hidden' : 'overflow-visible', className)}
+      header={
+        <>
           <div
-            role='presentation'
-            className='flex shrink-0 items-center gap-2 py-[5px] pr-2.5'
-            onClick={(event) => event.stopPropagation()}
+            role='button'
+            tabIndex={0}
+            aria-expanded={!collapsed}
+            aria-controls={contentProps?.id}
+            className={cn(
+              'flex min-w-0 flex-1 cursor-pointer items-center gap-2 px-2.5 py-[5px]',
+              actions && 'pr-2'
+            )}
+            onClick={onToggleCollapse}
+            onKeyDown={(event) => {
+              if (event.target !== event.currentTarget) return
+              handleKeyboardActivation(event, onToggleCollapse)
+            }}
           >
-            {actions}
+            {typeof title === 'string' || typeof title === 'number' ? (
+              <OverflowText
+                label={String(title)}
+                className='flex-1 text-[var(--text-tertiary)] text-sm'
+                focusTarget='nearest-interactive'
+              />
+            ) : (
+              <span
+                className={cn(overflowTextClipClass, 'flex-1 text-[var(--text-tertiary)] text-sm')}
+              >
+                {title}
+              </span>
+            )}
+            {badge}
           </div>
-        )}
-      </div>
+          {actions && (
+            <div
+              role='presentation'
+              className='flex shrink-0 items-center gap-2 py-[5px] pr-2.5'
+              onClick={(event) => event.stopPropagation()}
+            >
+              {actions}
+            </div>
+          )}
+        </>
+      }
+    >
       {animated ? (
         <Expandable expanded={!collapsed}>
           <ExpandableContent>{content}</ExpandableContent>
@@ -115,6 +105,6 @@ export function CollapsibleCard({
       ) : (
         !collapsed && content
       )}
-    </div>
+    </FieldCardFrame>
   )
 }
diff --git a/packages/emcn/src/components/field-card/field-card.tsx b/packages/emcn/src/components/field-card/field-card.tsx
new file mode 100644
index 00000000000..c5f05745635
--- /dev/null
+++ b/packages/emcn/src/components/field-card/field-card.tsx
@@ -0,0 +1,74 @@
+import type * as React from 'react'
+import { cn } from '../../lib/cn'
+import { OverflowText, overflowTextClipClass } from '../overflow-text/overflow-text'
+
+export interface FieldCardProps
+  extends Omit<React.HTMLAttributes<HTMLDivElement>, 'title' | 'children'> {
+  /** Field name; plain text uses the standard fade and full-value tooltip. */
+  title: React.ReactNode
+  /** Optional content adjacent to the field name, such as a type badge. */
+  badge?: React.ReactNode
+  /** Always-visible field controls or description. */
+  children: React.ReactNode
+}
+
+interface FieldCardFrameProps extends React.HTMLAttributes<HTMLDivElement> {
+  header: React.ReactNode
+}
+
+/** Internal frame shared by static and collapsible field cards. */
+export function FieldCardFrame({ header, children, className, ...props }: FieldCardFrameProps) {
+  return (
+    <div {...props} className={cn('rounded-sm border border-[var(--border-1)]', className)}>
+      <div className='flex items-center justify-between rounded-t-[4px] bg-[var(--surface-4)]'>
+        {header}
+      </div>
+      {children}
+    </div>
+  )
+}
+
+/** Internal body shared by static and collapsible field cards. */
+export function FieldCardContent({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) {
+  return (
+    <div
+      {...props}
+      className={cn(
+        'flex flex-col gap-2 rounded-b-[4px] border-[var(--border-1)] border-t bg-[var(--surface-2)] px-2.5 pt-1.5 pb-2.5',
+        className
+      )}
+    />
+  )
+}
+
+/**
+ * An always-open field card with the same frame and body as CollapsibleCard.
+ * The header is a label, not a button; controls retain their own behavior.
+ *
+ * @example
+ * <FieldCard title='query' badge={<Badge variant='type' size='sm'>string</Badge>}>
+ *   {descriptionField}
+ * </FieldCard>
+ */
+export function FieldCard({ title, badge, children, className, ...props }: FieldCardProps) {
+  return (
+    <FieldCardFrame
+      {...props}
+      className={cn('overflow-hidden', className)}
+      header={
+        <div className='flex min-w-0 flex-1 items-center gap-2 px-2.5 py-[5px]'>
+          {typeof title === 'string' || typeof title === 'number' ? (
+            <OverflowText label={String(title)} className='text-[var(--text-tertiary)] text-sm' />
+          ) : (
+            <span className={cn(overflowTextClipClass, 'text-[var(--text-tertiary)] text-sm')}>
+              {title}
+            </span>
+          )}
+          {badge}
+        </div>
+      }
+    >
+      <FieldCardContent>{children}</FieldCardContent>
+    </FieldCardFrame>
+  )
+}
diff --git a/packages/emcn/src/components/index.ts b/packages/emcn/src/components/index.ts
index 6a5eb49c1ee..03e3015d6bd 100644
--- a/packages/emcn/src/components/index.ts
+++ b/packages/emcn/src/components/index.ts
@@ -148,6 +148,7 @@ export {
   dropdownMenuRowClass,
 } from './dropdown-menu/dropdown-menu'
 export { Expandable, ExpandableContent } from './expandable/expandable'
+export { FieldCard, type FieldCardProps } from './field-card/field-card'
 export { DashedDividerLine, FieldDivider } from './field-divider/field-divider'
 export { Info } from './info/info'
 export {