diff --git a/frontend/src/app/useManagementModals.tsx b/frontend/src/app/useManagementModals.tsx
index 461bd24..159dfda 100644
--- a/frontend/src/app/useManagementModals.tsx
+++ b/frontend/src/app/useManagementModals.tsx
@@ -3,6 +3,7 @@ import type { ReactNode } from 'react';
 import TagsPanel from '../tags/TagsPanel';
 import CorrespondentsPanel, { CorrespondentsPanelProps } from '../correspondents/CorrespondentsPanel';
 import PanelHeader from '../ui/PanelHeader';
+import { CloseIcon } from '../ui/icons';
 
 const TAGS_MODAL = 'tags';
 const CORRESPONDENTS_MODAL = 'correspondents';
@@ -106,8 +107,8 @@ export const useManagementModals = ({
             titleTag="h3"
             titleProps={{ id: 'tags-modal-title' }}
             actions={(
-              <button type="button" className="secondary" onClick={closeActiveModal}>
-                Close
+              <button type="button" className="icon-button" onClick={closeActiveModal} aria-label="Close">
+                <CloseIcon size={16} />
               </button>
             )}
           />
@@ -188,8 +189,8 @@ export const useManagementModals = ({
             titleTag="h3"
             titleProps={{ id: 'correspondents-modal-title' }}
             actions={(
-              <button type="button" className="secondary" onClick={closeActiveModal}>
-                Close
+              <button type="button" className="icon-button" onClick={closeActiveModal} aria-label="Close">
+                <CloseIcon size={16} />
               </button>
             )}
           />
diff --git a/frontend/src/settings/SettingsModal.tsx b/frontend/src/settings/SettingsModal.tsx
index 4e7020d..aa297af 100644
--- a/frontend/src/settings/SettingsModal.tsx
+++ b/frontend/src/settings/SettingsModal.tsx
@@ -6,6 +6,7 @@ import React, {
   useState,
 } from 'react';
 import PanelHeader from '../ui/PanelHeader';
+import { CloseIcon } from '../ui/icons';
 import { DEFAULT_SETTINGS_SECTIONS } from './sections';
 
 export interface SettingsSectionConfig {
@@ -91,8 +92,8 @@ const SettingsModal: React.FC<SettingsModalProps> = ({
           titleTag="h3"
           titleProps={{ id: 'settings-modal-title' }}
           actions={(
-            <button type="button" className="secondary" onClick={onClose}>
-              Close
+            <button type="button" className="icon-button" onClick={onClose} aria-label="Close">
+              <CloseIcon size={16} />
             </button>
           )}
         />