diff --git a/apps/web-ui/public/android-chrome-192x192.png b/apps/web-ui/public/android-chrome-192x192.png
new file mode 100644
index 0000000..b04507c
Binary files /dev/null and b/apps/web-ui/public/android-chrome-192x192.png differ
diff --git a/apps/web-ui/public/android-chrome-512x512.png b/apps/web-ui/public/android-chrome-512x512.png
new file mode 100644
index 0000000..4ad7159
Binary files /dev/null and b/apps/web-ui/public/android-chrome-512x512.png differ
diff --git a/apps/web-ui/public/apple-touch-icon.png b/apps/web-ui/public/apple-touch-icon.png
new file mode 100644
index 0000000..6e745e8
Binary files /dev/null and b/apps/web-ui/public/apple-touch-icon.png differ
diff --git a/apps/web-ui/public/favicon-16x16.png b/apps/web-ui/public/favicon-16x16.png
new file mode 100644
index 0000000..4a4c577
Binary files /dev/null and b/apps/web-ui/public/favicon-16x16.png differ
diff --git a/apps/web-ui/public/favicon-32x32.png b/apps/web-ui/public/favicon-32x32.png
new file mode 100644
index 0000000..19d151a
Binary files /dev/null and b/apps/web-ui/public/favicon-32x32.png differ
diff --git a/apps/web-ui/public/favicon.ico b/apps/web-ui/public/favicon.ico
index 317ebcb..5600023 100644
Binary files a/apps/web-ui/public/favicon.ico and b/apps/web-ui/public/favicon.ico differ
diff --git a/apps/web-ui/public/logo.png b/apps/web-ui/public/logo.png
new file mode 100644
index 0000000..dc35878
Binary files /dev/null and b/apps/web-ui/public/logo.png differ
diff --git a/apps/web-ui/public/site.webmanifest b/apps/web-ui/public/site.webmanifest
new file mode 100644
index 0000000..0b3e9af
--- /dev/null
+++ b/apps/web-ui/public/site.webmanifest
@@ -0,0 +1 @@
+{"name":"Rustforms - Simple Form Backend","short_name":"Rustforms","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#000000","background_color":"#000000","display":"standalone","description":"Create forms and receive submissions via email"}
\ No newline at end of file
diff --git a/apps/web-ui/src/app/dashboard/layout.tsx b/apps/web-ui/src/app/dashboard/layout.tsx
index 2407be6..2f80170 100644
--- a/apps/web-ui/src/app/dashboard/layout.tsx
+++ b/apps/web-ui/src/app/dashboard/layout.tsx
@@ -4,9 +4,10 @@ import type React from "react"
 
 import { useState } from "react"
 import Link from "next/link"
+import Image from "next/image"
 import { Button } from "@/components/ui/button"
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
-import { Mail, User, LogOut, FileText, Users, CreditCard, Settings, Building } from "lucide-react"
+import { User, LogOut, FileText, Users, CreditCard, Settings, Building } from "lucide-react"
 import { Badge } from "@/components/ui/badge"
 import { FEATURE_FLAGS } from "@/lib/feature-flags"
 
@@ -28,8 +29,8 @@ export default function DashboardLayout({
       <header className="border-b border-gray-800 bg-black">
         <div className="container mx-auto px-4 py-4 flex items-center justify-between">
           <Link href="/dashboard" className="flex items-center space-x-2">
-            <div className="w-8 h-8 bg-white rounded-lg flex items-center justify-center">
-              <Mail className="w-4 h-4 text-black" />
+            <div className="w-8 h-8 rounded-lg flex items-center justify-center">
+              <Image src="/logo.png" alt="Rustforms Logo" width={32} height={32} className="object-contain" />
             </div>
             <span className="text-xl font-bold text-white">Rustforms</span>
           </Link>
diff --git a/apps/web-ui/src/app/layout.tsx b/apps/web-ui/src/app/layout.tsx
index 2f39955..74ca1fc 100644
--- a/apps/web-ui/src/app/layout.tsx
+++ b/apps/web-ui/src/app/layout.tsx
@@ -10,7 +10,21 @@ const inter = Inter({ subsets: ["latin"] })
 export const metadata: Metadata = {
   title: "Rustforms - Simple Form Backend",
   description: "Create forms and receive submissions via email",
-    generator: 'v0.dev'
+  icons: {
+    icon: [
+      { url: '/favicon-16x16.png', sizes: '16x16', type: 'image/png' },
+      { url: '/favicon-32x32.png', sizes: '32x32', type: 'image/png' },
+      { url: '/favicon.ico', sizes: 'any' }
+    ],
+    apple: [
+      { url: '/apple-touch-icon.png', sizes: '180x180', type: 'image/png' }
+    ],
+    other: [
+      { url: '/android-chrome-192x192.png', sizes: '192x192', type: 'image/png' },
+      { url: '/android-chrome-512x512.png', sizes: '512x512', type: 'image/png' }
+    ]
+  },
+  manifest: '/site.webmanifest'
 }
 
 export default function RootLayout({
diff --git a/apps/web-ui/src/app/page.tsx b/apps/web-ui/src/app/page.tsx
index 56bac6d..a71f4c9 100644
--- a/apps/web-ui/src/app/page.tsx
+++ b/apps/web-ui/src/app/page.tsx
@@ -1,8 +1,9 @@
 import Link from "next/link"
+import Image from "next/image"
 import { Button } from "@/components/ui/button"
 import { Card, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
 import { Badge } from "@/components/ui/badge"
-import { ArrowRight, Mail, Shield, Zap, Github, Globe } from "lucide-react"
+import { ArrowRight, Shield, Zap, Github, Globe } from "lucide-react"
 
 export default function HomePage() {
   return (
@@ -11,8 +12,8 @@ export default function HomePage() {
       <header className="border-b border-gray-800">
         <div className="container mx-auto px-4 py-4 flex items-center justify-between">
           <div className="flex items-center space-x-2">
-            <div className="w-8 h-8 bg-white rounded-lg flex items-center justify-center">
-              <Mail className="w-4 h-4 text-black" />
+            <div className="w-8 h-8 rounded-lg flex items-center justify-center">
+              <Image src="/logo.png" alt="Rustforms Logo" width={32} height={32} className="object-contain" />
             </div>
             <span className="text-xl font-bold text-white">Rustforms</span>
           </div>
@@ -147,8 +148,8 @@ export default function HomePage() {
       <footer className="border-t border-gray-800 py-8 px-4">
         <div className="container mx-auto">
           <div className="flex items-center justify-center space-x-2 mb-4">
-            <div className="w-6 h-6 bg-white rounded flex items-center justify-center">
-              <Mail className="w-3 h-3 text-black" />
+            <div className="w-6 h-6 rounded flex items-center justify-center">
+              <Image src="/logo.png" alt="Rustforms Logo" width={24} height={24} className="object-contain" />
             </div>
             <span className="font-semibold text-white">Rustforms</span>
           </div>
diff --git a/logo/android-chrome-192x192.png b/logo/android-chrome-192x192.png
new file mode 100644
index 0000000..b04507c
Binary files /dev/null and b/logo/android-chrome-192x192.png differ
diff --git a/logo/android-chrome-512x512.png b/logo/android-chrome-512x512.png
new file mode 100644
index 0000000..4ad7159
Binary files /dev/null and b/logo/android-chrome-512x512.png differ
diff --git a/logo/apple-touch-icon.png b/logo/apple-touch-icon.png
new file mode 100644
index 0000000..6e745e8
Binary files /dev/null and b/logo/apple-touch-icon.png differ
diff --git a/logo/favicon-16x16.png b/logo/favicon-16x16.png
new file mode 100644
index 0000000..4a4c577
Binary files /dev/null and b/logo/favicon-16x16.png differ
diff --git a/logo/favicon-32x32.png b/logo/favicon-32x32.png
new file mode 100644
index 0000000..19d151a
Binary files /dev/null and b/logo/favicon-32x32.png differ
diff --git a/logo/favicon.ico b/logo/favicon.ico
new file mode 100644
index 0000000..5600023
Binary files /dev/null and b/logo/favicon.ico differ
diff --git a/logo/logo.png b/logo/logo.png
new file mode 100644
index 0000000..dc35878
Binary files /dev/null and b/logo/logo.png differ
diff --git a/logo/site.webmanifest b/logo/site.webmanifest
new file mode 100644
index 0000000..45dc8a2
--- /dev/null
+++ b/logo/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
\ No newline at end of file