diff --git a/frontend/src/components/tools/addStamp/AddStampAutomationSettings.tsx b/frontend/src/components/tools/addStamp/AddStampAutomationSettings.tsx
new file mode 100644
index 0000000000..25091d854e
--- /dev/null
+++ b/frontend/src/components/tools/addStamp/AddStampAutomationSettings.tsx
@@ -0,0 +1,43 @@
+/**
+ * AddStampAutomationSettings - Used for automation only
+ *
+ * This component combines all stamp settings into a single step interface
+ * for use in the automation system. It includes setup and formatting
+ * settings in one unified component.
+ */
+
+import { Stack } from "@mantine/core";
+import { AddStampParameters } from "./useAddStampParameters";
+import StampSetupSettings from "./StampSetupSettings";
+import StampPositionFormattingSettings from "./StampPositionFormattingSettings";
+
+interface AddStampAutomationSettingsProps {
+  parameters: AddStampParameters;
+  onParameterChange: <K extends keyof AddStampParameters>(key: K, value: AddStampParameters[K]) => void;
+  disabled?: boolean;
+}
+
+const AddStampAutomationSettings = ({ parameters, onParameterChange, disabled = false }: AddStampAutomationSettingsProps) => {
+  return (
+    <Stack gap="lg">
+      {/* Stamp Setup (Type, Text/Image, Page Selection) */}
+      <StampSetupSettings
+        parameters={parameters}
+        onParameterChange={onParameterChange}
+        disabled={disabled}
+      />
+
+      {/* Position and Formatting Settings */}
+      {parameters.stampType && (
+        <StampPositionFormattingSettings
+          parameters={parameters}
+          onParameterChange={onParameterChange}
+          disabled={disabled}
+          showPositionGrid={true}
+        />
+      )}
+    </Stack>
+  );
+};
+
+export default AddStampAutomationSettings;
diff --git a/frontend/src/components/tools/addStamp/StampPositionFormattingSettings.tsx b/frontend/src/components/tools/addStamp/StampPositionFormattingSettings.tsx
new file mode 100644
index 0000000000..d1c0d0c9f2
--- /dev/null
+++ b/frontend/src/components/tools/addStamp/StampPositionFormattingSettings.tsx
@@ -0,0 +1,201 @@
+import { useTranslation } from "react-i18next";
+import { Group, Select, Stack, ColorInput, Button, Slider, Text, NumberInput } from "@mantine/core";
+import { AddStampParameters } from "./useAddStampParameters";
+import LocalIcon from "../../shared/LocalIcon";
+import styles from "./StampPreview.module.css";
+import { Tooltip } from "../../shared/Tooltip";
+
+interface StampPositionFormattingSettingsProps {
+  parameters: AddStampParameters;
+  onParameterChange: <K extends keyof AddStampParameters>(key: K, value: AddStampParameters[K]) => void;
+  disabled?: boolean;
+  showPositionGrid?: boolean; // When true, show the 9-position grid for automation
+}
+
+const StampPositionFormattingSettings = ({ parameters, onParameterChange, disabled = false, showPositionGrid = false }: StampPositionFormattingSettingsProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <Stack gap="md" justify="space-between">
+      {/* Position Grid - shown in automation settings */}
+      {showPositionGrid && (
+        <Stack gap="xs">
+          <Text size="sm" fw={500}>{t('AddStampRequest.position', 'Stamp Position')}</Text>
+          <div style={{
+            display: 'grid',
+            gridTemplateColumns: 'repeat(3, 1fr)',
+            gap: '0.5rem',
+            maxWidth: '200px'
+          }}>
+            {Array.from({ length: 9 }).map((_, i) => {
+              const idx = (i + 1) as 1|2|3|4|5|6|7|8|9;
+              const selected = parameters.position === idx;
+              return (
+                <Button
+                  key={idx}
+                  variant={selected ? 'filled' : 'outline'}
+                  onClick={() => {
+                    onParameterChange('position', idx);
+                    // Ensure we're using grid positioning, not custom overrides
+                    onParameterChange('overrideX', -1 as any);
+                    onParameterChange('overrideY', -1 as any);
+                  }}
+                  disabled={disabled}
+                  styles={{
+                    root: {
+                      height: '50px',
+                      padding: '0',
+                    }
+                  }}
+                >
+                  {idx}
+                </Button>
+              );
+            })}
+          </div>
+        </Stack>
+      )}
+      {/* Icon pill buttons row */}
+      <div className="flex justify-between gap-[0.5rem]">
+        <Tooltip content={t('AddStampRequest.rotation', 'Rotation')} position="top">
+          <Button
+            variant={parameters._activePill === 'rotation' ? 'filled' : 'outline'}
+            className="flex-1"
+            onClick={() => onParameterChange('_activePill', 'rotation')}
+          >
+            <LocalIcon icon="rotate-right-rounded" width="1.1rem" height="1.1rem" />
+          </Button>
+        </Tooltip>
+        <Tooltip content={t('AddStampRequest.opacity', 'Opacity')} position="top">
+          <Button
+            variant={parameters._activePill === 'opacity' ? 'filled' : 'outline'}
+            className="flex-1"
+            onClick={() => onParameterChange('_activePill', 'opacity')}
+          >
+            <LocalIcon icon="opacity" width="1.1rem" height="1.1rem" />
+          </Button>
+        </Tooltip>
+        <Tooltip content={parameters.stampType === 'image' ? t('AddStampRequest.imageSize', 'Image Size') : t('AddStampRequest.fontSize', 'Font Size')} position="top">
+          <Button
+            variant={parameters._activePill === 'fontSize' ? 'filled' : 'outline'}
+            className="flex-1"
+            onClick={() => onParameterChange('_activePill', 'fontSize')}
+          >
+            <LocalIcon icon="zoom-in-map-rounded" width="1.1rem" height="1.1rem" />
+          </Button>
+        </Tooltip>
+      </div>
+
+      {/* Single slider bound to selected pill */}
+      {parameters._activePill === 'fontSize' && (
+        <Stack gap="xs">
+          <Text className={styles.labelText}>
+            {parameters.stampType === 'image'
+              ? t('AddStampRequest.imageSize', 'Image Size')
+              : t('AddStampRequest.fontSize', 'Font Size')
+            }
+          </Text>
+          <Group className={styles.sliderGroup} align="center">
+            <NumberInput
+              value={parameters.fontSize}
+              onChange={(v) => onParameterChange('fontSize', typeof v === 'number' ? v : 1)}
+              min={1}
+              max={400}
+              step={1}
+              size="sm"
+              className={styles.numberInput}
+              disabled={disabled}
+            />
+            <Slider
+              value={parameters.fontSize}
+              onChange={(v) => onParameterChange('fontSize', v as number)}
+              min={1}
+              max={400}
+              step={1}
+              className={styles.slider}
+            />
+          </Group>
+        </Stack>
+      )}
+      {parameters._activePill === 'rotation' && (
+        <Stack gap="xs">
+          <Text className={styles.labelText}>{t('AddStampRequest.rotation', 'Rotation')}</Text>
+          <Group className={styles.sliderGroup} align="center">
+            <NumberInput
+              value={parameters.rotation}
+              onChange={(v) => onParameterChange('rotation', typeof v === 'number' ? v : 0)}
+              min={-180}
+              max={180}
+              step={1}
+              size="sm"
+              className={styles.numberInput}
+              hideControls
+              disabled={disabled}
+            />
+            <Slider
+              value={parameters.rotation}
+              onChange={(v) => onParameterChange('rotation', v as number)}
+              min={-180}
+              max={180}
+              step={1}
+              className={styles.sliderWide}
+            />
+          </Group>
+        </Stack>
+      )}
+      {parameters._activePill === 'opacity' && (
+        <Stack gap="xs">
+          <Text className={styles.labelText}>{t('AddStampRequest.opacity', 'Opacity')}</Text>
+          <Group className={styles.sliderGroup} align="center">
+            <NumberInput
+              value={parameters.opacity}
+              onChange={(v) => onParameterChange('opacity', typeof v === 'number' ? v : 0)}
+              min={0}
+              max={100}
+              step={1}
+              size="sm"
+              className={styles.numberInput}
+              disabled={disabled}
+            />
+            <Slider
+              value={parameters.opacity}
+              onChange={(v) => onParameterChange('opacity', v as number)}
+              min={0}
+              max={100}
+              step={1}
+              className={styles.slider}
+            />
+          </Group>
+        </Stack>
+      )}
+
+      {parameters.stampType !== 'image' && (
+        <ColorInput
+          label={t('AddStampRequest.customColor', 'Custom Text Color')}
+          value={parameters.customColor}
+          onChange={(value) => onParameterChange('customColor', value)}
+          format="hex"
+          disabled={disabled}
+        />
+      )}
+
+      {/* Margin selection for text stamps */}
+      {parameters.stampType === 'text' && (
+        <Select
+          label={t('AddStampRequest.margin', 'Margin')}
+          value={parameters.customMargin}
+          onChange={(v) => onParameterChange('customMargin', (v as any) || 'medium')}
+          data={[
+            { value: 'small', label: t('margin.small', 'Small') },
+            { value: 'medium', label: t('margin.medium', 'Medium') },
+            { value: 'large', label: t('margin.large', 'Large') },
+            { value: 'x-large', label: t('margin.xLarge', 'Extra Large') },
+          ]}
+          disabled={disabled}
+        />
+      )}
+    </Stack>
+  );
+};
+
+export default StampPositionFormattingSettings;
diff --git a/frontend/src/components/tools/addStamp/StampSetupSettings.tsx b/frontend/src/components/tools/addStamp/StampSetupSettings.tsx
new file mode 100644
index 0000000000..8d13073a52
--- /dev/null
+++ b/frontend/src/components/tools/addStamp/StampSetupSettings.tsx
@@ -0,0 +1,112 @@
+import { useTranslation } from "react-i18next";
+import { Stack, Textarea, TextInput, Select, Button, Text, Divider } from "@mantine/core";
+import { AddStampParameters } from "./useAddStampParameters";
+import ButtonSelector from "../../shared/ButtonSelector";
+import styles from "./StampPreview.module.css";
+import { getDefaultFontSizeForAlphabet } from "./StampPreviewUtils";
+
+interface StampSetupSettingsProps {
+  parameters: AddStampParameters;
+  onParameterChange: <K extends keyof AddStampParameters>(key: K, value: AddStampParameters[K]) => void;
+  disabled?: boolean;
+}
+
+const StampSetupSettings = ({ parameters, onParameterChange, disabled = false }: StampSetupSettingsProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <Stack gap="md">
+      <TextInput
+        label={t('pageSelectionPrompt', 'Page Selection (e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)')}
+        value={parameters.pageNumbers}
+        onChange={(e) => onParameterChange('pageNumbers', e.currentTarget.value)}
+        disabled={disabled}
+      />
+      <Divider/>
+      <div>
+        <Text size="sm" fw={500} mb="xs">{t('AddStampRequest.stampType', 'Stamp Type')}</Text>
+        <ButtonSelector
+          value={parameters.stampType}
+          onChange={(v: 'text' | 'image') => onParameterChange('stampType', v)}
+          options={[
+            { value: 'text', label: t('watermark.type.1', 'Text') },
+            { value: 'image', label: t('watermark.type.2', 'Image') },
+          ]}
+          disabled={disabled}
+          buttonClassName={styles.modeToggleButton}
+          textClassName={styles.modeToggleButtonText}
+        />
+      </div>
+
+      {parameters.stampType === 'text' && (
+        <>
+          <Textarea
+            label={t('AddStampRequest.stampText', 'Stamp Text')}
+            value={parameters.stampText}
+            onChange={(e) => onParameterChange('stampText', e.currentTarget.value)}
+            autosize
+            minRows={2}
+            disabled={disabled}
+          />
+          <Select
+            label={t('AddStampRequest.alphabet', 'Alphabet')}
+            value={parameters.alphabet}
+            onChange={(v) => {
+              const nextAlphabet = (v as any) || 'roman';
+              onParameterChange('alphabet', nextAlphabet);
+              const nextDefault = getDefaultFontSizeForAlphabet(nextAlphabet);
+              onParameterChange('fontSize', nextDefault);
+            }}
+            data={[
+              { value: 'roman', label: 'Roman' },
+              { value: 'arabic', label: 'العربية' },
+              { value: 'japanese', label: '日本語' },
+              { value: 'korean', label: '한국어' },
+              { value: 'chinese', label: '简体中文' },
+              { value: 'thai', label: 'ไทย' },
+            ]}
+            disabled={disabled}
+          />
+        </>
+      )}
+
+      {parameters.stampType === 'image' && (
+        <Stack gap="xs">
+          <input
+            type="file"
+            accept=".png,.jpg,.jpeg,.gif,.bmp,.tiff,.tif,.webp"
+            onChange={(e) => {
+              const file = e.target.files?.[0];
+              if (file) onParameterChange('stampImage', file);
+            }}
+            disabled={disabled}
+            style={{ display: 'none' }}
+            id="stamp-image-input"
+          />
+          <Button
+            size="xs"
+            component="label"
+            htmlFor="stamp-image-input"
+            disabled={disabled}
+          >
+            {t('chooseFile', 'Choose File')}
+          </Button>
+          {parameters.stampImage && (
+            <Stack gap="xs">
+              <img
+                src={URL.createObjectURL(parameters.stampImage)}
+                alt="Selected stamp image"
+                className="max-h-24 w-full object-contain border border-gray-200 rounded bg-gray-50"
+              />
+              <Text size="xs" c="dimmed">
+                {parameters.stampImage.name}
+              </Text>
+            </Stack>
+          )}
+        </Stack>
+      )}
+    </Stack>
+  );
+};
+
+export default StampSetupSettings;
diff --git a/frontend/src/components/tools/automate/ToolConfigurationModal.tsx b/frontend/src/components/tools/automate/ToolConfigurationModal.tsx
index 4fce30b3db..59ef0b3039 100644
--- a/frontend/src/components/tools/automate/ToolConfigurationModal.tsx
+++ b/frontend/src/components/tools/automate/ToolConfigurationModal.tsx
@@ -35,7 +35,7 @@ export default function ToolConfigurationModal({ opened, tool, onSave, onCancel,
 
   // Get tool info from registry
   const toolInfo = toolRegistry[tool.operation as keyof ToolRegistry];
-  const SettingsComponent = toolInfo?.settingsComponent;
+  const SettingsComponent = toolInfo?.automationSettings;
 
   // Initialize parameters from tool (which should contain defaults from registry)
   useEffect(() => {
diff --git a/frontend/src/components/tools/automate/ToolList.tsx b/frontend/src/components/tools/automate/ToolList.tsx
index a21fbdecfc..3cb2b7a7eb 100644
--- a/frontend/src/components/tools/automate/ToolList.tsx
+++ b/frontend/src/components/tools/automate/ToolList.tsx
@@ -34,11 +34,14 @@ export default function ToolList({
 
   const handleToolSelect = (index: number, newOperation: string) => {
     const defaultParams = getToolDefaultParameters(newOperation);
+    const toolEntry = toolRegistry[newOperation];
+    // If tool has no settingsComponent, it's automatically configured
+    const isConfigured = !toolEntry?.automationSettings;
 
     onToolUpdate(index, {
       operation: newOperation,
       name: getToolName(newOperation),
-      configured: false,
+      configured: isConfigured,
       parameters: defaultParams,
     });
   };
diff --git a/frontend/src/components/tools/automate/ToolSelector.tsx b/frontend/src/components/tools/automate/ToolSelector.tsx
index 02ebef0c9f..5cbc4b3ab4 100644
--- a/frontend/src/components/tools/automate/ToolSelector.tsx
+++ b/frontend/src/components/tools/automate/ToolSelector.tsx
@@ -1,7 +1,7 @@
 import { useState, useMemo, useCallback, useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Stack, Text, ScrollArea } from '@mantine/core';
-import { ToolRegistryEntry } from '../../../data/toolsTaxonomy';
+import { ToolRegistryEntry, getToolSupportsAutomate } from '../../../data/toolsTaxonomy';
 import { useToolSections } from '../../../hooks/useToolSections';
 import { renderToolButtons } from '../shared/renderToolButtons';
 import ToolSearch from '../toolPicker/ToolSearch';
@@ -28,9 +28,11 @@ export default function ToolSelector({
   const [shouldAutoFocus, setShouldAutoFocus] = useState(false);
   const containerRef = useRef<HTMLDivElement>(null);
 
-  // Filter out excluded tools (like 'automate' itself)
+  // Filter out excluded tools (like 'automate' itself) and tools that don't support automation
   const baseFilteredTools = useMemo(() => {
-    return Object.entries(toolRegistry).filter(([key]) => !excludeTools.includes(key));
+    return Object.entries(toolRegistry).filter(([key, tool]) =>
+      !excludeTools.includes(key) && getToolSupportsAutomate(tool)
+    );
   }, [toolRegistry, excludeTools]);
 
   // Apply search filter
diff --git a/frontend/src/data/toolsTaxonomy.ts b/frontend/src/data/toolsTaxonomy.ts
index dc95381284..79890dc6db 100644
--- a/frontend/src/data/toolsTaxonomy.ts
+++ b/frontend/src/data/toolsTaxonomy.ts
@@ -42,7 +42,9 @@ export type ToolRegistryEntry = {
 	// Operation configuration for automation
 	operationConfig?: ToolOperationConfig<any>;
 	// Settings component for automation configuration
-	settingsComponent?: React.ComponentType<any>;
+	automationSettings: React.ComponentType<any> | null;
+	// Whether this tool supports automation (defaults to true)
+	supportsAutomate?: boolean;
 	// Synonyms for search (optional)
 	synonyms?: string[];
 }
@@ -138,3 +140,10 @@ export const getToolUrlPath = (toolId: string): string => {
 export const isValidToolId = (toolId: string, registry: ToolRegistry): boolean => {
   return toolId in registry;
 };
+
+/**
+ * Check if a tool supports automation (defaults to true)
+ */
+export const getToolSupportsAutomate = (tool: ToolRegistryEntry): boolean => {
+  return tool.supportsAutomate !== false;
+};
diff --git a/frontend/src/data/useTranslatedToolRegistry.tsx b/frontend/src/data/useTranslatedToolRegistry.tsx
index 39d74ede5d..a37a354f59 100644
--- a/frontend/src/data/useTranslatedToolRegistry.tsx
+++ b/frontend/src/data/useTranslatedToolRegistry.tsx
@@ -66,8 +66,6 @@ import SplitSettings from "../components/tools/split/SplitSettings";
 import AddPasswordSettings from "../components/tools/addPassword/AddPasswordSettings";
 import RemovePasswordSettings from "../components/tools/removePassword/RemovePasswordSettings";
 import SanitizeSettings from "../components/tools/sanitize/SanitizeSettings";
-import RepairSettings from "../components/tools/repair/RepairSettings";
-import UnlockPdfFormsSettings from "../components/tools/unlockPdfForms/UnlockPdfFormsSettings";
 import AddWatermarkSingleStepSettings from "../components/tools/addWatermark/AddWatermarkSingleStepSettings";
 import OCRSettings from "../components/tools/ocr/OCRSettings";
 import ConvertSettings from "../components/tools/convert/ConvertSettings";
@@ -91,11 +89,11 @@ import ChangeMetadataSingleStep from "../components/tools/changeMetadata/ChangeM
 import SignSettings from "../components/tools/sign/SignSettings";
 import CropSettings from "../components/tools/crop/CropSettings";
 import RemoveAnnotations from "../tools/RemoveAnnotations";
-import RemoveAnnotationsSettings from "../components/tools/removeAnnotations/RemoveAnnotationsSettings";
 import PageLayoutSettings from "../components/tools/pageLayout/PageLayoutSettings";
 import ExtractImages from "../tools/ExtractImages";
 import ExtractImagesSettings from "../components/tools/extractImages/ExtractImagesSettings";
 import ReplaceColorSettings from "../components/tools/replaceColor/ReplaceColorSettings";
+import AddStampAutomationSettings from "../components/tools/addStamp/AddStampAutomationSettings";
 
 const showPlaceholderTools = true; // Show all tools; grey out unavailable ones in UI
 
@@ -197,6 +195,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.GENERAL,
         maxFiles: -1,
         synonyms: getSynonyms(t, "multiTool"),
+        supportsAutomate: false,
+        automationSettings: null
       },
       merge: {
         icon: <LocalIcon icon="library-add-rounded" width="1.5rem" height="1.5rem" />,
@@ -208,7 +208,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["merge-pdfs"],
         operationConfig: mergeOperationConfig,
-        settingsComponent: MergeSettings,
+        automationSettings: MergeSettings,
         synonyms: getSynonyms(t, "merge")
       },
       // Signing
@@ -223,7 +223,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["cert-sign"],
         operationConfig: certSignOperationConfig,
-        settingsComponent: CertificateTypeSettings,
+        automationSettings: CertificateTypeSettings, //TODO:: not all settings shown
       },
       sign: {
         icon: <LocalIcon icon="signature-rounded" width="1.5rem" height="1.5rem" />,
@@ -233,7 +233,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.SIGNING,
         operationConfig: signOperationConfig,
-        settingsComponent: SignSettings,
+        automationSettings: SignSettings, // TODO:: not all settings shown, suggested next tools shown
         synonyms: getSynonyms(t, "sign")
       },
 
@@ -249,7 +249,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["add-password"],
         operationConfig: addPasswordOperationConfig,
-        settingsComponent: AddPasswordSettings,
+        automationSettings: AddPasswordSettings,
         synonyms: getSynonyms(t, "addPassword")
      },
       watermark: {
@@ -262,7 +262,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.DOCUMENT_SECURITY,
         endpoints: ["add-watermark"],
         operationConfig: addWatermarkOperationConfig,
-        settingsComponent: AddWatermarkSingleStepSettings,
+        automationSettings: AddWatermarkSingleStepSettings,
         synonyms: getSynonyms(t, "watermark")
       },
       addStamp: {
@@ -276,6 +276,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["add-stamp"],
         operationConfig: addStampOperationConfig,
+        automationSettings: AddStampAutomationSettings,
       },
       sanitize: {
         icon: <LocalIcon icon="cleaning-services-outline-rounded" width="1.5rem" height="1.5rem" />,
@@ -287,7 +288,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         description: t("home.sanitize.desc", "Remove potentially harmful elements from PDF files"),
         endpoints: ["sanitize-pdf"],
         operationConfig: sanitizeOperationConfig,
-        settingsComponent: SanitizeSettings,
+        automationSettings: SanitizeSettings,
         synonyms: getSynonyms(t, "sanitize")
       },
       flatten: {
@@ -300,7 +301,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["flatten"],
         operationConfig: flattenOperationConfig,
-        settingsComponent: FlattenSettings,
+        automationSettings: FlattenSettings,
         synonyms: getSynonyms(t, "flatten")
       },
       unlockPDFForms: {
@@ -313,8 +314,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["unlock-pdf-forms"],
         operationConfig: unlockPdfFormsOperationConfig,
-        settingsComponent: UnlockPdfFormsSettings,
         synonyms: getSynonyms(t, "unlockPDFForms"),
+        automationSettings: null
       },
       changePermissions: {
         icon: <LocalIcon icon="lock-outline" width="1.5rem" height="1.5rem" />,
@@ -326,7 +327,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["add-password"],
         operationConfig: changePermissionsOperationConfig,
-        settingsComponent: ChangePermissionsSettings,
+        automationSettings: ChangePermissionsSettings,
         synonyms: getSynonyms(t, "changePermissions"),
       },
       getPdfInfo: {
@@ -337,6 +338,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.VERIFICATION,
         synonyms: getSynonyms(t, "getPdfInfo"),
+        supportsAutomate: false,
+        automationSettings: null
       },
       validateSignature: {
         icon: <LocalIcon icon="verified-rounded" width="1.5rem" height="1.5rem" />,
@@ -346,6 +349,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.VERIFICATION,
         synonyms: getSynonyms(t, "validateSignature"),
+        automationSettings: null
       },
 
       // Document Review
@@ -361,7 +365,9 @@ export function useFlatToolRegistry(): ToolRegistry {
         ),
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.DOCUMENT_REVIEW,
-        synonyms: getSynonyms(t, "read")
+        synonyms: getSynonyms(t, "read"),
+        supportsAutomate: false,
+        automationSettings: null
       },
       changeMetadata: {
         icon: <LocalIcon icon="assignment-rounded" width="1.5rem" height="1.5rem" />,
@@ -373,7 +379,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["update-metadata"],
         operationConfig: changeMetadataOperationConfig,
-        settingsComponent: ChangeMetadataSingleStep,
+        automationSettings: ChangeMetadataSingleStep,
         synonyms: getSynonyms(t, "changeMetadata")
       },
       // Page Formatting
@@ -388,7 +394,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["crop"],
         operationConfig: cropOperationConfig,
-        settingsComponent: CropSettings,
+        automationSettings: CropSettings,   //TODO: Implement CropSettings
       },
       rotate: {
         icon: <LocalIcon icon="rotate-right-rounded" width="1.5rem" height="1.5rem" />,
@@ -400,7 +406,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["rotate-pdf"],
         operationConfig: rotateOperationConfig,
-        settingsComponent: RotateSettings,
+        automationSettings: RotateSettings, //TODO:: Fix
         synonyms: getSynonyms(t, "rotate")
       },
       split: {
@@ -411,7 +417,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.PAGE_FORMATTING,
         operationConfig: splitOperationConfig,
-        settingsComponent: SplitSettings,
+        automationSettings: SplitSettings, // Todo:: not all settings shown
         synonyms: getSynonyms(t, "split")
       },
       reorganizePages: {
@@ -426,7 +432,9 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.PAGE_FORMATTING,
         endpoints: ["rearrange-pages"],
         operationConfig: reorganizePagesOperationConfig,
-        synonyms: getSynonyms(t, "reorganizePages")
+        synonyms: getSynonyms(t, "reorganizePages"),
+        automationSettings: null
+
       },
       scalePages: {
         icon: <LocalIcon icon="crop-free-rounded" width="1.5rem" height="1.5rem" />,
@@ -438,7 +446,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["scale-pages"],
         operationConfig: adjustPageScaleOperationConfig,
-        settingsComponent: AdjustPageScaleSettings,
+        automationSettings: AdjustPageScaleSettings,
         synonyms: getSynonyms(t, "scalePages")
       },
       addPageNumbers: {
@@ -449,6 +457,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         description: t("home.addPageNumbers.desc", "Add Page numbers throughout a document in a set location"),
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.PAGE_FORMATTING,
+        automationSettings: null,
         synonyms: getSynonyms(t, "addPageNumbers")
       },
       pageLayout: {
@@ -460,7 +469,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.PAGE_FORMATTING,
         maxFiles: -1,
         endpoints: ["multi-page-layout"],
-        settingsComponent: PageLayoutSettings,
+        automationSettings: PageLayoutSettings,
         synonyms: getSynonyms(t, "pageLayout")
       },
       bookletImposition: {
@@ -468,7 +477,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         name: t("home.bookletImposition.title", "Booklet Imposition"),
         component: BookletImposition,
         operationConfig: bookletImpositionOperationConfig,
-        settingsComponent: BookletImpositionSettings,
+        automationSettings: BookletImpositionSettings,
         description: t("home.bookletImposition.desc", "Create booklets with proper page ordering and multi-page layout for printing and binding"),
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.PAGE_FORMATTING,
@@ -485,7 +494,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["pdf-to-single-page"],
         operationConfig: singleLargePageOperationConfig,
-        synonyms: getSynonyms(t, "pdfToSinglePage")
+        synonyms: getSynonyms(t, "pdfToSinglePage"),
+        automationSettings: null,
       },
       addAttachments: {
         icon: <LocalIcon icon="attachment-rounded" width="1.5rem" height="1.5rem" />,
@@ -498,6 +508,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: 1,
         endpoints: ["add-attachments"],
         operationConfig: addAttachmentsOperationConfig,
+        automationSettings: null, // TODO:: Needs settings
       },
 
       // Extraction
@@ -509,7 +520,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         description: t("home.extractPages.desc", "Extract specific pages from a PDF document"),
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.EXTRACTION,
-        synonyms: getSynonyms(t, "extractPages")
+        synonyms: getSynonyms(t, "extractPages"),
+        automationSettings: null,
       },
       extractImages: {
         icon: <LocalIcon icon="photo-library-rounded" width="1.5rem" height="1.5rem" />,
@@ -521,7 +533,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["extract-images"],
         operationConfig: extractImagesOperationConfig,
-        settingsComponent: ExtractImagesSettings,
+        automationSettings: ExtractImagesSettings,
         synonyms: getSynonyms(t, "extractImages")
       },
 
@@ -536,7 +548,9 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.REMOVAL,
         maxFiles: 1,
         endpoints: ["remove-pages"],
-        synonyms: getSynonyms(t, "removePages")
+        synonyms: getSynonyms(t, "removePages"),
+
+        automationSettings: null, // TODO:: Needs settings
       },
       removeBlanks: {
         icon: <LocalIcon icon="scan-delete-rounded" width="1.5rem" height="1.5rem" />,
@@ -547,7 +561,9 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.REMOVAL,
         maxFiles: 1,
         endpoints: ["remove-blanks"],
-        synonyms: getSynonyms(t, "removeBlanks")
+        synonyms: getSynonyms(t, "removeBlanks"),
+
+        automationSettings: null, // TODO:: Needs settings
       },
       removeAnnotations: {
         icon: <LocalIcon icon="thread-unread-rounded" width="1.5rem" height="1.5rem" />,
@@ -558,7 +574,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.REMOVAL,
         maxFiles: -1,
         operationConfig: removeAnnotationsOperationConfig,
-        settingsComponent: RemoveAnnotationsSettings,
+        automationSettings: null,
         synonyms: getSynonyms(t, "removeAnnotations")
       },
       removeImage: {
@@ -572,6 +588,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         endpoints: ["remove-image-pdf"],
         operationConfig: undefined,
         synonyms: getSynonyms(t, "removeImage"),
+        automationSettings: null,
       },
       removePassword: {
         icon: <LocalIcon icon="lock-open-right-outline-rounded" width="1.5rem" height="1.5rem" />,
@@ -583,7 +600,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         endpoints: ["remove-password"],
         maxFiles: -1,
         operationConfig: removePasswordOperationConfig,
-        settingsComponent: RemovePasswordSettings,
+        automationSettings: RemovePasswordSettings,
         synonyms: getSynonyms(t, "removePassword")
       },
       removeCertSign: {
@@ -597,6 +614,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         endpoints: ["remove-certificate-sign"],
         operationConfig: removeCertificateSignOperationConfig,
         synonyms: getSynonyms(t, "removeCertSign"),
+        automationSettings: null,
       },
 
       // Automation
@@ -615,6 +633,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         supportedFormats: CONVERT_SUPPORTED_FORMATS,
         endpoints: ["handleData"],
         synonyms: getSynonyms(t, "automate"),
+        automationSettings: null,
       },
       autoRename: {
         icon: <LocalIcon icon="match-word-rounded" width="1.5rem" height="1.5rem" />,
@@ -627,6 +646,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.ADVANCED_TOOLS,
         subcategoryId: SubcategoryId.AUTOMATION,
         synonyms: getSynonyms(t, "autoRename"),
+        automationSettings: null,
       },
 
       // Advanced Formatting
@@ -639,6 +659,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.ADVANCED_TOOLS,
         subcategoryId: SubcategoryId.ADVANCED_FORMATTING,
         synonyms: getSynonyms(t, "adjustContrast"),
+        automationSettings: null,
       },
       repair: {
         icon: <LocalIcon icon="build-outline-rounded" width="1.5rem" height="1.5rem" />,
@@ -650,8 +671,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["repair"],
         operationConfig: repairOperationConfig,
-        settingsComponent: RepairSettings,
-        synonyms: getSynonyms(t, "repair")
+        synonyms: getSynonyms(t, "repair"),
+        automationSettings: null
       },
       scannerImageSplit: {
         icon: <LocalIcon icon="scanner-rounded" width="1.5rem" height="1.5rem" />,
@@ -663,7 +684,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["extract-image-scans"],
         operationConfig: scannerImageSplitOperationConfig,
-        settingsComponent: ScannerImageSplitSettings,
+        automationSettings: ScannerImageSplitSettings,
         synonyms: getSynonyms(t, "ScannerImageSplit"),
       },
       overlayPdfs: {
@@ -674,6 +695,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.ADVANCED_TOOLS,
         subcategoryId: SubcategoryId.ADVANCED_FORMATTING,
         synonyms: getSynonyms(t, "overlayPdfs"),
+        automationSettings: null
       },
       replaceColor: {
         icon: <LocalIcon icon="format-color-fill-rounded" width="1.5rem" height="1.5rem" />,
@@ -685,7 +707,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["replace-invert-pdf"],
         operationConfig: replaceColorOperationConfig,
-        settingsComponent: ReplaceColorSettings,
+        automationSettings: ReplaceColorSettings,
         synonyms: getSynonyms(t, "replaceColor"),
       },
       addImage: {
@@ -696,6 +718,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.ADVANCED_TOOLS,
         subcategoryId: SubcategoryId.ADVANCED_FORMATTING,
         synonyms: getSynonyms(t, "addImage"),
+        automationSettings: null
       },
       editTableOfContents: {
         icon: <LocalIcon icon="bookmark-add-rounded" width="1.5rem" height="1.5rem" />,
@@ -705,6 +728,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.ADVANCED_TOOLS,
         subcategoryId: SubcategoryId.ADVANCED_FORMATTING,
         synonyms: getSynonyms(t, "editTableOfContents"),
+        automationSettings: null
       },
       scannerEffect: {
         icon: <LocalIcon icon="scanner-rounded" width="1.5rem" height="1.5rem" />,
@@ -714,6 +738,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.ADVANCED_TOOLS,
         subcategoryId: SubcategoryId.ADVANCED_FORMATTING,
         synonyms: getSynonyms(t, "scannerEffect"),
+        automationSettings: null
       },
 
       // Developer Tools
@@ -726,6 +751,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         categoryId: ToolCategoryId.ADVANCED_TOOLS,
         subcategoryId: SubcategoryId.DEVELOPER_TOOLS,
         synonyms: getSynonyms(t, "showJS"),
+        supportsAutomate: false,
+        automationSettings: null
       },
       devApi: {
         icon: <LocalIcon icon="open-in-new-rounded" width="1.5rem" height="1.5rem" style={{ color: "#2F7BF6" }} />,
@@ -736,6 +763,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.DEVELOPER_TOOLS,
         link: "https://stirlingpdf.io/swagger-ui/5.21.0/index.html",
         synonyms: getSynonyms(t, "devApi"),
+        supportsAutomate: false,
+        automationSettings: null
       },
       devFolderScanning: {
         icon: <LocalIcon icon="open-in-new-rounded" width="1.5rem" height="1.5rem" style={{ color: "#2F7BF6" }} />,
@@ -746,6 +775,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.DEVELOPER_TOOLS,
         link: "https://docs.stirlingpdf.com/Advanced%20Configuration/Folder%20Scanning/",
         synonyms: getSynonyms(t, "devFolderScanning"),
+        supportsAutomate: false,
+        automationSettings: null
       },
       devSsoGuide: {
         icon: <LocalIcon icon="open-in-new-rounded" width="1.5rem" height="1.5rem" style={{ color: "#2F7BF6" }} />,
@@ -756,6 +787,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.DEVELOPER_TOOLS,
         link: "https://docs.stirlingpdf.com/Advanced%20Configuration/Single%20Sign-On%20Configuration",
         synonyms: getSynonyms(t, "devSsoGuide"),
+        supportsAutomate: false,
+        automationSettings: null
       },
       devAirgapped: {
         icon: <LocalIcon icon="open-in-new-rounded" width="1.5rem" height="1.5rem" style={{ color: "#2F7BF6" }} />,
@@ -766,6 +799,8 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.DEVELOPER_TOOLS,
         link: "https://docs.stirlingpdf.com/Pro/#activation",
         synonyms: getSynonyms(t, "devAirgapped"),
+        supportsAutomate: false,
+        automationSettings: null
       },
 
       // Recommended Tools
@@ -776,7 +811,9 @@ export function useFlatToolRegistry(): ToolRegistry {
         description: t("home.compare.desc", "Compare two PDF documents and highlight differences"),
         categoryId: ToolCategoryId.RECOMMENDED_TOOLS,
         subcategoryId: SubcategoryId.GENERAL,
-        synonyms: getSynonyms(t, "compare")
+        synonyms: getSynonyms(t, "compare"),
+        supportsAutomate: false,
+        automationSettings: null
       },
       compress: {
         icon: <LocalIcon icon="zoom-in-map-rounded" width="1.5rem" height="1.5rem" />,
@@ -787,7 +824,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.GENERAL,
         maxFiles: -1,
         operationConfig: compressOperationConfig,
-        settingsComponent: CompressSettings,
+        automationSettings: CompressSettings, //TODO:: width not great
         synonyms: getSynonyms(t, "compress")
       },
       convert: {
@@ -817,7 +854,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         ],
 
         operationConfig: convertOperationConfig,
-        settingsComponent: ConvertSettings,
+        automationSettings: ConvertSettings,
         synonyms: getSynonyms(t, "convert")
       },
 
@@ -830,7 +867,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         subcategoryId: SubcategoryId.GENERAL,
         maxFiles: -1,
         operationConfig: ocrOperationConfig,
-        settingsComponent: OCRSettings,
+        automationSettings: OCRSettings,
         synonyms: getSynonyms(t, "ocr")
       },
       redact: {
@@ -843,7 +880,7 @@ export function useFlatToolRegistry(): ToolRegistry {
         maxFiles: -1,
         endpoints: ["auto-redact"],
         operationConfig: redactOperationConfig,
-        settingsComponent: RedactSingleStepSettings,
+        automationSettings: RedactSingleStepSettings,
         synonyms: getSynonyms(t, "redact")
       },
     };
diff --git a/frontend/src/hooks/tools/automate/useAutomationForm.ts b/frontend/src/hooks/tools/automate/useAutomationForm.ts
index 6ad8afe81b..b6e14e93af 100644
--- a/frontend/src/hooks/tools/automate/useAutomationForm.ts
+++ b/frontend/src/hooks/tools/automate/useAutomationForm.ts
@@ -2,7 +2,9 @@ import { useState, useEffect, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AutomationTool, AutomationConfig, AutomationMode } from '../../../types/automation';
 import { AUTOMATION_CONSTANTS } from '../../../constants/automation';
-import { ToolRegistry } from '../../../data/toolsTaxonomy';
+import { ToolRegistry, isValidToolId } from '../../../data/toolsTaxonomy';
+import { ToolId } from 'src/types/toolId';
+
 
 interface UseAutomationFormProps {
   mode: AutomationMode;
@@ -41,11 +43,15 @@ export function useAutomationForm({ mode, existingAutomation, toolRegistry }: Us
       const operations = existingAutomation.operations || [];
       const tools = operations.map((op, index) => {
         const operation = typeof op === 'string' ? op : op.operation;
+        const toolEntry = toolRegistry[operation as ToolId];
+        // If tool has no settingsComponent, it's automatically configured
+        const isConfigured = mode === AutomationMode.EDIT ? true : !toolEntry?.automationSettings;
+
         return {
           id: `${operation}-${Date.now()}-${index}`,
           operation: operation,
           name: getToolName(operation),
-          configured: mode === AutomationMode.EDIT ? true : false,
+          configured: isConfigured,
           parameters: typeof op === 'object' ? op.parameters || {} : {}
         };
       });
@@ -65,11 +71,15 @@ export function useAutomationForm({ mode, existingAutomation, toolRegistry }: Us
   }, [mode, existingAutomation, t, getToolName]);
 
   const addTool = (operation: string) => {
+    const toolEntry = toolRegistry[operation];
+    // If tool has no settingsComponent, it's automatically configured
+    const isConfigured = !toolEntry?.settingsComponent;
+
     const newTool: AutomationTool = {
       id: `${operation}-${Date.now()}`,
       operation,
       name: getToolName(operation),
-      configured: false,
+      configured: isConfigured,
       parameters: getToolDefaultParameters(operation)
     };
 
diff --git a/frontend/src/tools/AddStamp.tsx b/frontend/src/tools/AddStamp.tsx
index 61cb45c84c..87b6c53cc4 100644
--- a/frontend/src/tools/AddStamp.tsx
+++ b/frontend/src/tools/AddStamp.tsx
@@ -6,15 +6,14 @@ import { BaseToolProps, ToolComponent } from "../types/tool";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
 import { useAddStampParameters } from "../components/tools/addStamp/useAddStampParameters";
 import { useAddStampOperation } from "../components/tools/addStamp/useAddStampOperation";
-import { Group, Select, Stack, Textarea, TextInput, ColorInput, Button, Slider, Text, NumberInput, Divider } from "@mantine/core";
+import { Stack, Text } from "@mantine/core";
 import StampPreview from "../components/tools/addStamp/StampPreview";
-import LocalIcon from "../components/shared/LocalIcon";
 import styles from "../components/tools/addStamp/StampPreview.module.css";
-import { Tooltip } from "../components/shared/Tooltip";
 import ButtonSelector from "../components/shared/ButtonSelector";
 import { useAccordionSteps } from "../hooks/tools/shared/useAccordionSteps";
 import ObscuredOverlay from "../components/shared/ObscuredOverlay";
-import { getDefaultFontSizeForAlphabet } from "../components/tools/addStamp/StampPreviewUtils";
+import StampSetupSettings from "../components/tools/addStamp/StampSetupSettings";
+import StampPositionFormattingSettings from "../components/tools/addStamp/StampPositionFormattingSettings";
 
 const AddStamp = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   const { t } = useTranslation();
@@ -70,108 +69,22 @@ const AddStamp = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   const getSteps = () => {
     const steps: any[] = [];
 
-    // Step 1: Stamp Setup 
+    // Step 1: Stamp Setup
     steps.push({
       title: t("AddStampRequest.stampSetup", "Stamp Setup"),
       isCollapsed: accordion.getCollapsedState(AddStampStep.STAMP_SETUP),
       onCollapsedClick: () => accordion.handleStepToggle(AddStampStep.STAMP_SETUP),
       isVisible: hasFiles || hasResults,
       content: (
-        <Stack gap="md">
-          <TextInput
-            label={t('pageSelectionPrompt', 'Page Selection (e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)')}
-            value={params.parameters.pageNumbers}
-            onChange={(e) => params.updateParameter('pageNumbers', e.currentTarget.value)}
-            disabled={endpointLoading}
-          />
-          <Divider/>
-          <div>
-            <Text size="sm" fw={500} mb="xs">{t('AddStampRequest.stampType', 'Stamp Type')}</Text>
-            <ButtonSelector
-              value={params.parameters.stampType}
-              onChange={(v: 'text' | 'image') => params.updateParameter('stampType', v)}
-              options={[
-                { value: 'text', label: t('watermark.type.1', 'Text') },
-                { value: 'image', label: t('watermark.type.2', 'Image') },
-              ]}
-              disabled={endpointLoading}
-              buttonClassName={styles.modeToggleButton}
-              textClassName={styles.modeToggleButtonText}
-            />
-          </div>
-
-          {params.parameters.stampType === 'text' && (
-            <>
-              <Textarea
-                label={t('AddStampRequest.stampText', 'Stamp Text')}
-                value={params.parameters.stampText}
-                onChange={(e) => params.updateParameter('stampText', e.currentTarget.value)}
-                autosize
-                minRows={2}
-                disabled={endpointLoading}
-              />
-              <Select
-                label={t('AddStampRequest.alphabet', 'Alphabet')}
-                value={params.parameters.alphabet}
-                onChange={(v) => {
-                  const nextAlphabet = (v as any) || 'roman';
-                  params.updateParameter('alphabet', nextAlphabet);
-                  const nextDefault = getDefaultFontSizeForAlphabet(nextAlphabet);
-                  params.updateParameter('fontSize', nextDefault);
-                }}
-                data={[
-                  { value: 'roman', label: 'Roman' },
-                  { value: 'arabic', label: 'العربية' },
-                  { value: 'japanese', label: '日本語' },
-                  { value: 'korean', label: '한국어' },
-                  { value: 'chinese', label: '简体中文' },
-                  { value: 'thai', label: 'ไทย' },
-                ]}
-                disabled={endpointLoading}
-              />
-            </>
-          )}
-
-          {params.parameters.stampType === 'image' && (
-            <Stack gap="xs">
-              <input
-                type="file"
-                accept=".png,.jpg,.jpeg,.gif,.bmp,.tiff,.tif,.webp"
-                onChange={(e) => {
-                  const file = e.target.files?.[0];
-                  if (file) params.updateParameter('stampImage', file);
-                }}
-                disabled={endpointLoading}
-                style={{ display: 'none' }}
-                id="stamp-image-input"
-              />
-              <Button
-                size="xs"
-                component="label"
-                htmlFor="stamp-image-input"
-                disabled={endpointLoading}
-              >
-                {t('chooseFile', 'Choose File')}
-              </Button>
-              {params.parameters.stampImage && (
-                <Stack gap="xs">
-                  <img
-                    src={URL.createObjectURL(params.parameters.stampImage)}
-                    alt="Selected stamp image"
-                    className="max-h-24 w-full object-contain border border-gray-200 rounded bg-gray-50"
-                  />
-                  <Text size="xs" c="dimmed">
-                    {params.parameters.stampImage.name}
-                  </Text>
-                </Stack>
-              )}
-            </Stack>
-          )}
-        </Stack>
+        <StampSetupSettings
+          parameters={params.parameters}
+          onParameterChange={params.updateParameter}
+          disabled={endpointLoading}
+        />
       ),
     });
 
-    // Step 3: Formatting & Position
+    // Step 2: Formatting & Position
     steps.push({
       title: t("AddStampRequest.positionAndFormatting", "Position & Formatting"),
       isCollapsed: accordion.getCollapsedState(AddStampStep.POSITION_FORMATTING),
@@ -209,151 +122,13 @@ const AddStamp = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
             </div>
           )}
 
+          <StampPositionFormattingSettings
+            parameters={params.parameters}
+            onParameterChange={params.updateParameter}
+            disabled={endpointLoading}
+          />
 
-          {/* Icon pill buttons row */}
-          <div className="flex justify-between gap-[0.5rem]">
-            <Tooltip content={t('AddStampRequest.rotation', 'Rotation')} position="top">
-              <Button
-                variant={params.parameters._activePill === 'rotation' ? 'filled' : 'outline'}
-                className="flex-1"
-                onClick={() => params.updateParameter('_activePill', 'rotation')}
-              >
-                <LocalIcon icon="rotate-right-rounded" width="1.1rem" height="1.1rem" />
-              </Button>
-            </Tooltip>
-            <Tooltip content={t('AddStampRequest.opacity', 'Opacity')} position="top">
-              <Button
-                variant={params.parameters._activePill === 'opacity' ? 'filled' : 'outline'}
-                className="flex-1"
-                onClick={() => params.updateParameter('_activePill', 'opacity')}
-              >
-                <LocalIcon icon="opacity" width="1.1rem" height="1.1rem" />
-              </Button>
-            </Tooltip>
-            <Tooltip content={params.parameters.stampType === 'image' ? t('AddStampRequest.imageSize', 'Image Size') : t('AddStampRequest.fontSize', 'Font Size')} position="top">
-              <Button
-                variant={params.parameters._activePill === 'fontSize' ? 'filled' : 'outline'}
-                className="flex-1"
-                onClick={() => params.updateParameter('_activePill', 'fontSize')}
-              >
-                <LocalIcon icon="zoom-in-map-rounded" width="1.1rem" height="1.1rem" />
-              </Button>
-            </Tooltip>
-          </div>
-
-          {/* Single slider bound to selected pill */}
-          {params.parameters._activePill === 'fontSize' && (
-            <Stack gap="xs">
-              <Text className={styles.labelText}>
-                {params.parameters.stampType === 'image' 
-                  ? t('AddStampRequest.imageSize', 'Image Size')
-                  : t('AddStampRequest.fontSize', 'Font Size')
-                }
-              </Text>
-              <Group className={styles.sliderGroup} align="center">
-                <NumberInput
-                  value={params.parameters.fontSize}
-                  onChange={(v) => params.updateParameter('fontSize', typeof v === 'number' ? v : 1)}
-                  min={1}
-                  max={400}
-                  step={1}
-                  size="sm"
-                  className={styles.numberInput}
-                  disabled={endpointLoading}
-                />
-                <Slider
-                  value={params.parameters.fontSize}
-                  onChange={(v) => params.updateParameter('fontSize', v as number)}
-                  min={1}
-                  max={400}
-                  step={1}
-                  className={styles.slider}
-                />
-              </Group>
-            </Stack>
-          )}
-          {params.parameters._activePill === 'rotation' && (
-            <Stack gap="xs">
-              <Text className={styles.labelText}>{t('AddStampRequest.rotation', 'Rotation')}</Text>
-              <Group className={styles.sliderGroup} align="center">
-                <NumberInput
-                  value={params.parameters.rotation}
-                  onChange={(v) => params.updateParameter('rotation', typeof v === 'number' ? v : 0)}
-                  min={-180}
-                  max={180}
-                  step={1}
-                  size="sm"
-                  className={styles.numberInput}
-                  hideControls
-                  disabled={endpointLoading}
-                />
-                <Slider
-                  value={params.parameters.rotation}
-                  onChange={(v) => params.updateParameter('rotation', v as number)}
-                  min={-180}
-                  max={180}
-                  step={1}
-                  className={styles.sliderWide}
-                />
-              </Group>
-            </Stack>
-          )}
-          {params.parameters._activePill === 'opacity' && (
-            <Stack gap="xs">
-              <Text className={styles.labelText}>{t('AddStampRequest.opacity', 'Opacity')}</Text>
-              <Group className={styles.sliderGroup} align="center">
-                <NumberInput
-                  value={params.parameters.opacity}
-                  onChange={(v) => params.updateParameter('opacity', typeof v === 'number' ? v : 0)}
-                  min={0}
-                  max={100}
-                  step={1}
-                  size="sm"
-                  className={styles.numberInput}
-                  disabled={endpointLoading}
-                />
-                <Slider
-                  value={params.parameters.opacity}
-                  onChange={(v) => params.updateParameter('opacity', v as number)}
-                  min={0}
-                  max={100}
-                  step={1}
-                  className={styles.slider}
-                />
-              </Group>
-            </Stack>
-          )}
-
-
-          {params.parameters.stampType !== 'image' && (
-            <ColorInput
-              label={t('AddStampRequest.customColor', 'Custom Text Color')}
-              value={params.parameters.customColor}
-              onChange={(value) => params.updateParameter('customColor', value)}
-              format="hex"
-              disabled={endpointLoading}
-            />
-          )}
-
-
-          {/* Margin selection appears when using quick grid (and for text stamps) */}
-          {(params.parameters.stampType === 'text' || (params.parameters.stampType === 'image' && quickPositionModeSelected)) && (
-            <Select
-              label={t('AddStampRequest.margin', 'Margin')}
-              value={params.parameters.customMargin}
-              onChange={(v) => params.updateParameter('customMargin', (v as any) || 'medium')}
-              data={[
-                { value: 'small', label: t('margin.small', 'Small') },
-                { value: 'medium', label: t('margin.medium', 'Medium') },
-                { value: 'large', label: t('margin.large', 'Large') },
-                { value: 'x-large', label: t('margin.xLarge', 'Extra Large') },
-              ]}
-              disabled={endpointLoading}
-            />
-          )}
-
-
-          {/* Unified preview wrapped with obscured overlay if no stamp selected in step 4 */}
+          {/* Unified preview wrapped with obscured overlay if no stamp selected */}
           <ObscuredOverlay
             obscured={
               accordion.currentStep === AddStampStep.POSITION_FORMATTING &&