diff --git a/frontend/src/components/tools/addStamp/useAddStampOperation.ts b/frontend/src/components/tools/addStamp/useAddStampOperation.ts
index fe67e9925..eb0894c0d 100644
--- a/frontend/src/components/tools/addStamp/useAddStampOperation.ts
+++ b/frontend/src/components/tools/addStamp/useAddStampOperation.ts
@@ -7,7 +7,7 @@ export const buildAddStampFormData = (parameters: AddStampParameters, file: File
   const formData = new FormData();
   formData.append('fileInput', file);
   formData.append('pageNumbers', parameters.pageNumbers);
-  formData.append('customMargin', 'medium'); 
+  formData.append('customMargin', parameters.customMargin || 'medium'); 
   formData.append('position', String(parameters.position));
   const effectiveFontSize = parameters.fontSize;
   formData.append('fontSize', String(effectiveFontSize));
@@ -34,7 +34,6 @@ export const addStampOperationConfig = {
   buildFormData: buildAddStampFormData,
   operationType: 'stamp',
   endpoint: '/api/v1/misc/add-stamp',
-  filePrefix: 'stamped_',
   defaultParameters,
 } as const;
 
@@ -43,7 +42,6 @@ export const useAddStampOperation = () => {
 
   return useToolOperation<AddStampParameters>({
     ...addStampOperationConfig,
-    filePrefix: t('stamp.filenamePrefix', 'stamped') + '_',
     getErrorMessage: createStandardErrorHandler(
       t('AddStampRequest.error.failed', 'An error occurred while adding stamp to the PDF.')
     ),
diff --git a/frontend/src/tools/AddStamp.tsx b/frontend/src/tools/AddStamp.tsx
index 3ff6aa480..850c25542 100644
--- a/frontend/src/tools/AddStamp.tsx
+++ b/frontend/src/tools/AddStamp.tsx
@@ -323,6 +323,23 @@ const AddStamp = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
           )}
 
 
+          {/* 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; when in quick mode, overlay grid inside preview */}
           <StampPreview
             parameters={params.parameters}