diff --git a/src/components/PageHeader.tsx b/src/components/PageHeader.tsx
index bf43faf..2868b01 100644
--- a/src/components/PageHeader.tsx
+++ b/src/components/PageHeader.tsx
@@ -30,7 +30,7 @@ export function PageHeader({
       <div className="min-w-0">
         <h1
           className="flex items-center gap-2 text-3xl font-black uppercase leading-none sm:text-4xl"
-          style={{ color: accent, fontFamily: 'Impact, "Arial Black", sans-serif' }}
+          style={{ color: accent, fontFamily: 'Impact, "Arial Black", sans-serif', textShadow: `0 0 24px ${accent}66` }}
         >
           {Icon && <Icon className="h-7 w-7 shrink-0 sm:h-8 sm:w-8" />}
           <span className="truncate">{title}</span>
diff --git a/src/pages/CreateListingPage.tsx b/src/pages/CreateListingPage.tsx
index 3197449..24ad070 100644
--- a/src/pages/CreateListingPage.tsx
+++ b/src/pages/CreateListingPage.tsx
@@ -2,6 +2,7 @@ import { useState, useEffect, useMemo } from 'react';
 import { useSeoMeta } from '@unhead/react';
 import { useNavigate, Link, useSearchParams } from 'react-router-dom';
 import { Layout } from '@/components/Layout';
+import { PageHeader } from '@/components/PageHeader';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
@@ -394,19 +395,15 @@ export default function CreateListingPage() {
             <ArrowLeft className="h-4 w-4 mr-2" />
             {fromStash ? 'Back to Stash' : (selectedSpot ? `Back to ${selectedSpot.title}` : (returnTo === '/marketplace' ? 'Back to Marketplace' : 'Back to Map'))}
           </Link>
-          <h1
-            className="text-3xl font-black uppercase neon-orange"
-            style={{
-              fontFamily: 'Impact, "Arial Black", sans-serif',
-            }}
-          >
-            {listingType === 'wtb' ? 'WANT TO BUY' : 'LIST YOUR GEAR'}
-          </h1>
-          <p className="text-gray-400 mt-1">
-            {listingType === 'wtb'
-              ? 'Tell the community what gear you\'re looking for'
-              : 'Sell skateboarding gear to the community'}
-          </p>
+          <PageHeader
+            title={listingType === 'wtb' ? 'Want to Buy' : 'List Your Gear'}
+            accent="#ff6600"
+            subtitle={
+              listingType === 'wtb'
+                ? "Tell the community what gear you're looking for"
+                : 'Sell skateboarding gear to the community'
+            }
+          />
         </div>
 
         {/* Coming from Stash indicator */}
diff --git a/src/pages/DirectMessagesPage.tsx b/src/pages/DirectMessagesPage.tsx
index 715155f..9e8e498 100644
--- a/src/pages/DirectMessagesPage.tsx
+++ b/src/pages/DirectMessagesPage.tsx
@@ -3,6 +3,7 @@ import { Link } from 'react-router-dom';
 import { useSeoMeta } from '@unhead/react';
 import { nip19 } from 'nostr-tools';
 import { Layout } from '@/components/Layout';
+import { PageHeader } from '@/components/PageHeader';
 import { LoginArea } from '@/components/auth/LoginArea';
 import { Card, CardContent } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
@@ -249,27 +250,28 @@ export default function DirectMessagesPage() {
         {/* Phishing warning — shown once, dismissible */}
         <PhishingWarningBanner />
 
-        {/* Header */}
-        <div className="flex items-center justify-between gap-3 mb-4 sm:mb-6">
-          <div className="min-w-0 flex-1">
-            <h1 className="text-xl sm:text-2xl font-black uppercase tracking-wider flex items-center gap-2 sm:gap-3">
-              <MessageCircle className="h-5 w-5 sm:h-7 sm:w-7 text-[#ff0040] flex-shrink-0" />
-              <span className="truncate">MESSAGES</span>
-            </h1>
-            <p className="text-gray-400 text-xs sm:text-sm mt-1 flex items-center gap-1">
-              <Lock className="h-2.5 w-2.5 sm:h-3 sm:w-3" />
+        <PageHeader
+          title="Messages"
+          icon={MessageCircle}
+          accent="#ff0040"
+          className="mb-4 sm:mb-6"
+          subtitle={
+            <span className="flex items-center gap-1">
+              <Lock className="h-3 w-3" />
               <span className="hidden xs:inline">End-to-end encrypted with NIP-17</span>
               <span className="xs:hidden">Encrypted</span>
-            </p>
-          </div>
-          <Button
-            onClick={() => setShowNewMessage(true)}
-            className="bg-[#ff0040] hover:bg-[#ff0040]/90 text-white font-bold flex-shrink-0 h-10 sm:h-auto px-3 sm:px-4"
-          >
-            <Plus className="h-4 w-4 sm:mr-2" />
-            <span className="hidden sm:inline">New Message</span>
-          </Button>
-        </div>
+            </span>
+          }
+          actions={
+            <Button
+              onClick={() => setShowNewMessage(true)}
+              className="bg-[#ff0040] hover:bg-[#ff0040]/90 text-white font-bold h-10 sm:h-auto px-3 sm:px-4"
+            >
+              <Plus className="h-4 w-4 sm:mr-2" />
+              <span className="hidden sm:inline">New Message</span>
+            </Button>
+          }
+        />
 
         {/* Conversations List */}
         <div className="space-y-3">
diff --git a/src/pages/GearSwapPage.tsx b/src/pages/GearSwapPage.tsx
index af46639..e66880c 100644
--- a/src/pages/GearSwapPage.tsx
+++ b/src/pages/GearSwapPage.tsx
@@ -2,6 +2,7 @@ import { useState, useMemo } from 'react';
 import { useSeoMeta } from '@unhead/react';
 import { Link } from 'react-router-dom';
 import { Layout } from '@/components/Layout';
+import { PageHeader } from '@/components/PageHeader';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
@@ -185,38 +186,24 @@ export default function GearSwapPage() {
   return (
     <Layout>
       <div className="container px-4 py-8 max-w-7xl">
-        {/* Header */}
-        <div className="flex flex-col md:flex-row md:items-center md:justify-between gap-4 mb-8">
-          <div>
-            <div className="flex items-center gap-3 mb-2">
-              <div className="w-12 h-12 rounded-xl bg-gradient-to-br from-orange-500 to-orange-600 flex items-center justify-center">
-                <ShoppingCart className="h-6 w-6 text-white" />
-              </div>
-              <h1
-                className="text-3xl md:text-4xl font-black uppercase neon-orange"
-                style={{
-                  fontFamily: 'Impact, "Arial Black", sans-serif',
-                  letterSpacing: '0.05em',
-                }}
+        <PageHeader
+          title="Gear Swap"
+          icon={ShoppingCart}
+          accent="#ff6600"
+          subtitle="Buy & sell used skate gear with other skaters"
+          className="mb-8"
+          actions={
+            <Link to="/create-listing?returnTo=/marketplace">
+              <Button
+                size="lg"
+                className="gap-2 bg-orange-500 hover:bg-orange-600 text-white font-bold uppercase shadow-[0_0_20px_rgba(255,102,0,0.3)]"
               >
-                GEAR SWAP
-              </h1>
-            </div>
-            <p className="text-gray-400">
-              Buy & sell used skate gear with other skaters
-            </p>
-          </div>
-
-          <Link to="/create-listing?returnTo=/marketplace">
-            <Button
-              size="lg"
-              className="gap-2 bg-orange-500 hover:bg-orange-600 text-white font-bold uppercase shadow-[0_0_20px_rgba(255,102,0,0.3)]"
-            >
-              <Plus className="h-5 w-5" />
-              List Gear
-            </Button>
-          </Link>
-        </div>
+                <Plus className="h-5 w-5" />
+                List Gear
+              </Button>
+            </Link>
+          }
+        />
 
         {/* Search & Filters */}
         <Card className="bg-black/90 border-2 border-orange-500/20 mb-6">
diff --git a/src/pages/WalletPage.tsx b/src/pages/WalletPage.tsx
index 80a4818..039c8fa 100644
--- a/src/pages/WalletPage.tsx
+++ b/src/pages/WalletPage.tsx
@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import { useSeoMeta } from '@unhead/react';
 import { Layout } from '@/components/Layout';
+import { PageHeader } from '@/components/PageHeader';
 import { WalletModal } from '@/components/WalletModal';
 import { Badge } from '@/components/ui/badge';
 import { useWallet } from '@/hooks/useWallet';
@@ -240,13 +241,7 @@ export default function WalletPage() {
     <Layout>
       <div className="container px-4 py-5 max-w-lg mx-auto">
 
-        {/* Header */}
-        <div className="mb-4">
-          <h1 className="text-4xl md:text-5xl font-black uppercase leading-none mb-1">
-            <span className="neon-orange">WALLET</span>
-          </h1>
-          <p className="text-muted-foreground text-sm">Bitcoin Lightning + Cashu</p>
-        </div>
+        <PageHeader title="Wallet" accent="#ff6600" subtitle="Bitcoin Lightning + Cashu" />
 
         {user ? (
           <div className="space-y-4">