diff --git a/client/index.html b/client/index.html
index d64d3ee..079a64f 100644
--- a/client/index.html
+++ b/client/index.html
@@ -15,9 +15,15 @@
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
   <meta name="apple-mobile-web-app-title" content="TaskFlow" />
 
-  <!-- Icons -->
-  <link rel="icon" type="image/png" href="/favicon.png?v=4" />
-  <link rel="apple-touch-icon" href="/favicon.png?v=4" />
+  <!-- Favicons -->
+  <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+  <link rel="icon" type="image/png" sizes="48x48" href="/favicon-48x48.png" />
+  <link rel="icon" type="image/png" sizes="64x64" href="/favicon-64x64.png" />
+  <link rel="icon" type="image/png" sizes="128x128" href="/favicon-128x128.png" />
+  <link rel="icon" type="image/png" sizes="256x256" href="/favicon-256x256.png" />
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
 
   <!-- Fonts -->
   <link rel="preconnect" href="https://fonts.googleapis.com">
diff --git a/client/public/apple-touch-icon.png b/client/public/apple-touch-icon.png
new file mode 100644
index 0000000..004fcc1
Binary files /dev/null and b/client/public/apple-touch-icon.png differ
diff --git a/client/public/favicon-128x128.png b/client/public/favicon-128x128.png
new file mode 100644
index 0000000..6148e8d
Binary files /dev/null and b/client/public/favicon-128x128.png differ
diff --git a/client/public/favicon-16x16.png b/client/public/favicon-16x16.png
new file mode 100644
index 0000000..d6da07e
Binary files /dev/null and b/client/public/favicon-16x16.png differ
diff --git a/client/public/favicon-256x256.png b/client/public/favicon-256x256.png
new file mode 100644
index 0000000..eb86bf2
Binary files /dev/null and b/client/public/favicon-256x256.png differ
diff --git a/client/public/favicon-32x32.png b/client/public/favicon-32x32.png
new file mode 100644
index 0000000..8624fbe
Binary files /dev/null and b/client/public/favicon-32x32.png differ
diff --git a/client/public/favicon-48x48.png b/client/public/favicon-48x48.png
new file mode 100644
index 0000000..eeed5cf
Binary files /dev/null and b/client/public/favicon-48x48.png differ
diff --git a/client/public/favicon-64x64.png b/client/public/favicon-64x64.png
new file mode 100644
index 0000000..6bce400
Binary files /dev/null and b/client/public/favicon-64x64.png differ
diff --git a/client/public/favicon.ico b/client/public/favicon.ico
new file mode 100644
index 0000000..9444bf2
Binary files /dev/null and b/client/public/favicon.ico differ
diff --git a/client/public/favicon.png b/client/public/favicon.png
deleted file mode 100644
index d88943c..0000000
Binary files a/client/public/favicon.png and /dev/null differ
diff --git a/client/public/icon-1024.png b/client/public/icon-1024.png
new file mode 100644
index 0000000..b3458a6
Binary files /dev/null and b/client/public/icon-1024.png differ
diff --git a/client/public/icon-128.png b/client/public/icon-128.png
new file mode 100644
index 0000000..6148e8d
Binary files /dev/null and b/client/public/icon-128.png differ
diff --git a/client/public/icon-256.png b/client/public/icon-256.png
new file mode 100644
index 0000000..eb86bf2
Binary files /dev/null and b/client/public/icon-256.png differ
diff --git a/client/public/icon-512.png b/client/public/icon-512.png
new file mode 100644
index 0000000..5526407
Binary files /dev/null and b/client/public/icon-512.png differ
diff --git a/client/public/icon-circle.png b/client/public/icon-circle.png
new file mode 100644
index 0000000..42076c4
Binary files /dev/null and b/client/public/icon-circle.png differ
diff --git a/client/public/icon-transparent-128.png b/client/public/icon-transparent-128.png
new file mode 100644
index 0000000..10eff09
Binary files /dev/null and b/client/public/icon-transparent-128.png differ
diff --git a/client/public/icon-transparent-256.png b/client/public/icon-transparent-256.png
new file mode 100644
index 0000000..e9369e2
Binary files /dev/null and b/client/public/icon-transparent-256.png differ
diff --git a/client/public/icon-transparent-512.png b/client/public/icon-transparent-512.png
new file mode 100644
index 0000000..c8c875c
Binary files /dev/null and b/client/public/icon-transparent-512.png differ
diff --git a/client/public/logo-horizontal-tagline-transparent.png b/client/public/logo-horizontal-tagline-transparent.png
new file mode 100644
index 0000000..330499d
Binary files /dev/null and b/client/public/logo-horizontal-tagline-transparent.png differ
diff --git a/client/public/logo-horizontal.png b/client/public/logo-horizontal.png
new file mode 100644
index 0000000..af877cf
Binary files /dev/null and b/client/public/logo-horizontal.png differ
diff --git a/client/public/logo-stacked.png b/client/public/logo-stacked.png
new file mode 100644
index 0000000..73fcf2c
Binary files /dev/null and b/client/public/logo-stacked.png differ
diff --git a/client/public/manifest.json b/client/public/manifest.json
index a772847..c0b00fd 100644
--- a/client/public/manifest.json
+++ b/client/public/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "TaskFlow",
   "short_name": "TaskFlow",
-  "description": "Gamified task management with AI assistance",
+  "description": "Gamified task management with AI assistance. Focus. Flow. AI.",
   "start_url": "/",
   "display": "standalone",
   "background_color": "#0f0f23",
@@ -9,16 +9,31 @@
   "orientation": "portrait-primary",
   "icons": [
     {
-      "src": "/favicon.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "any maskable"
+      "src": "/icon-128.png",
+      "sizes": "128x128",
+      "type": "image/png"
     },
     {
-      "src": "/favicon.png",
+      "src": "/icon-256.png",
+      "sizes": "256x256",
+      "type": "image/png"
+    },
+    {
+      "src": "/icon-512.png",
       "sizes": "512x512",
       "type": "image/png",
-      "purpose": "any maskable"
+      "purpose": "any"
+    },
+    {
+      "src": "/icon-512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
+    },
+    {
+      "src": "/icon-1024.png",
+      "sizes": "1024x1024",
+      "type": "image/png"
     }
   ],
   "categories": ["productivity", "utilities"],
diff --git a/client/public/sw.js b/client/public/sw.js
index fe9f3ad..3f68705 100644
--- a/client/public/sw.js
+++ b/client/public/sw.js
@@ -29,8 +29,8 @@ self.addEventListener('push', (event) => {
   let data = {
     title: 'TaskFlow',
     body: 'You have a new notification',
-    icon: '/favicon.png',
-    badge: '/favicon.png',
+    icon: '/icon-256.png',
+    badge: '/icon-128.png',
     tag: 'taskflow-notification',
     data: {}
   };
diff --git a/client/src/App.tsx b/client/src/App.tsx
index 32c721b..f6fcb91 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -285,8 +285,14 @@ function AppContent() {
 
   if (isLoadingUser) {
     return (
-      <div className="flex items-center justify-center min-h-screen bg-background">
-        <Loader2 className="h-8 w-8 animate-spin text-primary" />
+      <div className="flex flex-col items-center justify-center min-h-screen bg-background gap-6">
+        <div className="w-20 h-20 rounded-2xl bg-gradient-to-br from-violet-600 to-indigo-600 flex items-center justify-center shadow-2xl animate-pulse">
+          <img src="/icon-transparent-256.png" alt="TaskFlow" className="w-14 h-14 object-contain" />
+        </div>
+        <div className="flex items-center gap-2">
+          <Loader2 className="h-5 w-5 animate-spin text-primary" />
+          <span className="text-muted-foreground text-sm">Loading TaskFlow...</span>
+        </div>
       </div>
     );
   }
@@ -341,7 +347,9 @@ function AppContent() {
             <header className="sticky top-0 z-50 flex items-center gap-3 px-4 py-3 bg-background/80 backdrop-blur-xl border-b border-border/50 md:hidden">
               <SidebarTrigger className="h-9 w-9" />
               <div className="flex items-center gap-2">
-                <img src="/favicon.png" alt="Logo" className="w-7 h-7 rounded-lg" />
+                <div className="w-8 h-8 rounded-lg bg-gradient-to-br from-violet-600 to-indigo-600 flex items-center justify-center shadow-md">
+                  <img src="/icon-transparent-128.png" alt="TaskFlow" className="w-6 h-6 object-contain" />
+                </div>
                 <span className="font-bold text-lg">{t('app.title')}</span>
               </div>
             </header>
diff --git a/client/src/components/AppSidebar.tsx b/client/src/components/AppSidebar.tsx
index e922d50..80e1dae 100644
--- a/client/src/components/AppSidebar.tsx
+++ b/client/src/components/AppSidebar.tsx
@@ -72,13 +72,13 @@ export function AppSidebar({ user, ...props }: AppSidebarProps) {
                 <SidebarMenu>
                     <SidebarMenuItem>
                         <SidebarMenuButton size="lg" className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground h-14">
-                            <div className="flex aspect-square size-9 items-center justify-center rounded-xl overflow-hidden shadow-lg bg-transparent">
-                                <img src="/favicon.png" alt="Logo" className="w-full h-full object-cover" />
+                            <div className="flex aspect-square size-9 items-center justify-center rounded-xl overflow-hidden shadow-lg bg-gradient-to-br from-violet-600 to-indigo-600">
+                                <img src="/icon-transparent-128.png" alt="TaskFlow" className="w-7 h-7 object-contain" />
                             </div>
                             {state !== 'collapsed' && (
                                 <div className="grid flex-1 text-left text-sm leading-tight ml-2">
                                     <span className="truncate font-bold text-base">{t('app.title')}</span>
-                                    <span className="truncate text-xs opacity-70">Personal</span>
+                                    <span className="truncate text-xs opacity-70">Focus. Flow. AI.</span>
                                 </div>
                             )}
                         </SidebarMenuButton>
diff --git a/client/src/pages/AuthPage.tsx b/client/src/pages/AuthPage.tsx
index d41eb93..85b8535 100644
--- a/client/src/pages/AuthPage.tsx
+++ b/client/src/pages/AuthPage.tsx
@@ -145,10 +145,13 @@ export default function AuthPage() {
 
     return (
         <div className="min-h-screen grid lg:grid-cols-2 dark">
-            <div className="hidden lg:flex flex-col justify-center items-center bg-zinc-900 p-12 text-white">
-                <div className="max-w-md space-y-4 text-center">
-                    <div className="mb-8">
-                        <img src="/favicon.png" alt="Logo" className="w-24 h-24" />
+            <div className="hidden lg:flex flex-col justify-center items-center bg-gradient-to-br from-zinc-900 via-zinc-900 to-violet-950 p-12 text-white">
+                <div className="max-w-md space-y-6 text-center">
+                    <div className="mb-8 flex flex-col items-center">
+                        <div className="w-28 h-28 rounded-2xl bg-gradient-to-br from-violet-600 to-indigo-600 flex items-center justify-center shadow-2xl mb-6">
+                            <img src="/icon-transparent-256.png" alt="TaskFlow" className="w-20 h-20 object-contain" />
+                        </div>
+                        <img src="/logo-horizontal-tagline-transparent.png" alt="TaskFlow - Focus. Flow. AI." className="h-12 object-contain" />
                     </div>
                     <h1 className="text-4xl font-bold tracking-tight">{t('auth.heroTitle')}</h1>
                     <p className="text-lg text-zinc-400">
@@ -162,7 +165,9 @@ export default function AuthPage() {
                     <Card className="w-full max-w-md shadow-xl border-border/50">
                         <CardHeader className="text-center space-y-2">
                             <div className="lg:hidden mx-auto mb-4">
-                                <img src="/favicon.png" alt="Logo" className="w-12 h-12 mx-auto" />
+                                <div className="w-14 h-14 rounded-xl bg-gradient-to-br from-violet-600 to-indigo-600 flex items-center justify-center shadow-lg mx-auto">
+                                    <img src="/icon-transparent-128.png" alt="TaskFlow" className="w-10 h-10 object-contain" />
+                                </div>
                             </div>
                             <CardTitle className="text-2xl font-bold">{t('auth.2faVerification')}</CardTitle>
                             <CardDescription>
@@ -194,7 +199,9 @@ export default function AuthPage() {
                     <Card className="w-full max-w-md shadow-xl border-border/50">
                         <CardHeader className="text-center space-y-2">
                             <div className="lg:hidden mx-auto mb-4">
-                                <img src="/favicon.png" alt="Logo" className="w-12 h-12 mx-auto" />
+                                <div className="w-14 h-14 rounded-xl bg-gradient-to-br from-violet-600 to-indigo-600 flex items-center justify-center shadow-lg mx-auto">
+                                    <img src="/icon-transparent-128.png" alt="TaskFlow" className="w-10 h-10 object-contain" />
+                                </div>
                             </div>
                             <CardTitle className="text-2xl font-bold">{t('auth.welcomeBack')}</CardTitle>
                             <CardDescription>
diff --git a/client/src/pages/not-found.tsx b/client/src/pages/not-found.tsx
index 1820a66..e4bb856 100644
--- a/client/src/pages/not-found.tsx
+++ b/client/src/pages/not-found.tsx
@@ -14,7 +14,14 @@ import { Link } from "wouter";
 
 export default function NotFound() {
   return (
-    <div className="min-h-screen w-full flex items-center justify-center bg-background p-4">
+    <div className="min-h-screen w-full flex flex-col items-center justify-center bg-background p-4">
+      {/* Logo */}
+      <div className="mb-8 flex items-center gap-3">
+        <div className="w-10 h-10 rounded-xl bg-gradient-to-br from-violet-600 to-indigo-600 flex items-center justify-center shadow-lg">
+          <img src="/icon-transparent-128.png" alt="TaskFlow" className="w-7 h-7 object-contain" />
+        </div>
+        <span className="text-xl font-bold">TaskFlow</span>
+      </div>
       <Card className="w-full max-w-2xl mx-auto shadow-xl border-dashed border-2 overflow-hidden bg-card text-card-foreground">
         <div className="md:flex">
           <div className="md:w-1/2 bg-muted/30 flex items-center justify-center p-8">
diff --git a/logos/app-icons/icon-1024.png b/logos/app-icons/icon-1024.png
new file mode 100644
index 0000000..b3458a6
Binary files /dev/null and b/logos/app-icons/icon-1024.png differ
diff --git a/logos/app-icons/icon-128.png b/logos/app-icons/icon-128.png
new file mode 100644
index 0000000..6148e8d
Binary files /dev/null and b/logos/app-icons/icon-128.png differ
diff --git a/logos/app-icons/icon-20@1x.png b/logos/app-icons/icon-20@1x.png
new file mode 100644
index 0000000..9a2c068
Binary files /dev/null and b/logos/app-icons/icon-20@1x.png differ
diff --git a/logos/app-icons/icon-20@2x.png b/logos/app-icons/icon-20@2x.png
new file mode 100644
index 0000000..39d6384
Binary files /dev/null and b/logos/app-icons/icon-20@2x.png differ
diff --git a/logos/app-icons/icon-20@3x.png b/logos/app-icons/icon-20@3x.png
new file mode 100644
index 0000000..6a8d0f7
Binary files /dev/null and b/logos/app-icons/icon-20@3x.png differ
diff --git a/logos/app-icons/icon-256.png b/logos/app-icons/icon-256.png
new file mode 100644
index 0000000..eb86bf2
Binary files /dev/null and b/logos/app-icons/icon-256.png differ
diff --git a/logos/app-icons/icon-29@1x.png b/logos/app-icons/icon-29@1x.png
new file mode 100644
index 0000000..8964d87
Binary files /dev/null and b/logos/app-icons/icon-29@1x.png differ
diff --git a/logos/app-icons/icon-29@2x.png b/logos/app-icons/icon-29@2x.png
new file mode 100644
index 0000000..3cc9c76
Binary files /dev/null and b/logos/app-icons/icon-29@2x.png differ
diff --git a/logos/app-icons/icon-29@3x.png b/logos/app-icons/icon-29@3x.png
new file mode 100644
index 0000000..94b2a06
Binary files /dev/null and b/logos/app-icons/icon-29@3x.png differ
diff --git a/logos/app-icons/icon-40@1x.png b/logos/app-icons/icon-40@1x.png
new file mode 100644
index 0000000..39d6384
Binary files /dev/null and b/logos/app-icons/icon-40@1x.png differ
diff --git a/logos/app-icons/icon-40@2x.png b/logos/app-icons/icon-40@2x.png
new file mode 100644
index 0000000..3cdb7e9
Binary files /dev/null and b/logos/app-icons/icon-40@2x.png differ
diff --git a/logos/app-icons/icon-40@3x.png b/logos/app-icons/icon-40@3x.png
new file mode 100644
index 0000000..d2e59a7
Binary files /dev/null and b/logos/app-icons/icon-40@3x.png differ
diff --git a/logos/app-icons/icon-512.png b/logos/app-icons/icon-512.png
new file mode 100644
index 0000000..5526407
Binary files /dev/null and b/logos/app-icons/icon-512.png differ
diff --git a/logos/app-icons/icon-60@2x.png b/logos/app-icons/icon-60@2x.png
new file mode 100644
index 0000000..d2e59a7
Binary files /dev/null and b/logos/app-icons/icon-60@2x.png differ
diff --git a/logos/app-icons/icon-60@3x.png b/logos/app-icons/icon-60@3x.png
new file mode 100644
index 0000000..004fcc1
Binary files /dev/null and b/logos/app-icons/icon-60@3x.png differ
diff --git a/logos/app-icons/icon-76@1x.png b/logos/app-icons/icon-76@1x.png
new file mode 100644
index 0000000..bb3f55b
Binary files /dev/null and b/logos/app-icons/icon-76@1x.png differ
diff --git a/logos/app-icons/icon-76@2x.png b/logos/app-icons/icon-76@2x.png
new file mode 100644
index 0000000..f716f1f
Binary files /dev/null and b/logos/app-icons/icon-76@2x.png differ
diff --git a/logos/app-icons/icon-83.5@2x.png b/logos/app-icons/icon-83.5@2x.png
new file mode 100644
index 0000000..08cfa3a
Binary files /dev/null and b/logos/app-icons/icon-83.5@2x.png differ
diff --git a/logos/app-icons/notification-20@2x.png b/logos/app-icons/notification-20@2x.png
new file mode 100644
index 0000000..39d6384
Binary files /dev/null and b/logos/app-icons/notification-20@2x.png differ
diff --git a/logos/app-icons/notification-20@3x.png b/logos/app-icons/notification-20@3x.png
new file mode 100644
index 0000000..6a8d0f7
Binary files /dev/null and b/logos/app-icons/notification-20@3x.png differ
diff --git a/logos/favicon/favicon-128x128.png b/logos/favicon/favicon-128x128.png
new file mode 100644
index 0000000..6148e8d
Binary files /dev/null and b/logos/favicon/favicon-128x128.png differ
diff --git a/logos/favicon/favicon-16x16.png b/logos/favicon/favicon-16x16.png
new file mode 100644
index 0000000..d6da07e
Binary files /dev/null and b/logos/favicon/favicon-16x16.png differ
diff --git a/logos/favicon/favicon-256x256.png b/logos/favicon/favicon-256x256.png
new file mode 100644
index 0000000..eb86bf2
Binary files /dev/null and b/logos/favicon/favicon-256x256.png differ
diff --git a/logos/favicon/favicon-32x32.png b/logos/favicon/favicon-32x32.png
new file mode 100644
index 0000000..8624fbe
Binary files /dev/null and b/logos/favicon/favicon-32x32.png differ
diff --git a/logos/favicon/favicon-48x48.png b/logos/favicon/favicon-48x48.png
new file mode 100644
index 0000000..eeed5cf
Binary files /dev/null and b/logos/favicon/favicon-48x48.png differ
diff --git a/logos/favicon/favicon-64x64.png b/logos/favicon/favicon-64x64.png
new file mode 100644
index 0000000..6bce400
Binary files /dev/null and b/logos/favicon/favicon-64x64.png differ
diff --git a/logos/favicon/favicon.ico b/logos/favicon/favicon.ico
new file mode 100644
index 0000000..9444bf2
Binary files /dev/null and b/logos/favicon/favicon.ico differ
diff --git a/logos/icons/icon-app-style.png b/logos/icons/icon-app-style.png
new file mode 100644
index 0000000..beffc3c
Binary files /dev/null and b/logos/icons/icon-app-style.png differ
diff --git a/logos/icons/icon-circle-framed.png b/logos/icons/icon-circle-framed.png
new file mode 100644
index 0000000..bedce4b
Binary files /dev/null and b/logos/icons/icon-circle-framed.png differ
diff --git a/logos/icons/icon-circle.png b/logos/icons/icon-circle.png
new file mode 100644
index 0000000..42076c4
Binary files /dev/null and b/logos/icons/icon-circle.png differ
diff --git a/logos/icons/icon-transparent-128.png b/logos/icons/icon-transparent-128.png
new file mode 100644
index 0000000..10eff09
Binary files /dev/null and b/logos/icons/icon-transparent-128.png differ
diff --git a/logos/icons/icon-transparent-256.png b/logos/icons/icon-transparent-256.png
new file mode 100644
index 0000000..e9369e2
Binary files /dev/null and b/logos/icons/icon-transparent-256.png differ
diff --git a/logos/icons/icon-transparent-512.png b/logos/icons/icon-transparent-512.png
new file mode 100644
index 0000000..c8c875c
Binary files /dev/null and b/logos/icons/icon-transparent-512.png differ
diff --git a/logos/icons/icon-transparent-64.png b/logos/icons/icon-transparent-64.png
new file mode 100644
index 0000000..02b1321
Binary files /dev/null and b/logos/icons/icon-transparent-64.png differ
diff --git a/logos/icons/icon-transparent.png b/logos/icons/icon-transparent.png
new file mode 100644
index 0000000..03164ae
Binary files /dev/null and b/logos/icons/icon-transparent.png differ
diff --git a/logos/original/logo-horizontal-tagline-transparent.png b/logos/original/logo-horizontal-tagline-transparent.png
new file mode 100644
index 0000000..330499d
Binary files /dev/null and b/logos/original/logo-horizontal-tagline-transparent.png differ
diff --git a/logos/original/logo-horizontal-tagline.png b/logos/original/logo-horizontal-tagline.png
new file mode 100644
index 0000000..f37e156
Binary files /dev/null and b/logos/original/logo-horizontal-tagline.png differ
diff --git a/logos/original/logo-horizontal.png b/logos/original/logo-horizontal.png
new file mode 100644
index 0000000..af877cf
Binary files /dev/null and b/logos/original/logo-horizontal.png differ
diff --git a/logos/original/logo-stacked.png b/logos/original/logo-stacked.png
new file mode 100644
index 0000000..73fcf2c
Binary files /dev/null and b/logos/original/logo-stacked.png differ
diff --git a/server/email-template.ts b/server/email-template.ts
index f7e09c2..0ca3ca2 100644
--- a/server/email-template.ts
+++ b/server/email-template.ts
@@ -12,7 +12,7 @@ export function generateEmailHtml(language: string, content: {
         : "This email was sent automatically. Please do not reply.";
 
     const siteUrl = process.env.VITE_PUBLIC_APP_URL || "http://localhost:5001";
-    const logoUrl = `${siteUrl}/favicon.png`;
+    const logoUrl = `${siteUrl}/icon-256.png`;
 
     return `
 <!DOCTYPE html>
@@ -103,10 +103,7 @@ export function generateEmailHtml(language: string, content: {
 <body>
   <div class="container">
     <div class="logo">
-      <!-- Trying to link to external URL for logo if accessible, otherwise alt text plays role -->
-      <img src="https://raw.githubusercontent.com/shadcn-ui/ui/main/apps/www/public/favicon.ico" alt="TaskFlow" style="border-radius: 8px;" width="48" height="48"> 
-      <!-- Ideally we host the logo. For localhost, external clients won't see localhost images. I'll use a placeholder or assume the user will configure a real URL in prod. 
-           For now, I'll use a generic pleasing icon or text if image breaks, but let's try to pass the favicon. -->
+      <img src="${logoUrl}" alt="TaskFlow" style="border-radius: 12px;" width="56" height="56">
     </div>
     <div class="card">
       <h1>${content.title}</h1>
diff --git a/server/push.ts b/server/push.ts
index e4d29d7..1b06e97 100644
--- a/server/push.ts
+++ b/server/push.ts
@@ -207,8 +207,8 @@ export async function sendPushNotification(
   const notificationPayload = JSON.stringify({
     title: payload.title,
     body: payload.body,
-    icon: payload.icon || '/favicon.png',
-    badge: payload.badge || '/favicon.png',
+    icon: payload.icon || '/icon-256.png',
+    badge: payload.badge || '/icon-128.png',
     tag: payload.tag || `taskflow-${Date.now()}`,
     data: payload.data || {}
   });