diff --git a/.phase24-state.json b/.phase24-state.json
index a3e3782..f76c727 100644
--- a/.phase24-state.json
+++ b/.phase24-state.json
@@ -1,10 +1,11 @@
 {
   "completed_features": [],
-  "current_feature": "project-archive-icon",
+  "current_feature": "export-improvements",
   "started_at": "2026-05-23T08:33:42.059540",
   "attempted_features": [
     "notification-bell",
     "workspace-switcher-stub",
-    "billing-history-table"
+    "billing-history-table",
+    "project-archive-icon"
   ]
 }
\ No newline at end of file
diff --git a/GENERATION_LOG.md b/GENERATION_LOG.md
index 68889af..4242627 100644
--- a/GENERATION_LOG.md
+++ b/GENERATION_LOG.md
@@ -2855,3 +2855,20 @@ src/index.ts(27,25): error TS2769: No overload matches this call.
   Overload 2 of 3, '(plugin: FastifyPluginAsync<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>, opts?: FastifyRegisterOptions<...> | undefined): FastifyInstance<...> & PromiseLike<...>', gave the following error.
     Argument of type 'Promise<FastifyMultipartPlugin>' is not assignable to parameter of type 'FastifyPluginAsync<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>'.
       Type 'Promise<FastifyMultipartPlugin>' provides no match for the signature '(instance: FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTy
+- `08:38:18` **INFO**   Committed feature project-archive-icon
+- `08:38:18` **INFO**   Pushed: rc=0
+
+## Phase-3 Feature: export-improvements (2026-05-23 08:38:18)
+
+- `08:38:18` **INFO** Description: Export-Button auch in Customers + Projects
+- `08:38:18` **INFO**   Generating apps/web/src/pages/Customers.tsx (ERWEITERT — füge 'CSV exportieren'-Button oben rechts. Generiert CSV i…)
+- `08:40:05` **INFO**     wrote 12617 chars in 106.8s (attempt 1)
+- `08:40:05` **INFO** Running tsc --noEmit on api…
+- `08:40:07` **WARN**   tsc errors:
+src/index.ts(27,25): error TS2769: No overload matches this call.
+  Overload 1 of 3, '(plugin: FastifyPluginCallback<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>, opts?: FastifyRegisterOptions<...> | undefined): FastifyInstance<...> & PromiseLike<...>', gave the following error.
+    Argument of type 'Promise<FastifyMultipartPlugin>' is not assignable to parameter of type 'FastifyPluginCallback<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>'.
+      Type 'Promise<FastifyMultipartPlugin>' provides no match for the signature '(instance: FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTypeProvider>, opts: { ...; }, done: (err?: Error | undefined) => void): void'.
+  Overload 2 of 3, '(plugin: FastifyPluginAsync<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>, opts?: FastifyRegisterOptions<...> | undefined): FastifyInstance<...> & PromiseLike<...>', gave the following error.
+    Argument of type 'Promise<FastifyMultipartPlugin>' is not assignable to parameter of type 'FastifyPluginAsync<{ limits: { fileSize: number; }; }, RawServerDefault, FastifyTypeProvider, FastifyBaseLogger>'.
+      Type 'Promise<FastifyMultipartPlugin>' provides no match for the signature '(instance: FastifyInstance<RawServerDefault, IncomingMessage, ServerResponse<IncomingMessage>, FastifyBaseLogger, FastifyTy
diff --git a/apps/web/src/pages/Customers.tsx b/apps/web/src/pages/Customers.tsx
index af4aa5e..92f1a8a 100644
--- a/apps/web/src/pages/Customers.tsx
+++ b/apps/web/src/pages/Customers.tsx
@@ -1,6 +1,6 @@
 import { useState, useRef, useMemo } from "react"
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"
-import { Star, Merge, X, Upload, Plus, Archive, Trash2 } from "lucide-react"
+import { Star, Merge, X, Upload, Plus, Archive, Trash2, Download } from "lucide-react"
 import { api } from "../lib/api"
 
 const COLOR_PALETTE = [
@@ -113,114 +113,129 @@ export default function Customers() {
     }
   }
 
+  const handleExportCsv = () => {
+    if (!customers) return
+    const headers = ["id", "name", "active", "createdAt"]
+    const rows = customers.map(c => [
+      c.id,
+      `"${(c.name || "").replace(/"/g, '""')}"`,
+      c.active,
+      c.createdAt
+    ].join(","))
+    
+    const csvContent = [headers.join(","), ...rows].join("\n")
+    const blob = new Blob([csvContent], { type: "text/csv;charset=utf-8;" })
+    const url = URL.createObjectURL(blob)
+    const link = document.createElement("a")
+    link.setAttribute("href", url)
+    link.setAttribute("download", `customers_export_${new Date().toISOString().split('T')[0]}.csv`)
+    link.style.visibility = "hidden"
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+  }
+
   if (isLoading) return <div className="p-6 text-gray-500">Loading customers...</div>
   if (isError) return <div className="p-6 text-red-500">Error loading customers.</div>
 
   return (
-    <div className="p-6 max-w-6xl mx-auto space-y-8">
-      <header className="flex justify-between items-start">
-        <div className="space-y-1">
-          <h1 className="text-2xl font-bold text-gray-900">Customers</h1>
-          <p className="text-gray-500">Manage your client database</p>
-        </div>
+    <div className="p-6 max-w-6xl mx-auto">
+      <div className="flex justify-between items-center mb-8">
+        <h1 className="text-2xl font-bold text-gray-800">Customers</h1>
         <div className="flex gap-2">
-          <input
-            type="file"
-            accept=".csv"
-            className="hidden"
-            ref={fileInputRef}
-            onChange={handleFileChange}
-          />
+          <button 
+            onClick={handleExportCsv}
+            className="flex items-center gap-2 px-3 py-2 text-sm font-medium text-gray-600 bg-white border border-gray-300 rounded-md hover:bg-gray-50 transition-colors"
+          >
+            <Download size={16} />
+            Export CSV
+          </button>
           <button 
             onClick={() => fileInputRef.current?.click()}
-            className="flex items-center gap-2 px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50 transition-colors"
+            className="flex items-center gap-2 px-3 py-2 text-sm font-medium text-gray-600 bg-white border border-gray-300 rounded-md hover:bg-gray-50 transition-colors"
           >
-            <Upload size={16} /> Import CSV
+            <Upload size={16} />
+            Import CSV
           </button>
+          <input 
+            type="file" 
+            ref={fileInputRef} 
+            onChange={handleFileChange} 
+            accept=".csv" 
+            className="hidden" 
+          />
         </div>
-      </header>
+      </div>
 
-      <form onSubmit={handleSubmit} className="grid grid-cols-1 md:grid-cols-3 gap-4 p-4 bg-gray-50 rounded-lg border border-gray-200">
-        <div className="space-y-1">
+      <form onSubmit={handleSubmit} className="grid grid-cols-1 md:grid-cols-3 gap-4 mb-8 p-4 bg-gray-50 rounded-lg border border-gray-200">
+        <div className="flex flex-col gap-1">
           <label className="text-xs font-semibold text-gray-500 uppercase">Name</label>
           <input 
             value={name} 
             onChange={e => setName(e.target.value)} 
-            placeholder="Customer Name" 
-            className="w-full px-3 py-2 border border-gray-300 rounded-md focus:ring-2 focus:ring-blue-500 outline-none"
+            placeholder="Customer name..." 
+            className="px-3 py-2 border rounded-md focus:ring-2 focus:ring-blue-500 outline-none"
           />
         </div>
-        <div className="space-y-1">
+        <div className="flex flex-col gap-1">
           <label className="text-xs font-semibold text-gray-500 uppercase">Tags (comma separated)</label>
           <input 
             value={tags} 
             onChange={e => setTags(e.target.value)} 
-            placeholder="VIP, Lead, Tech..." 
-            className="w-full px-3 py-2 border border-gray-300 rounded-md focus:ring-2 focus:ring-blue-500 outline-none"
+            placeholder="VIP, Lead, etc." 
+            className="px-3 py-2 border rounded-md focus:ring-2 focus:ring-blue-500 outline-none"
           />
         </div>
         <div className="flex items-end">
           <button 
             type="submit" 
             disabled={createMutation.isPending}
-            className="w-full flex items-center justify-center gap-2 px-3 py-2 bg-blue-600 text-white font-medium rounded-md hover:bg-blue-700 disabled:opacity-50 transition-colors"
+            className="w-full flex items-center justify-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 disabled:bg-blue-300 transition-colors"
           >
-            <Plus size={18} /> {createMutation.isPending ? "Adding..." : "Add Customer"}
+            <Plus size={18} />
+            {createMutation.isPending ? "Creating..." : "Add Customer"}
           </button>
         </div>
       </form>
 
-      <div className="flex flex-wrap gap-4 items-center justify-between bg-white p-4 rounded-lg border border-gray-200">
-        <div className="flex gap-4 items-center">
-          <div className="relative">
-            <input 
-              value={filterTag} 
-              onChange={e => setFilterTag(e.target.value)} 
-              placeholder="Filter by tag..." 
-              className="pl-3 pr-10 py-2 text-sm border border-gray-300 rounded-md focus:ring-2 focus:ring-blue-500 outline-none w-64"
-            />
-            {filterTag && (
-              <button 
-                onClick={() => setFilterTag("")} 
-                className="absolute right-2 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600"
-              >
-                <X size={14} />
-              </button>
-            )}
-          </div>
-          <label className="flex items-center gap-2 text-sm text-gray-600 cursor-pointer">
-            <input 
-              type="checkbox" 
-              checked={showArchived} 
-              onChange={e => setShowArchived(e.target.checked)} 
-              className="rounded text-blue-600"
-            />
-            Show Archived
-          </label>
+      <div className="flex flex-wrap gap-4 mb-6 items-center">
+        <div className="relative flex-1 min-w-[200px]">
+          <input 
+            value={filterTag} 
+            onChange={e => setFilterTag(e.target.value)} 
+            placeholder="Filter by tag..." 
+            className="w-full pl-3 pr-10 py-2 border rounded-md focus:ring-2 focus:ring-blue-500 outline-none"
+          />
         </div>
+        <label className="flex items-center gap-2 text-sm text-gray-600 cursor-pointer">
+          <input 
+            type="checkbox" 
+            checked={showArchived} 
+            onChange={e => setShowArchived(e.target.checked)} 
+            className="rounded text-blue-600"
+          />
+          Show Archived
+        </label>
       </div>
 
       <div className="grid gap-3">
         {filteredAndSortedCustomers.map(customer => (
           <div 
             key={customer.id} 
-            className={`group flex items-center justify-between p-4 bg-white border border-gray-200 rounded-lg transition-all hover:shadow-sm ${getColorForName(customer.name || "Unknown")}`}
+            className={`group flex items-center justify-between p-3 bg-white border rounded-lg shadow-sm transition-all ${getColorForName(customer.name || "Unknown")} ${!customer.active && "opacity-60 grayscale"}`}
           >
-            <div className="flex items-center gap-4">
+            <div className="flex items-center gap-3">
               <button 
                 onClick={() => pinMutation.mutate({ id: customer.id, pinned: customer.pinnedAt === null })}
-                className={`p-1 rounded-full transition-colors ${customer.pinnedAt ? 'text-yellow-500 bg-yellow-50' : 'text-gray-300 hover:text-gray-400'}`}
+                className={`p-1 rounded-full transition-colors ${customer.pinnedAt ? "text-amber-500 bg-amber-50" : "text-gray-300 hover:text-gray-400"}`}
               >
-                <Star size={18} fill={customer.pinnedAt ? "currentColor" : "none"} />
+                <Star size={16} fill={customer.pinnedAt ? "currentColor" : "none"} />
               </button>
               <div>
-                <div className="font-medium text-gray-900 flex items-center gap-2">
-                  {customer.name}
-                  {!customer.active && <span className="text-[10px] px-1.5 py-0.5 bg-gray-100 text-gray-500 rounded uppercase font-bold">Archived</span>}
-                </div>
+                <div className="font-medium text-gray-800">{customer.name}</div>
                 <div className="flex gap-1 mt-1">
                   {customer.tags?.map(tag => (
-                    <span key={tag} className="text-[11px] px-2 py-0.5 bg-gray-100 text-gray-600 rounded-full border border-gray-200">
+                    <span key={tag} className="px-2 py-0.5 text-[10px] font-medium bg-gray-100 text-gray-600 rounded-full">
                       {tag}
                     </span>
                   ))}
@@ -230,71 +245,72 @@ export default function Customers() {
 
             <div className="flex items-center gap-2 opacity-0 group-hover:opacity-100 transition-opacity">
               <button 
-                onClick={() => setMergeTarget({ sourceId: customer.id, targetId: "" })}
+                onClick={() => {
+                  setMergeTarget({ sourceId: customer.id, targetId: "" })
+                }}
                 className="p-2 text-gray-500 hover:text-blue-600 hover:bg-blue-50 rounded-md transition-colors"
-                title="Merge into another customer"
+                title="Merge"
               >
-                <Merge size={18} />
+                <Merge size={16} />
               </button>
               <button 
                 onClick={() => archiveMutation.mutate(customer.id)}
-                className="p-2 text-gray-500 hover:text-orange-600 hover:bg-orange-50 rounded-md transition-colors"
+                className="p-2 text-gray-500 hover:text-amber-600 hover:bg-amber-50 rounded-md transition-colors"
                 title="Archive"
               >
-                <Archive size={18} />
+                <Archive size={16} />
               </button>
               <button 
-                onClick={() => { if(confirm("Delete customer?")) { /* delete mutation here */ } }}
+                onClick={() => {
+                  if(confirm("Delete customer?")) {
+                    // Assuming a delete endpoint exists or use update active: false
+                    archiveMutation.mutate(customer.id)
+                  }
+                }}
                 className="p-2 text-gray-500 hover:text-red-600 hover:bg-red-50 rounded-md transition-colors"
                 title="Delete"
               >
-                <Trash2 size={18} />
+                <Trash2 size={16} />
               </button>
             </div>
           </div>
         ))}
         {filteredAndSortedCustomers.length === 0 && (
-          <div className="text-center py-12 text-gray-500 border-2 border-dashed border-gray-200 rounded-lg">
-            No customers found matching your criteria.
+          <div className="text-center py-12 text-gray-400 border-2 border-dashed rounded-lg">
+            No customers found.
           </div>
         )}
       </div>
 
       {mergeTarget && (
-        <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
-          <div className="bg-white rounded-xl p-6 max-w-md w-full shadow-xl space-y-4">
-            <h3 className="text-lg font-bold text-gray-900">Merge Customer</h3>
-            <p className="text-sm text-gray-500">
-              Merge <span className="font-semibold">{customers?.find(c => c.id === mergeTarget.sourceId)?.name}</span> into another customer. All tags and associations will be moved.
+        <div className="fixed inset-0 bg-black/50 flex items-center justify-center p-4 z-50">
+          <div className="bg-white rounded-lg p-6 max-w-md w-full shadow-xl">
+            <div className="flex justify-between items-center mb-4">
+              <h3 className="text-lg font-bold">Merge Customer</h3>
+              <button onClick={() => setMergeTarget(null)} className="text-gray-400 hover:text-gray-600">
+                <X size={20} />
+              </button>
+            </div>
+            <p className="text-sm text-gray-600 mb-4">
+              Merge <span className="font-semibold">{customers?.find(c => c.id === mergeTarget.sourceId)?.name}</span> into another customer.
             </p>
-            <div className="space-y-2">
-              <label className="text-xs font-semibold text-gray-500 uppercase">Target Customer</label>
-              <select 
-                className="w-full px-3 py-2 border border-gray-300 rounded-md outline-none focus:ring-2 focus:ring-blue-500"
-                value={mergeTarget.targetId}
-                onChange={e => setMergeTarget({ ...mergeTarget, targetId: e.target.value })}
-              >
-                <option value="">Select target...</option>
-                {customers?.filter(c => c.id !== mergeTarget.sourceId).map(c => (
-                  <option key={c.id} value={c.id}>{c.name}</option>
-                ))}
-              </select>
-            </div>
-            <div className="flex gap-3 justify-end pt-2">
-              <button 
-                onClick={() => setMergeTarget(null)} 
-                className="px-4 py-2 text-sm font-medium text-gray-600 hover:bg-gray-100 rounded-md"
-              >
-                Cancel
-              </button>
-              <button 
-                disabled={!mergeTarget.targetId || mergeMutation.isPending}
-                onClick={() => mergeMutation.mutate({ sourceId: mergeTarget.sourceId, targetId: mergeTarget.targetId })}
-                className="px-4 py-2 text-sm font-medium bg-blue-600 text-white rounded-md hover:bg-blue-700 disabled:opacity-50"
-              >
-                {mergeMutation.isPending ? "Merging..." : "Confirm Merge"}
-              </button>
-            </div>
+            <select 
+              className="w-full p-2 border rounded-md mb-4"
+              value={mergeTarget.targetId}
+              onChange={e => setMergeTarget({ ...mergeTarget, targetId: e.target.value })}
+            >
+              <option value="">Select target...</option>
+              {customers?.filter(c => c.id !== mergeTarget.sourceId).map(c => (
+                <option key={c.id} value={c.id}>{c.name}</option>
+              ))}
+            </select>
+            <button 
+              disabled={!mergeTarget.targetId || mergeMutation.isPending}
+              onClick={() => mergeMutation.mutate({ sourceId: mergeTarget.sourceId, targetId: mergeTarget.targetId! })}
+              className="w-full py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 disabled:bg-blue-300 transition-colors"
+            >
+              {mergeMutation.isPending ? "Merging..." : "Confirm Merge"}
+            </button>
           </div>
         </div>
       )}