diff --git a/app/api/settings/route.ts b/app/api/settings/route.ts
index 6ec0818..a0c7883 100644
--- a/app/api/settings/route.ts
+++ b/app/api/settings/route.ts
@@ -1,5 +1,6 @@
 import { auth } from '@/auth';
 import { query } from '@/lib/db';
+import { DEFAULT_FONT_ID, isFontId, type FontId } from '@/lib/fonts';
 import { logRouteOutcome, type LogFields } from '@/lib/log';
 import { getRequestId, jsonResponse, PRIVATE_NO_STORE, readContentLength } from '@/lib/request';
 import { LIMITS, validateSettingsRequest } from '@/lib/validation';
@@ -9,12 +10,14 @@ type SettingsRow = {
   save_history: boolean;
   key_jwk: string | null;
   girl_mode?: boolean;
+  font_family?: string | null;
 };
 
 type SettingsPatch = {
   systemPrompt: string | null;
   saveHistory: boolean | null;
   girlMode: boolean | null;
+  font: FontId | null;
   keyJwk: string | null;
 };
 
@@ -26,45 +29,89 @@ function isPlainObject(value: unknown): value is Record<string, unknown> {
   return !!value && typeof value === 'object' && !Array.isArray(value);
 }
 
-function isMissingGirlModeColumn(error: unknown): boolean {
+function isMissingColumn(error: unknown, column: string): boolean {
   if (!error || typeof error !== 'object') return false;
   const candidate = error as { code?: string; message?: string };
   const message = candidate.message ?? String(error);
-  return candidate.code === '42703' && message.includes('girl_mode');
+  return candidate.code === '42703' && message.includes(column);
 }
 
-async function getSettingsRow(email: string): Promise<{ row?: SettingsRow; legacySchema: boolean }> {
+async function getSettingsRow(email: string): Promise<{ row?: SettingsRow; legacySchema: boolean; hasFontColumn: boolean }> {
   try {
     const result = await query(
-      'SELECT system_prompt, save_history, key_jwk, girl_mode FROM user_settings WHERE email = $1',
+      'SELECT system_prompt, save_history, key_jwk, girl_mode, font_family FROM user_settings WHERE email = $1',
       [email],
     );
-    return { row: result.rows[0] as SettingsRow | undefined, legacySchema: false };
+    return { row: result.rows[0] as SettingsRow | undefined, legacySchema: false, hasFontColumn: true };
   } catch (error) {
-    if (!isMissingGirlModeColumn(error)) throw error;
+    if (isMissingColumn(error, 'font_family')) {
+      try {
+        const result = await query(
+          'SELECT system_prompt, save_history, key_jwk, girl_mode FROM user_settings WHERE email = $1',
+          [email],
+        );
+        return { row: result.rows[0] as SettingsRow | undefined, legacySchema: false, hasFontColumn: false };
+      } catch (fallbackError) {
+        if (!isMissingColumn(fallbackError, 'girl_mode')) throw fallbackError;
+        const result = await query(
+          'SELECT system_prompt, save_history, key_jwk FROM user_settings WHERE email = $1',
+          [email],
+        );
+        return { row: result.rows[0] as SettingsRow | undefined, legacySchema: true, hasFontColumn: false };
+      }
+    }
+    if (!isMissingColumn(error, 'girl_mode')) throw error;
     const result = await query(
       'SELECT system_prompt, save_history, key_jwk FROM user_settings WHERE email = $1',
       [email],
     );
-    return { row: result.rows[0] as SettingsRow | undefined, legacySchema: true };
+    return { row: result.rows[0] as SettingsRow | undefined, legacySchema: true, hasFontColumn: false };
   }
 }
 
-async function upsertSettingsRow(email: string, patch: SettingsPatch): Promise<{ legacySchema: boolean }> {
+async function upsertSettingsRow(email: string, patch: SettingsPatch): Promise<{ legacySchema: boolean; hasFontColumn: boolean }> {
   try {
     await query(
-      `INSERT INTO user_settings (email, system_prompt, save_history, key_jwk, girl_mode)
-       VALUES ($1, COALESCE($2, ''), COALESCE($3, FALSE), $4, COALESCE($5, FALSE))
+      `INSERT INTO user_settings (email, system_prompt, save_history, key_jwk, girl_mode, font_family)
+       VALUES ($1, COALESCE($2, ''), COALESCE($3, FALSE), $4, COALESCE($5, FALSE), COALESCE($6, '${DEFAULT_FONT_ID}'))
        ON CONFLICT (email) DO UPDATE SET
           system_prompt = COALESCE($2, user_settings.system_prompt),
           save_history  = COALESCE($3, user_settings.save_history),
           key_jwk       = COALESCE($4, user_settings.key_jwk),
-          girl_mode     = COALESCE($5, user_settings.girl_mode)`,
-      [email, patch.systemPrompt, patch.saveHistory, patch.keyJwk, patch.girlMode],
+          girl_mode     = COALESCE($5, user_settings.girl_mode),
+          font_family   = COALESCE($6, user_settings.font_family)`,
+      [email, patch.systemPrompt, patch.saveHistory, patch.keyJwk, patch.girlMode, patch.font],
     );
-    return { legacySchema: false };
+    return { legacySchema: false, hasFontColumn: true };
   } catch (error) {
-    if (!isMissingGirlModeColumn(error)) throw error;
+    if (isMissingColumn(error, 'font_family')) {
+      try {
+        await query(
+          `INSERT INTO user_settings (email, system_prompt, save_history, key_jwk, girl_mode)
+           VALUES ($1, COALESCE($2, ''), COALESCE($3, FALSE), $4, COALESCE($5, FALSE))
+           ON CONFLICT (email) DO UPDATE SET
+              system_prompt = COALESCE($2, user_settings.system_prompt),
+              save_history  = COALESCE($3, user_settings.save_history),
+              key_jwk       = COALESCE($4, user_settings.key_jwk),
+              girl_mode     = COALESCE($5, user_settings.girl_mode)`,
+          [email, patch.systemPrompt, patch.saveHistory, patch.keyJwk, patch.girlMode],
+        );
+        return { legacySchema: false, hasFontColumn: false };
+      } catch (fallbackError) {
+        if (!isMissingColumn(fallbackError, 'girl_mode')) throw fallbackError;
+        await query(
+          `INSERT INTO user_settings (email, system_prompt, save_history, key_jwk)
+           VALUES ($1, COALESCE($2, ''), COALESCE($3, FALSE), $4)
+           ON CONFLICT (email) DO UPDATE SET
+              system_prompt = COALESCE($2, user_settings.system_prompt),
+              save_history  = COALESCE($3, user_settings.save_history),
+              key_jwk       = COALESCE($4, user_settings.key_jwk)`,
+          [email, patch.systemPrompt, patch.saveHistory, patch.keyJwk],
+        );
+        return { legacySchema: true, hasFontColumn: false };
+      }
+    }
+    if (!isMissingColumn(error, 'girl_mode')) throw error;
     await query(
       `INSERT INTO user_settings (email, system_prompt, save_history, key_jwk)
        VALUES ($1, COALESCE($2, ''), COALESCE($3, FALSE), $4)
@@ -74,7 +121,7 @@ async function upsertSettingsRow(email: string, patch: SettingsPatch): Promise<{
           key_jwk       = COALESCE($4, user_settings.key_jwk)`,
       [email, patch.systemPrompt, patch.saveHistory, patch.keyJwk],
     );
-    return { legacySchema: true };
+    return { legacySchema: true, hasFontColumn: false };
   }
 }
 
@@ -88,6 +135,8 @@ export async function GET(req: Request) {
     hasKey: null,
     saveHistory: null,
     girlMode: null,
+    font: null,
+    hasFontColumn: null,
     legacySchema: null,
     newUser: null,
     error: null,
@@ -102,16 +151,21 @@ export async function GET(req: Request) {
     }
     ctx.user = session.user.email;
 
-    const { row, legacySchema } = await getSettingsRow(session.user.email);
+    const { row, legacySchema, hasFontColumn } = await getSettingsRow(session.user.email);
+    const savedFont = row?.font_family ?? null;
+    const font = savedFont && isFontId(savedFont) ? savedFont : DEFAULT_FONT_ID;
     ctx.status = 200;
     ctx.hasKey = !!row?.key_jwk;
     ctx.saveHistory = row?.save_history ?? false;
     ctx.girlMode = legacySchema ? null : (row?.girl_mode ?? false);
+    ctx.font = font;
+    ctx.hasFontColumn = hasFontColumn;
     ctx.legacySchema = legacySchema;
     ctx.newUser = !row;
     return jsonResponse({
       systemPrompt: row?.system_prompt ?? '',
       saveHistory: row?.save_history ?? false,
+      font,
       ...(legacySchema ? {} : { girlMode: row?.girl_mode ?? false }),
       keyJwk: row?.key_jwk ?? null,
     }, {}, { requestId, cacheControl: PRIVATE_NO_STORE });
@@ -137,12 +191,15 @@ export async function PUT(req: Request) {
     hasSystemPromptField: null,
     hasSaveHistoryField: null,
     hasGirlModeField: null,
+    hasFontField: null,
     hasKeyJwkField: null,
     systemPromptChars: null,
     keyJwkChars: null,
     saveHistory: null,
     girlMode: null,
+    font: null,
     hasKey: null,
+    hasFontColumn: null,
     legacySchema: null,
     error: null,
   };
@@ -168,6 +225,7 @@ export async function PUT(req: Request) {
       ctx.hasSystemPromptField = hasOwn(body, 'systemPrompt');
       ctx.hasSaveHistoryField = hasOwn(body, 'saveHistory');
       ctx.hasGirlModeField = hasOwn(body, 'girlMode');
+      ctx.hasFontField = hasOwn(body, 'font');
       ctx.hasKeyJwkField = hasOwn(body, 'keyJwk');
       ctx.systemPromptChars = typeof body.systemPrompt === 'string' ? body.systemPrompt.length : null;
       ctx.keyJwkChars = typeof body.keyJwk === 'string' ? body.keyJwk.length : null;
@@ -184,6 +242,7 @@ export async function PUT(req: Request) {
       systemPrompt: hasOwn(input, 'systemPrompt') ? parsed.value.systemPrompt : null,
       saveHistory: hasOwn(input, 'saveHistory') ? parsed.value.saveHistory : null,
       girlMode: hasOwn(input, 'girlMode') ? parsed.value.girlMode : null,
+      font: hasOwn(input, 'font') ? parsed.value.font : null,
       keyJwk: hasOwn(input, 'keyJwk') ? parsed.value.keyJwk : null,
     };
 
@@ -191,11 +250,14 @@ export async function PUT(req: Request) {
     ctx.keyJwkChars = patch.keyJwk === null ? ctx.keyJwkChars : patch.keyJwk.length;
     ctx.saveHistory = patch.saveHistory;
     ctx.girlMode = patch.girlMode;
+    ctx.font = patch.font;
     ctx.hasKey = patch.keyJwk === null ? null : patch.keyJwk.length > 0;
 
-    const { legacySchema } = await upsertSettingsRow(session.user.email, patch);
+    const { legacySchema, hasFontColumn } = await upsertSettingsRow(session.user.email, patch);
     ctx.status = 204;
     ctx.girlMode = legacySchema ? null : patch.girlMode;
+    ctx.font = hasFontColumn ? patch.font : null;
+    ctx.hasFontColumn = hasFontColumn;
     ctx.legacySchema = legacySchema;
     return new Response(null, {
       status: 204,
diff --git a/app/globals.css b/app/globals.css
index 26fddc6..a2400d4 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -4,6 +4,7 @@
   --bg: #0c0c0c;
   --body-bg: var(--bg);
   --fg: #c8c8c8;
+  --app-font-family: 'Courier New', Courier, monospace;
   --assistant-fg: #e0e0e0;
   --green: #33ff33;
   --blue: #5599ff;
@@ -83,7 +84,7 @@ body {
   isolation: isolate;
   background: var(--body-bg);
   color: var(--fg);
-  font-family: 'Courier New', Courier, monospace;
+  font-family: var(--app-font-family);
   font-size: 14px;
   line-height: 1.6;
 }
@@ -157,6 +158,8 @@ header {
   border-bottom: 1px solid var(--border);
   background: var(--surface);
   flex-shrink: 0;
+  position: relative;
+  z-index: 3;
 }
 
 .logo {
@@ -269,6 +272,8 @@ header select option {
   gap: 8px;
   flex-shrink: 0;
   box-shadow: var(--panel-shadow);
+  position: relative;
+  z-index: 2;
 }
 
 .settings-row {
@@ -412,6 +417,7 @@ header select option {
   flex: 1;
   position: relative;
   min-height: 0;
+  z-index: 1;
 }
 
 .messages {
@@ -691,6 +697,8 @@ header select option {
   flex-shrink: 0;
   gap: 8px;
   box-shadow: inset 0 1px 0 var(--accent-glow-soft);
+  position: relative;
+  z-index: 2;
 }
 
 .pending-attachments {
@@ -921,7 +929,7 @@ header select option {
   background: var(--code-bg);
   color: var(--assistant-fg);
   padding: 1px 5px;
-  font-family: 'Courier New', monospace;
+  font-family: var(--app-font-family);
   font-size: 0.9em;
   border: 1px solid var(--code-border);
 }
diff --git a/app/page.tsx b/app/page.tsx
index 44d9fc9..2bc1c93 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -5,6 +5,7 @@ import { signOut } from 'next-auth/react';
 import RenderedMarkdown from './rendered-markdown';
 import { renderMarkdown } from '@/lib/markdown';
 import { getOrCreateKey, encrypt, decrypt } from '@/lib/crypto';
+import { DEFAULT_FONT_ID, FONTS, getFontFamily, isFontId, type FontId } from '@/lib/fonts';
 import { MODELS } from '@/lib/models';
 import { splitMessageFollowups, type Role, type Image, type Pdf, type Message } from '@/lib/chat';
 import { LIMITS } from '@/lib/validation';
@@ -14,6 +15,7 @@ type PendingPdf  = Pdf;
 
 const MODEL_KEY    = 'gippidy-model';
 const KEY_WARNED   = 'gippidy-key-warned';
+const FONT_KEY     = 'gippidy-font';
 const GIRL_MODE_KEY = 'gippidy-girl-mode';
 const ACTIVE_HISTORY_CHAT_KEY = 'gippidy-active-history-chat';
 const HISTORY_PREVIEW_CACHE_KEY = 'gippidy-history-preview-cache';
@@ -50,7 +52,7 @@ type HistoryRestoreResult =
   | { kind: 'ok'; item: HistoryItem }
   | { kind: 'missing' }
   | { kind: 'error' };
-type SettingsPatch = { systemPrompt?: string; saveHistory?: boolean; girlMode?: boolean; keyJwk?: string | null };
+type SettingsPatch = { systemPrompt?: string; saveHistory?: boolean; girlMode?: boolean; font?: FontId; keyJwk?: string | null };
 type PendingSettings = Omit<SettingsPatch, 'keyJwk'>;
 
 function withRenderedHtml(message: Message): Message {
@@ -126,6 +128,10 @@ function setGirlModeDom(enabled: boolean) {
   else document.documentElement.removeAttribute(GIRL_MODE_ATTR);
 }
 
+function setFontDom(font: FontId) {
+  document.documentElement.style.setProperty('--app-font-family', getFontFamily(font));
+}
+
 function isBuiltInDefaultSystemPrompt(prompt: string): boolean {
   return (
     prompt === '' ||
@@ -243,6 +249,7 @@ export default function Home() {
   const webSearchPhaseRef = useRef<'off' | 'searching' | 'generating'>('off');
   const [saveHistory, setSaveHistory]           = useState(false);
   const [girlMode, setGirlMode]                 = useState(false);
+  const [font, setFont]                         = useState<FontId>(DEFAULT_FONT_ID);
   const [showHistory, setShowHistory]           = useState(false);
   const [historyItems, setHistoryItems]         = useState<HistoryPreview[]>([]);
   const [historyLoading, setHistoryLoading]     = useState(false);
@@ -281,6 +288,7 @@ export default function Home() {
   const systemPromptRef = useRef(systemPrompt);
   const saveHistoryRef  = useRef(saveHistory);
   const girlModeRef     = useRef(girlMode);
+  const fontRef         = useRef(font);
   const chatStateVersionRef = useRef(0);
   const initialSettingsLoadedRef = useRef(false);
   const pendingSettingsRef = useRef<PendingSettings>({});
@@ -298,6 +306,10 @@ export default function Home() {
     girlModeRef.current = girlMode;
   }, [girlMode]);
 
+  useEffect(() => {
+    fontRef.current = font;
+  }, [font]);
+
   useEffect(() => () => {
     if (saveSettingsTimer.current) clearTimeout(saveSettingsTimer.current);
     if (streamingHtmlTimerRef.current) clearTimeout(streamingHtmlTimerRef.current);
@@ -367,6 +379,13 @@ export default function Home() {
     setGirlModeDom(enabled);
   };
 
+  const applyFont = (nextFont: FontId) => {
+    fontRef.current = nextFont;
+    setFont(nextFont);
+    localStorage.setItem(FONT_KEY, nextFont);
+    setFontDom(nextFont);
+  };
+
   const rememberActiveHistoryChat = (id: string | null) => {
     if (id) localStorage.setItem(ACTIVE_HISTORY_CHAT_KEY, id);
     else localStorage.removeItem(ACTIVE_HISTORY_CHAT_KEY);
@@ -591,6 +610,8 @@ export default function Home() {
   useEffect(() => {
     const saved = localStorage.getItem(MODEL_KEY);
     if (saved) setModel(saved);
+    const savedFont = localStorage.getItem(FONT_KEY);
+    if (savedFont && isFontId(savedFont)) applyFont(savedFont);
     const savedGirlMode = localStorage.getItem(GIRL_MODE_KEY);
     const activeHistoryChatId = localStorage.getItem(ACTIVE_HISTORY_CHAT_KEY);
     if (savedGirlMode === '1' || savedGirlMode === '0') {
@@ -630,10 +651,11 @@ export default function Home() {
         if (!r.ok) throw new Error(`settings_get_${r.status}`);
         return r.json();
       })
-      .then(async ({ systemPrompt, saveHistory: sh, girlMode: gm, keyJwk }) => {
+      .then(async ({ systemPrompt, saveHistory: sh, girlMode: gm, font: fo, keyJwk }) => {
         const pending = pendingSettingsRef.current;
         const nextSaveHistory = pending.saveHistory ?? Boolean(sh);
         const nextGirlMode = pending.girlMode ?? (typeof gm === 'boolean' ? gm : girlModeRef.current);
+        const nextFont = pending.font ?? (isFontId(fo) ? fo : fontRef.current);
         const rawSystemPrompt = pending.systemPrompt ?? (systemPrompt ?? '');
         const nextSystemPrompt = resolveDefaultSystemPrompt(rawSystemPrompt, nextGirlMode);
 
@@ -645,6 +667,7 @@ export default function Home() {
         saveHistoryRef.current = nextSaveHistory;
         setSaveHistory(nextSaveHistory);
         applyGirlMode(nextGirlMode);
+        applyFont(nextFont);
         // Load or create the encryption key (shared across all deployments via DB)
         const { key, jwk } = await getOrCreateKey(keyJwk ?? null);
         cryptoKeyRef.current = key;
@@ -757,6 +780,16 @@ export default function Home() {
     persistSettings({ systemPrompt: s });
   };
 
+  const handleFontChange = (nextFont: string) => {
+    if (!isFontId(nextFont)) {
+      logClientEvent('settings.invalid_font', 'warn', { font: nextFont });
+      return;
+    }
+    applyFont(nextFont);
+    rememberPendingSettings({ font: nextFont });
+    persistSettings({ font: nextFont }, true);
+  };
+
   const handleToggleSaveHistory = (val: boolean) => {
     saveHistoryRef.current = val;
     setSaveHistory(val);
@@ -1258,6 +1291,14 @@ export default function Home() {
               ))}
             </select>
           </div>
+          <div className="settings-row">
+            <label>Font</label>
+            <select value={font} onChange={e => handleFontChange(e.target.value)}>
+              {FONTS.map(option => (
+                <option key={option.id} value={option.id}>{option.label}</option>
+              ))}
+            </select>
+          </div>
           <div className="settings-row">
             <label>System Prompt</label>
             <textarea
diff --git a/lib/fonts.ts b/lib/fonts.ts
new file mode 100644
index 0000000..0125250
--- /dev/null
+++ b/lib/fonts.ts
@@ -0,0 +1,21 @@
+export const FONTS = [
+  { id: 'courier-new', label: 'Courier New', family: "'Courier New', Courier, monospace" },
+  { id: 'menlo', label: 'Menlo', family: "Menlo, Monaco, 'Courier New', monospace" },
+  { id: 'consolas', label: 'Consolas', family: "Consolas, 'Liberation Mono', 'Courier New', monospace" },
+  { id: 'monaco', label: 'Monaco', family: "Monaco, Menlo, 'Courier New', monospace" },
+] as const;
+
+export type FontId = (typeof FONTS)[number]['id'];
+
+export const DEFAULT_FONT_ID: FontId = FONTS[0].id;
+export const DEFAULT_FONT_FAMILY = FONTS[0].family;
+export const ALLOWED_FONTS = new Set<string>(FONTS.map(font => font.id));
+
+export function isFontId(value: string): value is FontId {
+  return ALLOWED_FONTS.has(value);
+}
+
+export function getFontFamily(fontId: string | null | undefined): string {
+  const font = FONTS.find(candidate => candidate.id === fontId);
+  return font?.family ?? DEFAULT_FONT_FAMILY;
+}
diff --git a/lib/validation.ts b/lib/validation.ts
index 815672c..3876957 100644
--- a/lib/validation.ts
+++ b/lib/validation.ts
@@ -1,4 +1,5 @@
 import type { Image, Message, Pdf, Role } from './chat';
+import { DEFAULT_FONT_ID, isFontId, type FontId } from './fonts';
 import { ALLOWED_MODELS } from './models';
 
 type ValidationResult<T> =
@@ -161,6 +162,7 @@ export function validateSettingsRequest(input: unknown): ValidationResult<{
   systemPrompt: string;
   saveHistory: boolean;
   girlMode: boolean;
+  font: FontId;
   keyJwk: string | null;
 }> {
   if (!isPlainObject(input)) return fail('invalid request body');
@@ -170,6 +172,8 @@ export function validateSettingsRequest(input: unknown): ValidationResult<{
   }
   if (input.saveHistory !== undefined && typeof input.saveHistory !== 'boolean') return fail('invalid saveHistory');
   if (input.girlMode !== undefined && typeof input.girlMode !== 'boolean') return fail('invalid girlMode');
+  if (input.font !== undefined && typeof input.font !== 'string') return fail('invalid font');
+  if (typeof input.font === 'string' && !isFontId(input.font)) return fail('invalid font');
   if (input.keyJwk !== undefined && input.keyJwk !== null && typeof input.keyJwk !== 'string') return fail('invalid keyJwk');
   if (typeof input.keyJwk === 'string') {
     if (input.keyJwk.length > LIMITS.maxJwkChars) return fail('keyJwk too large', 413);
@@ -185,6 +189,7 @@ export function validateSettingsRequest(input: unknown): ValidationResult<{
     systemPrompt: typeof input.systemPrompt === 'string' ? input.systemPrompt : '',
     saveHistory: input.saveHistory ?? false,
     girlMode: input.girlMode ?? false,
+    font: typeof input.font === 'string' ? input.font : DEFAULT_FONT_ID,
     keyJwk: typeof input.keyJwk === 'string' ? input.keyJwk : null,
   });
 }
diff --git a/next.config.ts b/next.config.ts
index b1dd283..28dca28 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -20,7 +20,9 @@ const securityHeaders = [
   { key: 'Permissions-Policy',      value: 'camera=(), microphone=(), geolocation=()' },
   { key: 'Cross-Origin-Opener-Policy', value: 'same-origin' },
   { key: 'Cross-Origin-Resource-Policy', value: 'same-origin' },
-  { key: 'Strict-Transport-Security', value: 'max-age=63072000; includeSubDomains; preload' },
+  ...(process.env.NODE_ENV === 'production'
+    ? [{ key: 'Strict-Transport-Security', value: 'max-age=63072000; includeSubDomains; preload' }]
+    : []),
   { key: 'Content-Security-Policy', value: contentSecurityPolicy },
 ];
 
diff --git a/scripts/migrate.mjs b/scripts/migrate.mjs
index 4eb0395..1105d2c 100644
--- a/scripts/migrate.mjs
+++ b/scripts/migrate.mjs
@@ -20,7 +20,8 @@ await pool.query(`
     system_prompt TEXT NOT NULL DEFAULT '',
     save_history  BOOLEAN NOT NULL DEFAULT FALSE,
     key_jwk       TEXT,
-    girl_mode     BOOLEAN NOT NULL DEFAULT FALSE
+    girl_mode     BOOLEAN NOT NULL DEFAULT FALSE,
+    font_family   TEXT NOT NULL DEFAULT 'courier-new'
   )
 `);
 await pool.query(`
@@ -32,6 +33,9 @@ await pool.query(`
 await pool.query(`
   ALTER TABLE user_settings ADD COLUMN IF NOT EXISTS girl_mode BOOLEAN NOT NULL DEFAULT FALSE
 `);
+await pool.query(`
+  ALTER TABLE user_settings ADD COLUMN IF NOT EXISTS font_family TEXT NOT NULL DEFAULT 'courier-new'
+`);
 console.log('✓ user_settings table ready');
 
 await pool.query(`
diff --git a/tests/unit.test.ts b/tests/unit.test.ts
index 1f20977..f178633 100644
--- a/tests/unit.test.ts
+++ b/tests/unit.test.ts
@@ -988,17 +988,36 @@ test('security defaults keep private routes uncached and the app shell locked do
       nextConfigSource.includes('strict-origin-when-cross-origin') &&
       nextConfigSource.includes('Permissions-Policy') &&
       nextConfigSource.includes('camera=(), microphone=(), geolocation=()') &&
+      nextConfigSource.includes("process.env.NODE_ENV === 'production'") &&
+      nextConfigSource.includes('Strict-Transport-Security') &&
       nextConfigSource.includes('Content-Security-Policy') &&
       nextConfigSource.includes("default-src 'self'") &&
       nextConfigSource.includes("frame-ancestors 'none'") &&
       nextConfigSource.includes("object-src 'none'"),
-    'the app shell should keep its hardened security headers and restrictive CSP defaults',
+    'the app shell should keep its hardened security headers and restrictive CSP defaults while limiting HSTS to production',
+  );
+});
+
+test('header and settings stay above the scroll area so top controls remain clickable', () => {
+  const cssSource = readFileSync(join(import.meta.dirname, '../app/globals.css'), 'utf8');
+  assert.ok(
+    cssSource.includes(`header {
+  display: flex;`) &&
+      cssSource.includes('z-index: 3;'),
+    'the header should have an explicit stacking order above the rest of the app shell',
+  );
+  assert.ok(
+    cssSource.includes(`.settings {
+  background: var(--surface);`) &&
+      cssSource.includes('.messages-wrapper {') &&
+      cssSource.includes('.input-area {'),
+    'the settings, message scroller, and input area should keep an intentional layering order',
   );
 });
 
 // ── settings validation ────────────────────────────────────────────────────────
 
-test('validateSettingsRequest: validates and defaults girlMode', () => {
+test('validateSettingsRequest: validates and defaults girlMode and font', () => {
   const source = readFileSync(join(import.meta.dirname, '../lib/validation.ts'), 'utf8');
   assert.ok(
     source.includes("if (input.girlMode !== undefined && typeof input.girlMode !== 'boolean') return fail('invalid girlMode');"),
@@ -1008,6 +1027,15 @@ test('validateSettingsRequest: validates and defaults girlMode', () => {
     source.includes('girlMode: input.girlMode ?? false,'),
     'validateSettingsRequest should persist girlMode and default it to false',
   );
+  assert.ok(
+    source.includes("if (input.font !== undefined && typeof input.font !== 'string') return fail('invalid font');") &&
+      source.includes("if (typeof input.font === 'string' && !isFontId(input.font)) return fail('invalid font');"),
+    'validateSettingsRequest should reject font values outside the allowed built-in list',
+  );
+  assert.ok(
+    source.includes("font: typeof input.font === 'string' ? input.font : DEFAULT_FONT_ID,"),
+    'validateSettingsRequest should default the saved font to the app default when none is supplied',
+  );
 });
 
 test('settings persistence preserves untouched fields and tolerates older schemas', () => {
@@ -1024,6 +1052,14 @@ test('settings persistence preserves untouched fields and tolerates older schema
     source.includes('girl_mode     = COALESCE($5, user_settings.girl_mode)'),
     'settings PUT should preserve the existing girl_mode value when that field was not sent',
   );
+  assert.ok(
+    source.includes('font_family   = COALESCE($6, user_settings.font_family)'),
+    'settings PUT should preserve the existing font_family value when that field was not sent',
+  );
+  assert.ok(
+    source.includes('SELECT system_prompt, save_history, key_jwk, girl_mode FROM user_settings WHERE email = $1'),
+    'settings GET should fall back cleanly when the font column has not been migrated yet',
+  );
   assert.ok(
     source.includes('SELECT system_prompt, save_history, key_jwk FROM user_settings WHERE email = $1'),
     'settings GET should fall back when girl_mode has not been migrated yet',
@@ -1044,6 +1080,10 @@ test('page source merges local settings changes before initial settings hydrate
     source.includes("const nextGirlMode = pending.girlMode ?? (typeof gm === 'boolean' ? gm : girlModeRef.current);"),
     'page should keep a local girlMode toggle instead of overwriting it with stale server data',
   );
+  assert.ok(
+    source.includes("const nextFont = pending.font ?? (isFontId(fo) ? fo : fontRef.current);"),
+    'page should keep a local font choice instead of overwriting it with stale server data',
+  );
   assert.ok(
     source.includes('pendingPersistRef.current = { ...pendingPersistRef.current, ...overrides };'),
     'page should merge back-to-back settings changes before sending them',
@@ -1054,6 +1094,43 @@ test('page source merges local settings changes before initial settings hydrate
   );
 });
 
+test('font settings let users pick and save alternate terminal fonts', () => {
+  const pageSource = readFileSync(join(import.meta.dirname, '../app/page.tsx'), 'utf8');
+  const cssSource = readFileSync(join(import.meta.dirname, '../app/globals.css'), 'utf8');
+  const fontsSource = readFileSync(join(import.meta.dirname, '../lib/fonts.ts'), 'utf8');
+  const migrateSource = readFileSync(join(import.meta.dirname, '../scripts/migrate.mjs'), 'utf8');
+  assert.ok(
+    fontsSource.includes("label: 'Courier New'") &&
+      fontsSource.includes("label: 'Menlo'") &&
+      fontsSource.includes("label: 'Consolas'") &&
+      fontsSource.includes("label: 'Monaco'"),
+    'the app should expose a small built-in list of terminal-style font options',
+  );
+  assert.ok(
+    pageSource.includes("const FONT_KEY     = 'gippidy-font';") &&
+      pageSource.includes("const [font, setFont]                         = useState<FontId>(DEFAULT_FONT_ID);") &&
+      pageSource.includes("const savedFont = localStorage.getItem(FONT_KEY);") &&
+      pageSource.includes("if (savedFont && isFontId(savedFont)) applyFont(savedFont);"),
+    'page should restore the saved font choice from localStorage during startup',
+  );
+  assert.ok(
+    pageSource.includes("logClientEvent('settings.invalid_font', 'warn'") &&
+      pageSource.includes("persistSettings({ font: nextFont }, true);") &&
+      pageSource.includes('<label>Font</label>'),
+    'settings should let the user choose a font and persist it immediately',
+  );
+  assert.ok(
+    cssSource.includes('--app-font-family:') &&
+      cssSource.includes('font-family: var(--app-font-family);'),
+    'globals.css should route app text through a CSS variable so the selected font applies everywhere',
+  );
+  assert.ok(
+    migrateSource.includes("font_family   TEXT NOT NULL DEFAULT 'courier-new'") &&
+      migrateSource.includes("ALTER TABLE user_settings ADD COLUMN IF NOT EXISTS font_family TEXT NOT NULL DEFAULT 'courier-new'"),
+    'database migrations should persist the selected font in user_settings',
+  );
+});
+
 test('Girl Mode defaults the system prompt to the chatty bestie preset', () => {
   const source = readFileSync(join(import.meta.dirname, '../app/page.tsx'), 'utf8');
   assert.ok(