diff --git a/e2e/landing.spec.js b/e2e/landing.spec.js
index b2be7233..8c51dbab 100644
--- a/e2e/landing.spec.js
+++ b/e2e/landing.spec.js
@@ -33,11 +33,5 @@ test("landing has dashboard link", async ({ page }) => {
 test("landing shows footer", async ({ page }) => {
   await page.goto("/");
 
-  await expect(page.getByRole("contentinfo")).toBeVisible();
-});
-
-test("landing has dashboard link", async ({ page }) => {
-  await page.goto("/");
-
-  await expect(page.getByRole("link", { name: "Dashboard" })).toBeVisible();
+  await expect(page.getByRole("contentinfo").first()).toBeVisible();
 });
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index b9aefea7..57e6ba7e 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -2,28 +2,39 @@ import Link from "next/link";
 
 export default function NotFound() {
   return (
-    <div className="flex min-h-screen flex-col items-center justify-center bg-[var(--background)] px-4 text-center">
-      <div className="w-full max-w-md rounded-xl border border-[var(--border)] bg-[var(--card)] p-8 shadow-sm">
-        <div className="mb-6 flex justify-center">
-          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-[var(--accent-soft)]">
-            <span className="text-4xl" role="img" aria-label="Not Found">
-              🕳️
-            </span>
-          </div>
+    <div className="flex min-h-[75vh] flex-col items-center justify-center px-4 text-center">
+      <div className="relative flex flex-col items-center justify-center">
+        {/* Branded 404 code */}
+        <h1 className="text-9xl font-extrabold tracking-widest text-[var(--accent)] drop-shadow-md selection:bg-transparent">
+          404
+        </h1>
+        <div className="absolute rotate-12 rounded bg-[var(--accent)] px-2.5 py-1 text-xs font-bold uppercase tracking-wider text-[var(--accent-foreground)] shadow-md inline-block selection:bg-transparent">
+          Page Not Found
         </div>
-        <h1 className="mb-2 text-4xl font-bold text-[var(--card-foreground)]">404</h1>
-        <h2 className="mb-4 text-xl font-semibold text-[var(--card-foreground)]">
-          Oops! Page not found
+      </div>
+
+      <div className="mt-8 max-w-md">
+        <h2 className="text-2xl font-bold md:text-3xl text-[var(--card-foreground)]">
+          Lost in space?
         </h2>
-        <p className="mb-8 text-sm text-[var(--muted-foreground)]">
-          The page you&apos;re looking for doesn&apos;t exist or has been moved.
+        <p className="mt-4 text-sm text-[var(--muted-foreground)] leading-relaxed">
+          The page you are looking for might have been removed, had its name changed, or is temporarily unavailable. Let&apos;s get you back on track!
         </p>
-        <Link
-          href="/dashboard"
-          className="inline-flex w-full items-center justify-center rounded-lg bg-[var(--accent)] px-4 py-2.5 text-sm font-medium text-[var(--accent-foreground)] transition-opacity hover:opacity-90"
-        >
-          Return to Dashboard
-        </Link>
+
+        <div className="mt-8 flex flex-wrap items-center justify-center gap-4">
+          <Link
+            href="/dashboard"
+            className="rounded-lg bg-[var(--accent)] px-6 py-3 text-sm font-semibold text-[var(--accent-foreground)] shadow-lg transition-all hover:opacity-95 active:scale-[0.98]"
+          >
+            Go to Dashboard
+          </Link>
+          <Link
+            href="/"
+            className="rounded-lg border border-[var(--border)] bg-[var(--control)] px-6 py-3 text-sm font-semibold text-[var(--card-foreground)] transition-all hover:bg-[var(--accent)]/10 active:scale-[0.98]"
+          >
+            Go Home
+          </Link>
+        </div>
       </div>
     </div>
   );