diff --git a/src/components/billing/customer-invoice-detail.tsx b/src/components/billing/customer-invoice-detail.tsx
index 56cfff9..3ace13f 100644
--- a/src/components/billing/customer-invoice-detail.tsx
+++ b/src/components/billing/customer-invoice-detail.tsx
@@ -8,7 +8,7 @@ interface Props {
 }
 
 const statusColors: Record<string, string> = {
-  issued: "text-text-secondary bg-surface-3",
+  open: "text-text-secondary bg-surface-3",
   paid: "text-success bg-success/10",
   overdue: "text-error bg-error/10",
   void: "text-text-muted bg-surface-3",
diff --git a/src/components/billing/customer-invoice-list.tsx b/src/components/billing/customer-invoice-list.tsx
index 50a5d0d..a19d246 100644
--- a/src/components/billing/customer-invoice-list.tsx
+++ b/src/components/billing/customer-invoice-list.tsx
@@ -8,7 +8,7 @@ interface Props {
 }
 
 const statusColors: Record<string, string> = {
-  issued: "text-text-secondary bg-surface-3",
+  open: "text-text-secondary bg-surface-3",
   paid: "text-success bg-success/10",
   overdue: "text-error bg-error/10",
   void: "text-text-muted bg-surface-3 line-through",
diff --git a/src/components/layout/nav-shell.tsx b/src/components/layout/nav-shell.tsx
index bb822d4..7822464 100644
--- a/src/components/layout/nav-shell.tsx
+++ b/src/components/layout/nav-shell.tsx
@@ -74,17 +74,6 @@ function NavBar() {
                   {t("settings")}
                 </NavLink>
               )}
-            {/* Feature 5: Support is available to every signed-in
-                user. Customers see their own tickets only; platform
-                admins see the queue. */}
-            {user && (
-              <NavLink
-                href="/support"
-                active={pathname.startsWith("/support")}
-              >
-                {t("support")}
-              </NavLink>
-            )}
             {/* Phase 3: Billing visible to anyone signed in. The
                 page is org-scoped server-side — non-owner members
                 see the same invoice history their owner does, but
@@ -99,6 +88,17 @@ function NavBar() {
                 {t("billing")}
               </NavLink>
             )}
+            {/* Feature 5: Support is available to every signed-in
+                user. Customers see their own tickets only; platform
+                admins see the queue. */}
+            {user && (
+              <NavLink
+                href="/support"
+                active={pathname.startsWith("/support")}
+              >
+                {t("support")}
+              </NavLink>
+            )}
             {user?.isPlatform && (
               <NavLink href="/admin" active={pathname === "/admin"}>
                 {t("admin")}
diff --git a/src/messages/de.json b/src/messages/de.json
index 4928e93..9e04583 100644
--- a/src/messages/de.json
+++ b/src/messages/de.json
@@ -731,10 +731,12 @@
     "totalLabel": "Gesamt",
     "downloadPdf": "PDF herunterladen",
     "status": {
-      "issued": "Ausgestellt",
+      "draft": "Entwurf",
+      "open": "Offen",
       "paid": "Bezahlt",
       "overdue": "Überfällig",
-      "void": "Storniert"
+      "void": "Storniert",
+      "uncollectible": "Uneinbringlich"
     }
   }
 }
diff --git a/src/messages/en.json b/src/messages/en.json
index f40d8b9..b73c391 100644
--- a/src/messages/en.json
+++ b/src/messages/en.json
@@ -731,10 +731,12 @@
     "totalLabel": "Total",
     "downloadPdf": "Download PDF",
     "status": {
-      "issued": "Issued",
+      "draft": "Draft",
+      "open": "Open",
       "paid": "Paid",
       "overdue": "Overdue",
-      "void": "Void"
+      "void": "Void",
+      "uncollectible": "Uncollectible"
     }
   }
 }
diff --git a/src/messages/fr.json b/src/messages/fr.json
index 865c6e1..468f7cf 100644
--- a/src/messages/fr.json
+++ b/src/messages/fr.json
@@ -731,10 +731,12 @@
     "totalLabel": "Total",
     "downloadPdf": "Télécharger le PDF",
     "status": {
-      "issued": "Émise",
+      "draft": "Brouillon",
+      "open": "Ouverte",
       "paid": "Payée",
       "overdue": "En retard",
-      "void": "Annulée"
+      "void": "Annulée",
+      "uncollectible": "Irrécouvrable"
     }
   }
 }
diff --git a/src/messages/it.json b/src/messages/it.json
index de08971..ef5b1a9 100644
--- a/src/messages/it.json
+++ b/src/messages/it.json
@@ -731,10 +731,12 @@
     "totalLabel": "Totale",
     "downloadPdf": "Scarica PDF",
     "status": {
-      "issued": "Emessa",
+      "draft": "Bozza",
+      "open": "Aperta",
       "paid": "Pagata",
       "overdue": "In ritardo",
-      "void": "Annullata"
+      "void": "Annullata",
+      "uncollectible": "Inesigibile"
     }
   }
 }