diff --git a/frontend/src/components/tools/ToolPanel.tsx b/frontend/src/components/tools/ToolPanel.tsx
index 2f2e64c78..67617a657 100644
--- a/frontend/src/components/tools/ToolPanel.tsx
+++ b/frontend/src/components/tools/ToolPanel.tsx
@@ -39,7 +39,7 @@ export default function ToolPanel() {
       }`}
       style={{
         width: isPanelVisible ? '20rem' : '0',
-        padding: isPanelVisible ? '0.5rem' : '0'
+        padding: '0'
       }}
     >
       <div
diff --git a/frontend/src/components/tools/compress/CompressSettings.tsx b/frontend/src/components/tools/compress/CompressSettings.tsx
index 717b07566..d61586800 100644
--- a/frontend/src/components/tools/compress/CompressSettings.tsx
+++ b/frontend/src/components/tools/compress/CompressSettings.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Button, Stack, Text, NumberInput, Select } from "@mantine/core";
+import { Button, Stack, Text, NumberInput, Select, Divider } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
 interface CompressParameters {
@@ -22,6 +22,8 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
 
   return (
     <Stack gap="md">
+
+      <Divider ml='-md'></Divider>
       {/* Compression Method */}
       <Stack gap="sm">
         <Text size="sm" fw={500}>Compression Method</Text>
@@ -54,6 +56,7 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
       {/* Quality Adjustment */}
       {parameters.compressionMethod === 'quality' && (
         <Stack gap="sm">
+          <Divider />
           <Text size="sm" fw={500}>Compression Level</Text>
           <div style={{ position: 'relative' }}>
             <input
@@ -68,7 +71,7 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
               onTouchStart={() => setIsSliding(true)}
               onTouchEnd={() => setIsSliding(false)}
               disabled={disabled}
-              style={{ 
+              style={{
                 width: '100%',
                 height: '6px',
                 borderRadius: '3px',
@@ -107,6 +110,8 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
         </Stack>
       )}
 
+      <Divider/>
+
       {/* File Size Input */}
       {parameters.compressionMethod === 'filesize' && (
         <Stack gap="sm">
@@ -141,7 +146,7 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
 
       {/* Compression Options */}
       <Stack gap="sm">
-        <label 
+        <label
           style={{ display: 'flex', alignItems: 'center', gap: '8px' }}
           title="Converts all images in the PDF to grayscale, which can significantly reduce file size while maintaining readability"
         >
@@ -158,4 +163,4 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
   );
 };
 
-export default CompressSettings;
\ No newline at end of file
+export default CompressSettings;
diff --git a/frontend/src/components/tools/shared/OperationButton.tsx b/frontend/src/components/tools/shared/OperationButton.tsx
index 094a5b6d3..689e88864 100644
--- a/frontend/src/components/tools/shared/OperationButton.tsx
+++ b/frontend/src/components/tools/shared/OperationButton.tsx
@@ -24,7 +24,7 @@ const OperationButton = ({
   submitText,
   variant = 'filled',
   color = 'blue',
-  fullWidth = true,
+  fullWidth = false,
   mt = 'md',
   type = 'button',
   'data-testid': dataTestId
@@ -36,6 +36,8 @@ const OperationButton = ({
       type={type}
       onClick={onClick}
       fullWidth={fullWidth}
+      mr='md'
+      ml='md'
       mt={mt}
       loading={isLoading}
       disabled={disabled}
@@ -43,7 +45,7 @@ const OperationButton = ({
       color={color}
       data-testid={dataTestId}
     >
-      {isLoading 
+      {isLoading
         ? (loadingText || t("loading", "Loading..."))
         : (submitText || t("submit", "Submit"))
       }
@@ -51,4 +53,4 @@ const OperationButton = ({
   );
 }
 
-export default OperationButton;
\ No newline at end of file
+export default OperationButton;
diff --git a/frontend/src/components/tools/shared/ToolStep.tsx b/frontend/src/components/tools/shared/ToolStep.tsx
index 1fceac494..806ad2e4f 100644
--- a/frontend/src/components/tools/shared/ToolStep.tsx
+++ b/frontend/src/components/tools/shared/ToolStep.tsx
@@ -1,9 +1,11 @@
 import React, { createContext, useContext, useMemo, useRef } from 'react';
-import { Paper, Text, Stack, Box, Flex } from '@mantine/core';
+import { Text, Stack, Box, Flex, Divider } from '@mantine/core';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import { Tooltip } from '../../shared/Tooltip';
 import { TooltipTip } from '../../shared/tooltip/TooltipContent';
+import { createFilesToolStep, FilesToolStepProps } from './createFilesToolStep';
+import { createResultsToolStep, ResultsToolStepProps } from './createResultsToolStep';
 
 interface ToolStepContextType {
   visibleStepCount: number;
@@ -56,7 +58,7 @@ const renderTooltipTitle = (
       </Tooltip>
     );
   }
-  
+
   return (
     <Text fw={500} size="lg">
       {title}
@@ -80,28 +82,29 @@ const ToolStep = ({
   if (!isVisible) return null;
 
   const parent = useContext(ToolStepContext);
-  
+
   // Auto-detect if we should show numbers based on sibling count
   const shouldShowNumber = useMemo(() => {
     if (showNumber !== undefined) return showNumber;
     return parent ? parent.visibleStepCount >= 3 : false;
   }, [showNumber, parent]);
 
-  const stepNumber = _stepNumber || 1;
+  const stepNumber = _stepNumber;
 
   return (
-    <Paper
-      p="md"
-      withBorder
-      style={{
-        opacity: isCollapsed ? 0.8 : 1,
-        transition: 'opacity 0.2s ease'
-      }}
-    >
+    <div>
+      <div
+        style={{
+          padding: '1rem',
+          opacity: isCollapsed ? 0.8 : 1,
+          color: isCollapsed ? 'var(--mantine-color-dimmed)' : 'inherit',
+          transition: 'opacity 0.2s ease, color 0.2s ease'
+        }}
+      >
       {/* Chevron icon to collapse/expand the step */}
-      <Flex 
-        align="center" 
-        justify="space-between" 
+      <Flex
+        align="center"
+        justify="space-between"
         mb="sm"
         style={{
           cursor: onCollapsedClick ? 'pointer' : 'default'
@@ -116,16 +119,16 @@ const ToolStep = ({
           )}
           {renderTooltipTitle(title, tooltip, isCollapsed)}
         </Flex>
-        
+
         {isCollapsed ? (
-          <ChevronRightIcon style={{ 
-            fontSize: '1.2rem', 
+          <ChevronRightIcon style={{
+            fontSize: '1.2rem',
             color: 'var(--mantine-color-dimmed)',
             opacity: onCollapsedClick ? 1 : 0.5
           }} />
         ) : (
-          <ExpandMoreIcon style={{ 
-            fontSize: '1.2rem', 
+          <ExpandMoreIcon style={{
+            fontSize: '1.2rem',
             color: 'var(--mantine-color-dimmed)',
             opacity: onCollapsedClick ? 1 : 0.5
           }} />
@@ -133,7 +136,7 @@ const ToolStep = ({
       </Flex>
 
       {isCollapsed ? (
-        <Box>
+        <div>
           {isCompleted && completedMessage && (
             <Text size="sm" c="green">
               ✓ {completedMessage}
@@ -144,9 +147,9 @@ const ToolStep = ({
               )}
             </Text>
           )}
-        </Box>
+        </div>
       ) : (
-        <Stack gap="md">
+        <Stack gap="md" pl="md">
           {helpText && (
             <Text size="sm" c="dimmed">
               {helpText}
@@ -155,33 +158,57 @@ const ToolStep = ({
           {children}
         </Stack>
       )}
-    </Paper>
+      </div>
+      <Divider style={{ marginLeft: '1rem', marginRight: '-1rem' }} />
+    </div>
   );
 }
 
-export interface ToolStepContainerProps {
-  children: React.ReactNode;
+// ToolStepFactory for creating numbered steps
+export function createToolSteps() {
+  let stepNumber = 1;
+  const steps: React.ReactElement[] = [];
+
+  const create = (
+    title: string,
+    props: Omit<ToolStepProps, 'title' | '_stepNumber'> = {},
+    children?: React.ReactNode
+  ): React.ReactElement => {
+    const isVisible = props.isVisible !== false;
+    const currentStepNumber = isVisible ? stepNumber++ : undefined;
+
+    const step = React.createElement(ToolStep, {
+      ...props,
+      title,
+      _stepNumber: currentStepNumber,
+      children,
+      key: `step-${title.toLowerCase().replace(/\s+/g, '-')}`
+    });
+
+    steps.push(step);
+    return step;
+  };
+
+  const createFilesStep = (props: FilesToolStepProps): React.ReactElement => {
+    return createFilesToolStep(create, props);
+  };
+
+  const createResultsStep = <TParams = any>(props: ResultsToolStepProps<TParams>): React.ReactElement => {
+    return createResultsToolStep(create, props);
+  };
+
+  const getVisibleCount = () => {
+    return steps.filter(step =>
+      (step.props as ToolStepProps).isVisible !== false
+    ).length;
+  };
+
+  return { create, createFilesStep, createResultsStep, getVisibleCount, steps };
 }
 
-export const ToolStepContainer = ({ children }: ToolStepContainerProps) => {
-  // Process children and inject step numbers for visible ToolSteps
-  const processedChildren = useMemo(() => {
-    let visibleStepNumber = 1;
-    
-    return React.Children.map(children, (child) => {
-      if (React.isValidElement(child) && child.type === ToolStep) {
-        const isVisible = (child.props as ToolStepProps).isVisible !== false;
-        if (isVisible) {
-          return React.cloneElement(child, {
-            ...child.props,
-            _stepNumber: visibleStepNumber++
-          } as ToolStepProps);
-        }
-      }
-      return child;
-    });
-  }, [children]);
-
+// Context provider wrapper for tools using the factory
+export function ToolStepProvider({ children }: { children: React.ReactNode }) {
+  // Count visible steps from children that are ToolStep elements
   const visibleStepCount = useMemo(() => {
     let count = 0;
     React.Children.forEach(children, (child) => {
@@ -199,9 +226,11 @@ export const ToolStepContainer = ({ children }: ToolStepContainerProps) => {
 
   return (
     <ToolStepContext.Provider value={contextValue}>
-      {processedChildren}
+      {children}
     </ToolStepContext.Provider>
   );
 }
 
+export type { FilesToolStepProps } from './createFilesToolStep';
+export type { ResultsToolStepProps } from './createResultsToolStep';
 export default ToolStep;
diff --git a/frontend/src/components/tools/shared/createFilesToolStep.tsx b/frontend/src/components/tools/shared/createFilesToolStep.tsx
new file mode 100644
index 000000000..31b977461
--- /dev/null
+++ b/frontend/src/components/tools/shared/createFilesToolStep.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import FileStatusIndicator from './FileStatusIndicator';
+
+export interface FilesToolStepProps {
+  selectedFiles: File[];
+  isCollapsed?: boolean;
+  onCollapsedClick?: () => void;
+  placeholder?: string;
+}
+
+export function createFilesToolStep(
+  createStep: (title: string, props: any, children?: React.ReactNode) => React.ReactElement,
+  props: FilesToolStepProps
+): React.ReactElement {
+  const { t } = useTranslation();
+  const hasFiles = props.selectedFiles.length > 0;
+  
+  return createStep("Files", {
+    isVisible: true,
+    isCollapsed: props.isCollapsed,
+    isCompleted: hasFiles,
+    onCollapsedClick: props.onCollapsedClick,
+    completedMessage: undefined
+  }, (
+    <FileStatusIndicator
+      selectedFiles={props.selectedFiles}
+      placeholder={props.placeholder || t("files.placeholder", "Select a PDF file in the main view to get started")}
+    />
+  ));
+}
\ No newline at end of file
diff --git a/frontend/src/components/tools/shared/createResultsToolStep.tsx b/frontend/src/components/tools/shared/createResultsToolStep.tsx
new file mode 100644
index 000000000..fe774cba6
--- /dev/null
+++ b/frontend/src/components/tools/shared/createResultsToolStep.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import { Button, Stack, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import DownloadIcon from '@mui/icons-material/Download';
+import ErrorNotification from './ErrorNotification';
+import ResultsPreview from './ResultsPreview';
+import { ToolOperationHook } from '../../../hooks/tools/shared/useToolOperation';
+
+export interface ResultsToolStepProps<TParams = any> {
+  isVisible: boolean;
+  operation: ToolOperationHook<TParams>;
+  title?: string;
+  onFileClick?: (file: File) => void;
+}
+
+export function createResultsToolStep<TParams = any>(
+  createStep: (title: string, props: any, children?: React.ReactNode) => React.ReactElement,
+  props: ResultsToolStepProps<TParams>
+): React.ReactElement {
+  const { t } = useTranslation();
+  const { operation } = props;
+  
+  const previewFiles = operation.files?.map((file, index) => ({
+    file,
+    thumbnail: operation.thumbnails[index]
+  })) || [];
+
+  return createStep("Results", {
+    isVisible: props.isVisible
+  }, (
+    <Stack gap="sm">
+      {operation.status && (
+        <Text size="sm" c="dimmed">{operation.status}</Text>
+      )}
+
+      <ErrorNotification
+        error={operation.errorMessage}
+        onClose={operation.clearError}
+      />
+
+      {operation.downloadUrl && (
+        <Button
+          component="a"
+          href={operation.downloadUrl}
+          download={operation.downloadFilename}
+          leftSection={<DownloadIcon />}
+          color="green"
+          fullWidth
+          mb="md"
+        >
+          {t("download", "Download")}
+        </Button>
+      )}
+
+      {previewFiles.length > 0 && (
+        <ResultsPreview
+          files={previewFiles}
+          onFileClick={props.onFileClick}
+          isGeneratingThumbnails={operation.isGeneratingThumbnails}
+          title={props.title || "Results"}
+        />
+      )}
+    </Stack>
+  ));
+}
\ No newline at end of file
diff --git a/frontend/src/tools/Compress.tsx b/frontend/src/tools/Compress.tsx
index f4b50b264..d86136c75 100644
--- a/frontend/src/tools/Compress.tsx
+++ b/frontend/src/tools/Compress.tsx
@@ -1,16 +1,12 @@
 import React, { useEffect, useMemo } from "react";
-import { Button, Stack, Text } from "@mantine/core";
+import { Stack } from "@mantine/core";
 import { useTranslation } from "react-i18next";
-import DownloadIcon from "@mui/icons-material/Download";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
 import { useFileContext } from "../contexts/FileContext";
 import { useToolFileSelection } from "../contexts/FileSelectionContext";
 
-import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep";
+import { createToolSteps, ToolStepProvider } from "../components/tools/shared/ToolStep";
 import OperationButton from "../components/tools/shared/OperationButton";
-import ErrorNotification from "../components/tools/shared/ErrorNotification";
-import FileStatusIndicator from "../components/tools/shared/FileStatusIndicator";
-import ResultsPreview from "../components/tools/shared/ResultsPreview";
 
 import CompressSettings from "../components/tools/compress/CompressSettings";
 
@@ -67,103 +63,52 @@ const Compress = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   const hasFiles = selectedFiles.length > 0;
   const hasResults = compressOperation.files.length > 0 || compressOperation.downloadUrl !== null;
   const filesCollapsed = hasFiles;
-  const settingsCollapsed = hasResults;
+  const settingsCollapsed = !hasFiles || hasResults;
 
-  const previewResults = useMemo(() =>
-    compressOperation.files?.map((file, index) => ({
-      file,
-      thumbnail: compressOperation.thumbnails[index]
-    })) || [],
-    [compressOperation.files, compressOperation.thumbnails]
-  );
+
+  const steps = createToolSteps();
 
   return (
-    <ToolStepContainer>
-      <Stack gap="sm" h="100%" p="sm" style={{ overflow: 'auto' }}>
+    <Stack gap="md" h="100%" p="sm" style={{ overflow: 'auto' }}>
+      <ToolStepProvider>
         {/* Files Step */}
-        <ToolStep
-          title="Files"
-          isVisible={true}
-          isCollapsed={filesCollapsed}
-          isCompleted={filesCollapsed}
-          completedMessage={hasFiles ?
-            selectedFiles.length === 1
-              ? `Selected: ${selectedFiles[0].name}`
-              : `Selected: ${selectedFiles.length} files`
-            : undefined}
-        >
-          <FileStatusIndicator
-            selectedFiles={selectedFiles}
-            placeholder="Select a PDF file in the main view to get started"
-          />
-        </ToolStep>
+        {steps.createFilesStep({
+          selectedFiles,
+          isCollapsed: filesCollapsed
+        })}
 
         {/* Settings Step */}
-        <ToolStep
-          title="Settings"
-          isVisible={hasFiles}
-          isCollapsed={settingsCollapsed}
-          isCompleted={settingsCollapsed}
-          onCollapsedClick={settingsCollapsed ? handleSettingsReset : undefined}
-          completedMessage={settingsCollapsed ? "Compression completed" : undefined}
-          tooltip={compressTips}
-        >
-          <Stack gap="sm">
+        {steps.create("Settings", {
+          isCollapsed: settingsCollapsed,
+          isCompleted: hasResults,
+          onCollapsedClick: settingsCollapsed ? handleSettingsReset : undefined,
+          completedMessage: t("compress.header", "Compression completed"),
+          tooltip: compressTips
+        }, (
+          <Stack gap="md">
             <CompressSettings
               parameters={compressParams.parameters}
               onParameterChange={compressParams.updateParameter}
               disabled={endpointLoading}
             />
-
-            <OperationButton
+          </Stack>
+        ))}
+        <OperationButton
               onClick={handleCompress}
               isLoading={compressOperation.isLoading}
               disabled={!compressParams.validateParameters() || !hasFiles || !endpointEnabled}
               loadingText={t("loading")}
-              submitText="Compress and Review"
+              submitText={t("compress.submit", "Compress")}
             />
-          </Stack>
-        </ToolStep>
-
         {/* Results Step */}
-        <ToolStep
-          title="Results"
-          isVisible={hasResults}
-        >
-          <Stack gap="sm">
-            {compressOperation.status && (
-              <Text size="sm" c="dimmed">{compressOperation.status}</Text>
-            )}
-
-            <ErrorNotification
-              error={compressOperation.errorMessage}
-              onClose={compressOperation.clearError}
-            />
-
-            {compressOperation.downloadUrl && (
-              <Button
-                component="a"
-                href={compressOperation.downloadUrl}
-                download={compressOperation.downloadFilename}
-                leftSection={<DownloadIcon />}
-                color="green"
-                fullWidth
-                mb="md"
-              >
-                {t("download", "Download")}
-              </Button>
-            )}
-
-            <ResultsPreview
-              files={previewResults}
-              onFileClick={handleThumbnailClick}
-              isGeneratingThumbnails={compressOperation.isGeneratingThumbnails}
-              title="Compression Results"
-            />
-          </Stack>
-        </ToolStep>
-      </Stack>
-    </ToolStepContainer>
+        {steps.createResultsStep({
+          isVisible: hasResults,
+          operation: compressOperation,
+          title: t("compress.title", "Compression Results"),
+          onFileClick: handleThumbnailClick
+        })}
+      </ToolStepProvider>
+    </Stack>
   );
 }
 
diff --git a/frontend/src/tools/Convert.tsx b/frontend/src/tools/Convert.tsx
index 3512ca8eb..788c5aac8 100644
--- a/frontend/src/tools/Convert.tsx
+++ b/frontend/src/tools/Convert.tsx
@@ -1,16 +1,12 @@
-import React, { useEffect, useMemo, useRef } from "react";
-import { Button, Stack, Text } from "@mantine/core";
+import React, { useEffect, useRef } from "react";
+import { Stack } from "@mantine/core";
 import { useTranslation } from "react-i18next";
-import DownloadIcon from "@mui/icons-material/Download";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
 import { useFileContext } from "../contexts/FileContext";
 import { useToolFileSelection } from "../contexts/FileSelectionContext";
 
-import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep";
+import { createToolSteps, ToolStepProvider } from "../components/tools/shared/ToolStep";
 import OperationButton from "../components/tools/shared/OperationButton";
-import ErrorNotification from "../components/tools/shared/ErrorNotification";
-import FileStatusIndicator from "../components/tools/shared/FileStatusIndicator";
-import ResultsPreview from "../components/tools/shared/ResultsPreview";
 
 import ConvertSettings from "../components/tools/convert/ConvertSettings";
 
@@ -105,101 +101,55 @@ const Convert = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
     setCurrentMode('convert');
   };
 
-  const previewResults = useMemo(() =>
-    convertOperation.files?.map((file, index) => ({
-      file,
-      thumbnail: convertOperation.thumbnails[index]
-    })) || [],
-    [convertOperation.files, convertOperation.thumbnails]
-  );
+  const steps = createToolSteps();
 
   return (
     <div className="h-full max-h-screen overflow-y-auto" ref={scrollContainerRef}>
-      <ToolStepContainer>
-        <Stack gap="sm" p="sm">
-        <ToolStep
-          title={t("convert.files", "Files")}
-          isVisible={true}
-          isCollapsed={filesCollapsed}
-          isCompleted={filesCollapsed}
-          completedMessage={hasFiles ? `${selectedFiles.length} ${t("filesSelected", "files selected")}` : undefined}
-        >
-          <FileStatusIndicator
-            selectedFiles={selectedFiles}
-            placeholder={t("convert.selectFilesPlaceholder", "Select files in the main view to get started")}
-          />
-        </ToolStep>
+      <Stack gap="sm" p="sm">
+        <ToolStepProvider>
+          {/* Files Step */}
+          {steps.createFilesStep({
+            selectedFiles,
+            isCollapsed: filesCollapsed,
+            placeholder: t("convert.selectFilesPlaceholder", "Select files in the main view to get started")
+          })}
 
-        <ToolStep
-          title={t("convert.settings", "Settings")}
-          isVisible={true}
-          isCollapsed={settingsCollapsed}
-          isCompleted={settingsCollapsed}
-          onCollapsedClick={settingsCollapsed ? handleSettingsReset : undefined}
-          completedMessage={settingsCollapsed ? t("convert.conversionCompleted", "Conversion completed") : undefined}
-        >
-          <Stack gap="sm">
-            <ConvertSettings
-              parameters={convertParams.parameters}
-              onParameterChange={convertParams.updateParameter}
-              getAvailableToExtensions={convertParams.getAvailableToExtensions}
-              selectedFiles={selectedFiles}
-              disabled={endpointLoading}
-            />
-
-            {hasFiles && convertParams.parameters.fromExtension && convertParams.parameters.toExtension && (
-              <OperationButton
-                onClick={handleConvert}
-                isLoading={convertOperation.isLoading}
-                disabled={!convertParams.validateParameters() || !hasFiles || !endpointEnabled}
-                loadingText={t("convert.converting", "Converting...")}
-                submitText={t("convert.convertFiles", "Convert Files")}
-                data-testid="convert-button"
+          {/* Settings Step */}
+          {steps.create(t("convert.settings", "Settings"), {
+            isCollapsed: settingsCollapsed,
+            isCompleted: settingsCollapsed,
+            onCollapsedClick: settingsCollapsed ? handleSettingsReset : undefined,
+          }, (
+            <Stack gap="sm">
+              <ConvertSettings
+                parameters={convertParams.parameters}
+                onParameterChange={convertParams.updateParameter}
+                getAvailableToExtensions={convertParams.getAvailableToExtensions}
+                selectedFiles={selectedFiles}
+                disabled={endpointLoading}
               />
-            )}
-          </Stack>
-        </ToolStep>
+            </Stack>
+          ))}
+           {!hasResults && (
+                <OperationButton
+                  onClick={handleConvert}
+                  isLoading={convertOperation.isLoading}
+                  disabled={!convertParams.validateParameters() || !hasFiles || !endpointEnabled}
+                  loadingText={t("convert.converting", "Converting...")}
+                  submitText={t("convert.convertFiles", "Convert Files")}
+                  data-testid="convert-button"
+                />
+              )}
 
-        <ToolStep
-          title={t("convert.results", "Results")}
-          isVisible={hasResults}
-          data-testid="conversion-results"
-        >
-          <Stack gap="sm">
-            {convertOperation.status && (
-              <Text size="sm" c="dimmed">{convertOperation.status}</Text>
-            )}
-
-            <ErrorNotification
-              error={convertOperation.errorMessage}
-              onClose={convertOperation.clearError}
-            />
-
-            {convertOperation.downloadUrl && (
-              <Button
-                component="a"
-                href={convertOperation.downloadUrl}
-                download={convertOperation.downloadFilename || t("convert.defaultFilename", "converted_file")}
-                leftSection={<DownloadIcon />}
-                color="green"
-                fullWidth
-                mb="md"
-                data-testid="download-button"
-              >
-                {t("convert.downloadConverted", "Download Converted File")}
-              </Button>
-            )}
-
-            <ResultsPreview
-              files={previewResults}
-              onFileClick={handleThumbnailClick}
-              isGeneratingThumbnails={convertOperation.isGeneratingThumbnails}
-              title={t("convert.conversionResults", "Conversion Results")}
-            />
-          </Stack>
-        </ToolStep>
-        </Stack>
-      </ToolStepContainer>
+          {/* Results Step */}
+          {steps.createResultsStep({
+            isVisible: hasResults,
+            operation: convertOperation,
+            title: t("convert.conversionResults", "Conversion Results"),
+            onFileClick: handleThumbnailClick
+          })}
+        </ToolStepProvider>
+      </Stack>
     </div>
   );
 };
diff --git a/frontend/src/tools/OCR.tsx b/frontend/src/tools/OCR.tsx
index 92a8da132..8e033bb79 100644
--- a/frontend/src/tools/OCR.tsx
+++ b/frontend/src/tools/OCR.tsx
@@ -1,16 +1,12 @@
 import React, { useEffect, useMemo, useState } from "react";
-import { Button, Stack, Text, Box } from "@mantine/core";
+import { Stack, Box } from "@mantine/core";
 import { useTranslation } from "react-i18next";
-import DownloadIcon from "@mui/icons-material/Download";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
 import { useFileContext } from "../contexts/FileContext";
 import { useToolFileSelection } from "../contexts/FileSelectionContext";
 
-import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep";
+import { createToolSteps, ToolStepProvider } from "../components/tools/shared/ToolStep";
 import OperationButton from "../components/tools/shared/OperationButton";
-import ErrorNotification from "../components/tools/shared/ErrorNotification";
-import FileStatusIndicator from "../components/tools/shared/FileStatusIndicator";
-import ResultsPreview from "../components/tools/shared/ResultsPreview";
 
 import OCRSettings from "../components/tools/ocr/OCRSettings";
 import AdvancedOCRSettings from "../components/tools/ocr/AdvancedOCRSettings";
@@ -79,140 +75,80 @@ const OCR = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   };
 
 
-  // Step visibility and collapse logic
-  const filesVisible = true;
-  const settingsVisible = true;
   const resultsVisible = hasResults;
 
   const filesCollapsed = expandedStep !== 'files';
   const settingsCollapsed = expandedStep !== 'settings';
 
-  const previewResults = useMemo(() =>
-    ocrOperation.files?.map((file: File, index: number) => ({
-      file,
-      thumbnail: ocrOperation.thumbnails[index]
-    })) || [],
-    [ocrOperation.files, ocrOperation.thumbnails]
-  );
+
+  const steps = createToolSteps();
 
   return (
     <Stack gap="sm" h="100%" p="sm" style={{ overflow: 'auto' }}>
-      <ToolStepContainer>
+      <ToolStepProvider>
         {/* Files Step */}
-        <ToolStep
-          title="Files"
-          isVisible={filesVisible}
-          isCollapsed={hasFiles ? filesCollapsed : false}
-          isCompleted={hasFiles}
-          onCollapsedClick={undefined}
-          completedMessage={hasFiles && filesCollapsed ? 
-            selectedFiles.length === 1
-              ? `Selected: ${selectedFiles[0].name}`
-              : `Selected: ${selectedFiles.length} files`
-            : undefined}
-        >
-          <FileStatusIndicator
-            selectedFiles={selectedFiles}
-            placeholder="Select a PDF file in the main view to get started"
-          />
-        </ToolStep>
+        {steps.createFilesStep({
+          selectedFiles,
+          isCollapsed: hasFiles && filesCollapsed,
+        })}
 
         {/* Settings Step */}
-        <ToolStep
-          title="Settings"
-          isVisible={settingsVisible}
-          isCollapsed={settingsCollapsed}
-          isCompleted={hasFiles && hasValidSettings}
-          onCollapsedClick={() => {
+        {steps.create("Settings", {
+          isCollapsed: !hasFiles || settingsCollapsed,
+          isCompleted: hasFiles && hasValidSettings,
+          onCollapsedClick: () => {
             if (!hasFiles) return; // Only allow if files are selected
             setExpandedStep(expandedStep === 'settings' ? null : 'settings');
-          }}
-          completedMessage={hasFiles && hasValidSettings && settingsCollapsed ? "Basic settings configured" : undefined}
-          tooltip={ocrTips}
-        >
+          },
+          tooltip: ocrTips
+        }, (
           <Stack gap="sm">
             <OCRSettings
               parameters={ocrParams.parameters}
               onParameterChange={ocrParams.updateParameter}
               disabled={endpointLoading}
             />
-
           </Stack>
-        </ToolStep>
+        ))}
 
         {/* Advanced Step */}
-        <ToolStep
-          title="Advanced"
-          isVisible={true}
-          isCollapsed={expandedStep !== 'advanced'}
-          isCompleted={hasFiles && hasResults}
-          onCollapsedClick={() => {
+        {steps.create("Advanced", {
+          isCollapsed: expandedStep !== 'advanced',
+          isCompleted: hasFiles && hasResults,
+          onCollapsedClick: () => {
             if (!hasFiles) return; // Only allow if files are selected
             setExpandedStep(expandedStep === 'advanced' ? null : 'advanced');
-          }}
-          completedMessage={hasFiles && hasResults && expandedStep !== 'advanced' ? "OCR processing completed" : undefined}
-        >
+          },
+        }, (
           <AdvancedOCRSettings
             advancedOptions={ocrParams.parameters.additionalOptions}
             ocrRenderType={ocrParams.parameters.ocrRenderType}
             onParameterChange={ocrParams.updateParameter}
             disabled={endpointLoading}
           />
-        </ToolStep>
+        ))}
 
         {/* Process Button - Available after all configuration */}
         {hasValidSettings && !hasResults && (
-          <Box mt="md">
             <OperationButton
               onClick={handleOCR}
               isLoading={ocrOperation.isLoading}
               disabled={!ocrParams.validateParameters() || !hasFiles || !endpointEnabled}
               loadingText={t("loading")}
-              submitText="Process OCR and Review"
+              submitText={t("ocr.operation.submit", "Process OCR and Review")}
             />
-          </Box>
         )}
 
         {/* Results Step */}
-        <ToolStep
-          title="Results"
-          isVisible={resultsVisible}
-        >
-          <Stack gap="sm">
-            {ocrOperation.status && (
-              <Text size="sm" c="dimmed">{ocrOperation.status}</Text>
-            )}
-
-            <ErrorNotification
-              error={ocrOperation.errorMessage}
-              onClose={ocrOperation.clearError}
-            />
-
-            {ocrOperation.downloadUrl && (
-              <Button
-                component="a"
-                href={ocrOperation.downloadUrl}
-                download={ocrOperation.downloadFilename}
-                leftSection={<DownloadIcon />}
-                color="green"
-                fullWidth
-                mb="md"
-              >
-                {t("download", "Download")}
-              </Button>
-            )}
-
-            <ResultsPreview
-              files={previewResults}
-              onFileClick={handleThumbnailClick}
-              isGeneratingThumbnails={ocrOperation.isGeneratingThumbnails}
-              title="OCR Results"
-            />
-          </Stack>
-        </ToolStep>
-      </ToolStepContainer>
+        {steps.createResultsStep({
+          isVisible: resultsVisible,
+          operation: ocrOperation,
+          title: t("ocr.results.title", "OCR Results"),
+          onFileClick: handleThumbnailClick
+        })}
+      </ToolStepProvider>
     </Stack>
   );
 }
 
-export default OCR; 
\ No newline at end of file
+export default OCR;
diff --git a/frontend/src/tools/Split.tsx b/frontend/src/tools/Split.tsx
index bc516c754..abcc77dd9 100644
--- a/frontend/src/tools/Split.tsx
+++ b/frontend/src/tools/Split.tsx
@@ -1,16 +1,12 @@
 import React, { useEffect, useMemo } from "react";
-import { Button, Stack, Text } from "@mantine/core";
+import { Stack } from "@mantine/core";
 import { useTranslation } from "react-i18next";
-import DownloadIcon from "@mui/icons-material/Download";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
 import { useFileContext } from "../contexts/FileContext";
 import { useToolFileSelection } from "../contexts/FileSelectionContext";
 
-import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep";
+import { createToolSteps, ToolStepProvider } from "../components/tools/shared/ToolStep";
 import OperationButton from "../components/tools/shared/OperationButton";
-import ErrorNotification from "../components/tools/shared/ErrorNotification";
-import FileStatusIndicator from "../components/tools/shared/FileStatusIndicator";
-import ResultsPreview from "../components/tools/shared/ResultsPreview";
 import SplitSettings from "../components/tools/split/SplitSettings";
 
 import { useSplitParameters } from "../hooks/tools/split/useSplitParameters";
@@ -66,42 +62,26 @@ const Split = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   const hasFiles = selectedFiles.length > 0;
   const hasResults = splitOperation.downloadUrl !== null;
   const filesCollapsed = hasFiles;
-  const settingsCollapsed = hasResults;
+  const settingsCollapsed = !hasFiles || hasResults;
 
-  const previewResults = useMemo(() =>
-    splitOperation.files?.map((file, index) => ({
-      file,
-      thumbnail: splitOperation.thumbnails[index]
-    })) || [],
-    [splitOperation.files, splitOperation.thumbnails]
-  );
+  const steps = createToolSteps();
 
   return (
-    <ToolStepContainer>
-      <Stack gap="sm" h="100%" p="sm" style={{ overflow: 'auto' }}>
+    <Stack gap="sm" h="100%" p="sm" style={{ overflow: 'auto' }}>
+      <ToolStepProvider>
         {/* Files Step */}
-        <ToolStep
-          title="Files"
-          isVisible={true}
-          isCollapsed={filesCollapsed}
-          isCompleted={filesCollapsed}
-          completedMessage={hasFiles ? `Selected: ${selectedFiles[0]?.name}` : undefined}
-        >
-          <FileStatusIndicator
-            selectedFiles={selectedFiles}
-            placeholder="Select a PDF file in the main view to get started"
-          />
-        </ToolStep>
+        {steps.createFilesStep({
+          selectedFiles,
+          isCollapsed: filesCollapsed,
+          placeholder: "Select a PDF file in the main view to get started"
+        })}
 
         {/* Settings Step */}
-        <ToolStep
-          title="Settings"
-          isVisible={hasFiles}
-          isCollapsed={settingsCollapsed}
-          isCompleted={settingsCollapsed}
-          onCollapsedClick={settingsCollapsed ? handleSettingsReset : undefined}
-          completedMessage={settingsCollapsed ? "Split completed" : undefined}
-        >
+        {steps.create("Settings", {
+          isCollapsed: settingsCollapsed,
+          isCompleted: hasResults,
+          onCollapsedClick: hasResults ? handleSettingsReset : undefined,
+        }, (
           <Stack gap="sm">
             <SplitSettings
               parameters={splitParams.parameters}
@@ -109,57 +89,28 @@ const Split = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
               disabled={endpointLoading}
             />
 
-            {splitParams.parameters.mode && (
-              <OperationButton
-                onClick={handleSplit}
-                isLoading={splitOperation.isLoading}
-                disabled={!splitParams.validateParameters() || !hasFiles || !endpointEnabled}
-                loadingText={t("loading")}
-                submitText={t("split.submit", "Split PDF")}
-              />
-            )}
           </Stack>
-        </ToolStep>
+        ))}
+
+        {!hasResults && (
+        <OperationButton
+          onClick={handleSplit}
+          isLoading={splitOperation.isLoading}
+          disabled={!splitParams.validateParameters() || !hasFiles || !endpointEnabled}
+          loadingText={t("loading")}
+          submitText={t("split.submit", "Split PDF")}
+        />
+        )}
 
         {/* Results Step */}
-        <ToolStep
-          title="Results"
-          isVisible={hasResults}
-        >
-          <Stack gap="sm">
-            {splitOperation.status && (
-              <Text size="sm" c="dimmed">{splitOperation.status}</Text>
-            )}
-
-            <ErrorNotification
-              error={splitOperation.errorMessage}
-              onClose={splitOperation.clearError}
-            />
-
-            {splitOperation.downloadUrl && (
-              <Button
-                component="a"
-                href={splitOperation.downloadUrl}
-                download="split_output.zip"
-                leftSection={<DownloadIcon />}
-                color="green"
-                fullWidth
-                mb="md"
-              >
-                {t("download", "Download")}
-              </Button>
-            )}
-
-            <ResultsPreview
-              files={previewResults}
-              onFileClick={handleThumbnailClick}
-              isGeneratingThumbnails={splitOperation.isGeneratingThumbnails}
-              title="Split Results"
-            />
-          </Stack>
-        </ToolStep>
-      </Stack>
-    </ToolStepContainer>
+        {steps.createResultsStep({
+          isVisible: hasResults,
+          operation: splitOperation,
+          title: "Split Results",
+          onFileClick: handleThumbnailClick
+        })}
+      </ToolStepProvider>
+    </Stack>
   );
 }