diff --git a/app/layout.tsx b/app/layout.tsx
index 1ac5b1c53e..3ac51fb21d 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,3 +1,4 @@
+import { Metadata } from "next"
 import { Toaster } from "@/components/ui/sonner"
 import { GlobalState } from "@/components/utility/global-state"
 import { Providers } from "@/components/utility/providers"
@@ -14,6 +15,13 @@ interface RootLayoutProps {
   children: ReactNode
 }
 
+export const metadata: Metadata = {
+  title: {
+    template: "%s - Chatbot UI",
+    default: "Chatbot UI"
+  }
+}
+
 export default async function RootLayout({ children }: RootLayoutProps) {
   const cookieStore = cookies()
   const supabase = createServerClient<Database>(
diff --git a/app/login/page.tsx b/app/login/page.tsx
index 1292bfc117..5bfef15b29 100644
--- a/app/login/page.tsx
+++ b/app/login/page.tsx
@@ -5,9 +5,14 @@ import { Label } from "@/components/ui/label"
 import { createClient } from "@/lib/supabase/server"
 import { Database } from "@/supabase/types"
 import { createServerClient } from "@supabase/ssr"
+import { Metadata } from "next"
 import { cookies, headers } from "next/headers"
 import { redirect } from "next/navigation"
 
+export const metadata: Metadata = {
+  title: "Login"
+}
+
 export default async function Login({
   searchParams
 }: {
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000..224b25a38f
Binary files /dev/null and b/public/favicon.ico differ