diff --git a/frontend/public/locales/en-GB/translation.json b/frontend/public/locales/en-GB/translation.json
index 7d0949618..314169a8d 100644
--- a/frontend/public/locales/en-GB/translation.json
+++ b/frontend/public/locales/en-GB/translation.json
@@ -1906,6 +1906,11 @@
     "title": "Compress",
     "desc": "Compress PDFs to reduce their file size.",
     "header": "Compress PDF",
+    "method": {
+      "title": "Compression Method",
+      "quality": "Quality",
+      "filesize": "File Size"
+    },
     "credit": "This service uses qpdf for PDF Compress/Optimisation.",
     "grayscale": {
       "label": "Apply Grayscale for Compression"
diff --git a/frontend/src/components/shared/ButtonSelector.tsx b/frontend/src/components/shared/ButtonSelector.tsx
new file mode 100644
index 000000000..9837ea433
--- /dev/null
+++ b/frontend/src/components/shared/ButtonSelector.tsx
@@ -0,0 +1,49 @@
+import { Button } from "@mantine/core";
+
+export interface ButtonOption<T> {
+  value: T;
+  label: string;
+  disabled?: boolean;
+}
+
+interface ButtonSelectorProps<T> {
+  value: T | undefined;
+  onChange: (value: T) => void;
+  options: ButtonOption<T>[];
+  disabled?: boolean;
+  fullWidth?: boolean;
+}
+
+const ButtonSelector = <T extends string>({
+  value,
+  onChange,
+  options,
+  disabled = false,
+  fullWidth = true,
+}: ButtonSelectorProps<T>) => {
+  return (
+    <div style={{ display: 'flex', gap: '4px' }}>
+      {options.map((option) => (
+        <Button
+          key={option.value}
+          variant={value === option.value ? 'filled' : 'outline'}
+          color={value === option.value ? 'blue' : 'var(--text-muted)'}
+          onClick={() => onChange(option.value)}
+          disabled={disabled || option.disabled}
+          style={{
+            flex: fullWidth ? 1 : undefined,
+            height: 'auto',
+            minHeight: '40px',
+            fontSize: '11px'
+          }}
+        >
+          <div style={{ textAlign: 'center', lineHeight: '1.1', fontSize: '11px' }}>
+            {option.label}
+          </div>
+        </Button>
+      ))}
+    </div>
+  );
+};
+
+export default ButtonSelector;
diff --git a/frontend/src/components/tools/addWatermark/WatermarkTypeSettings.tsx b/frontend/src/components/tools/addWatermark/WatermarkTypeSettings.tsx
index 04949c27c..d55037a17 100644
--- a/frontend/src/components/tools/addWatermark/WatermarkTypeSettings.tsx
+++ b/frontend/src/components/tools/addWatermark/WatermarkTypeSettings.tsx
@@ -1,5 +1,6 @@
-import { Button, Stack } from "@mantine/core";
+import { Stack } from "@mantine/core";
 import { useTranslation } from "react-i18next";
+import ButtonSelector from "../../shared/ButtonSelector";
 
 interface WatermarkTypeSettingsProps {
   watermarkType?: 'text' | 'image';
@@ -10,32 +11,25 @@ interface WatermarkTypeSettingsProps {
 const WatermarkTypeSettings = ({ watermarkType, onWatermarkTypeChange, disabled = false }: WatermarkTypeSettingsProps) => {
   const { t } = useTranslation();
 
+  const options = [
+    {
+      value: 'text' as const,
+      label: t('watermark.watermarkType.text', 'Text')
+    },
+    {
+      value: 'image' as const,
+      label: t('watermark.watermarkType.image', 'Image')
+    }
+  ];
+
   return (
     <Stack gap="sm">
-      <div style={{ display: 'flex', gap: '4px' }}>
-        <Button
-          variant={watermarkType === 'text' ? 'filled' : 'outline'}
-          color={watermarkType === 'text' ? 'blue' : 'var(--text-muted)'}
-          onClick={() => onWatermarkTypeChange('text')}
-          disabled={disabled}
-          style={{ flex: 1, height: 'auto', minHeight: '40px', fontSize: '11px' }}
-        >
-          <div style={{ textAlign: 'center', lineHeight: '1.1', fontSize: '11px' }}>
-            {t('watermark.watermarkType.text', 'Text')}
-          </div>
-        </Button>
-        <Button
-          variant={watermarkType === 'image' ? 'filled' : 'outline'}
-          color={watermarkType === 'image' ? 'blue' : 'var(--text-muted)'}
-          onClick={() => onWatermarkTypeChange('image')}
-          disabled={disabled}
-          style={{ flex: 1, height: 'auto', minHeight: '40px', fontSize: '11px' }}
-        >
-          <div style={{ textAlign: 'center', lineHeight: '1.1', fontSize: '11px' }}>
-            {t('watermark.watermarkType.image', 'Image')}
-          </div>
-        </Button>
-      </div>
+      <ButtonSelector
+        value={watermarkType}
+        onChange={onWatermarkTypeChange}
+        options={options}
+        disabled={disabled}
+      />
     </Stack>
   );
 };
diff --git a/frontend/src/components/tools/compress/CompressSettings.tsx b/frontend/src/components/tools/compress/CompressSettings.tsx
index 42d270abb..11706a6c0 100644
--- a/frontend/src/components/tools/compress/CompressSettings.tsx
+++ b/frontend/src/components/tools/compress/CompressSettings.tsx
@@ -1,7 +1,8 @@
 import React, { useState } from "react";
-import { Button, Stack, Text, NumberInput, Select, Divider } from "@mantine/core";
+import { Stack, Text, NumberInput, Select, Divider } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import { CompressParameters } from "../../../hooks/tools/compress/useCompressParameters";
+import ButtonSelector from "../../shared/ButtonSelector";
 
 interface CompressSettingsProps {
   parameters: CompressParameters;
@@ -19,31 +20,16 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
       <Divider ml='-md'></Divider>
       {/* Compression Method */}
       <Stack gap="sm">
-        <Text size="sm" fw={500}>Compression Method</Text>
-        <div style={{ display: 'flex', gap: '4px' }}>
-          <Button
-            variant={parameters.compressionMethod === 'quality' ? 'filled' : 'outline'}
-            color={parameters.compressionMethod === 'quality' ? 'blue' : 'var(--text-muted)'}
-            onClick={() => onParameterChange('compressionMethod', 'quality')}
-            disabled={disabled}
-            style={{ flex: 1, height: 'auto', minHeight: '40px', fontSize: '11px' }}
-          >
-            <div style={{ textAlign: 'center', lineHeight: '1.1', fontSize: '11px' }}>
-              Quality
-            </div>
-          </Button>
-          <Button
-            variant={parameters.compressionMethod === 'filesize' ? 'filled' : 'outline'}
-            color={parameters.compressionMethod === 'filesize' ? 'blue' : 'var(--text-muted)'}
-            onClick={() => onParameterChange('compressionMethod', 'filesize')}
-            disabled={disabled}
-            style={{ flex: 1, height: 'auto', minHeight: '40px', fontSize: '11px' }}
-          >
-            <div style={{ textAlign: 'center', lineHeight: '1.1', fontSize: '11px' }}>
-              File Size
-            </div>
-          </Button>
-        </div>
+        <Text size="sm" fw={500}>{t('compress.method.title', 'Compression Method')}</Text>
+        <ButtonSelector
+          value={parameters.compressionMethod}
+          onChange={(value) => onParameterChange('compressionMethod', value)}
+          options={[
+            { value: 'quality', label: t('compress.method.quality', 'Quality') },
+            { value: 'filesize', label: t('compress.method.filesize', 'File Size') },
+          ]}
+          disabled={disabled}
+        />
       </Stack>
 
       {/* Quality Adjustment */}
diff --git a/frontend/src/components/tools/redact/RedactModeSelector.tsx b/frontend/src/components/tools/redact/RedactModeSelector.tsx
index 03e872ad5..2ca1b39c2 100644
--- a/frontend/src/components/tools/redact/RedactModeSelector.tsx
+++ b/frontend/src/components/tools/redact/RedactModeSelector.tsx
@@ -1,6 +1,7 @@
 import { useTranslation } from 'react-i18next';
-import { Button, Stack, Text } from '@mantine/core';
+import { Stack, Text } from '@mantine/core';
 import { RedactMode } from '../../../hooks/tools/redact/useRedactParameters';
+import ButtonSelector from '../../shared/ButtonSelector';
 
 interface RedactModeSelectorProps {
   mode: RedactMode;
@@ -11,36 +12,30 @@ interface RedactModeSelectorProps {
 export default function RedactModeSelector({ mode, onModeChange, disabled }: RedactModeSelectorProps) {
   const { t } = useTranslation();
 
+  const options = [
+    {
+      value: 'automatic' as const,
+      label: t('redact.modeSelector.automatic', 'Automatic')
+    },
+    {
+      value: 'manual' as const,
+      label: t('redact.modeSelector.manual', 'Manual'),
+      disabled: true // Keep manual mode disabled until implemented
+    }
+  ];
+
   return (
     <Stack gap="sm">
       <Text size="sm" fw={600}>
         {t('redact.modeSelector.mode', 'Mode')}
       </Text>
 
-      <div style={{ display: 'flex', gap: '4px' }}>
-        <Button
-          variant={mode === 'automatic' ? 'filled' : 'outline'}
-          color={mode === 'automatic' ? 'blue' : 'var(--text-muted)'}
-          onClick={() => onModeChange('automatic')}
-          disabled={disabled}
-          style={{ flex: 1, height: 'auto', minHeight: '40px', fontSize: '11px' }}
-        >
-          <div style={{ textAlign: 'center', lineHeight: '1.1', fontSize: '11px' }}>
-            {t('redact.modeSelector.automatic', 'Automatic')}
-          </div>
-        </Button>
-        <Button
-          variant={mode === 'manual' ? 'filled' : 'outline'}
-          color={mode === 'manual' ? 'blue' : 'var(--text-muted)'}
-          onClick={() => onModeChange('manual')}
-          disabled={disabled || true} // Keep manual disabled until implemented
-          style={{ flex: 1, height: 'auto', minHeight: '40px', fontSize: '11px' }}
-        >
-          <div style={{ textAlign: 'center', lineHeight: '1.1', fontSize: '11px' }}>
-            {t('redact.modeSelector.manual', 'Manual')}
-          </div>
-        </Button>
-      </div>
+      <ButtonSelector
+        value={mode}
+        onChange={onModeChange}
+        options={options}
+        disabled={disabled}
+      />
     </Stack>
   );
 }