diff --git a/README.md b/README.md
index e1bf05c3..17f45206 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="./assets/icon.png" width="100px" />
+  <img src="./assets/logo.png" width="100px" />
   <h1>Linkwarden</h1>
 
 <a href="https://discord.com/invite/CtuYV47nuJ"><img src="https://img.shields.io/discord/1117993124669702164?logo=discord&style=flat-square" alt="Discord"></a>
diff --git a/assets/icon.png b/assets/icon.png
deleted file mode 100644
index cbdb11c4..00000000
Binary files a/assets/icon.png and /dev/null differ
diff --git a/assets/logo.png b/assets/logo.png
new file mode 100644
index 00000000..d3a3c7d0
Binary files /dev/null and b/assets/logo.png differ
diff --git a/components/Modal/User/BillingPortal.tsx b/components/Modal/User/BillingPortal.tsx
index 7710231b..214bfcab 100644
--- a/components/Modal/User/BillingPortal.tsx
+++ b/components/Modal/User/BillingPortal.tsx
@@ -17,8 +17,8 @@ export default function PaymentPortal() {
 
   return (
     <div className="mx-auto sm:w-[35rem] w-80">
-      <div className="max-w-[25rem] w-full mx-auto flex flex-col gap-3 justify-between">
-        <p className="text-md text-gray-500 dark:text-gray-400">
+      <div className=" w-full mx-auto flex flex-col gap-3 justify-between">
+        <p className="text-md text-black dark:text-white">
           To manage/cancel your subsciption, visit the billing portal.
         </p>
 
@@ -30,7 +30,7 @@ export default function PaymentPortal() {
           className="mx-auto mt-2"
         />
 
-        <p className="text-md text-gray-500 dark:text-gray-400">
+        <p className="text-md text-black dark:text-white">
           If you still need help or encountered any issues, feel free to reach
           out to us at:{" "}
           <a
diff --git a/components/Modal/User/ProfileSettings.tsx b/components/Modal/User/ProfileSettings.tsx
index 160e796c..b3ad2178 100644
--- a/components/Modal/User/ProfileSettings.tsx
+++ b/components/Modal/User/ProfileSettings.tsx
@@ -170,12 +170,12 @@ export default function ProfileSettings({
 
           {emailEnabled ? (
             <div>
-              <p className="text-sm text-black mb-2">Email</p>
+              <p className="text-sm text-black dark:text-white mb-2">Email</p>
               <input
                 type="text"
                 value={user.email || ""}
                 onChange={(e) => setUser({ ...user, email: e.target.value })}
-                className="w-full rounded-md p-2 border-sky-100 border-solid border outline-none focus:border-sky-700 duration-100"
+                className="w-full rounded-md p-2 border-sky-100 dark:border-neutral-700 dark:bg-neutral-900 border-solid border outline-none focus:border-sky-700 focus:dark:border-sky-600 duration-100"
               />
             </div>
           ) : undefined}
diff --git a/layouts/CenteredForm.tsx b/layouts/CenteredForm.tsx
index 8fd00dd6..5cb1c62d 100644
--- a/layouts/CenteredForm.tsx
+++ b/layouts/CenteredForm.tsx
@@ -1,4 +1,6 @@
+import { useTheme } from "next-themes";
 import Image from "next/image";
+import Link from "next/link";
 import React, { ReactNode } from "react";
 
 interface Props {
@@ -7,24 +9,39 @@ interface Props {
 }
 
 export default function CenteredForm({ text, children }: Props) {
+  const { theme } = useTheme();
   return (
-    <div className="absolute top-0 bottom-0 left-0 right-0 flex justify-center items-center p-2">
+    <div className="absolute top-0 bottom-0 left-0 right-0 flex justify-center items-center p-5">
       <div className="m-auto flex flex-col gap-2">
-        <Image
-          src="/linkwarden.png"
-          width={518}
-          height={145}
-          alt="Linkwarden"
-          className="h-12 w-fit mx-auto"
-        />
+        {theme === "light" ? (
+          <Image
+            src="/linkwarden.png"
+            width={518}
+            height={145}
+            alt="Linkwarden"
+            className="h-12 w-fit mx-auto"
+          />
+        ) : (
+          <Image
+            src="/linkwarden_darkmode.png"
+            width={518}
+            height={145}
+            alt="Linkwarden"
+            className="h-12 w-fit mx-auto"
+          />
+        )}
         {text ? (
           <p className="text-lg sm:w-[30rem] w-80 mx-auto font-semibold text-black dark:text-white px-2 text-center">
             {text}
           </p>
         ) : undefined}
         {children}
-        <p className="text-center text-xs text-gray-500 dark:text-gray-400">
-          © {new Date().getFullYear()} Linkwarden. All rights reserved.
+        <p className="text-center text-xs text-gray-500 mb-5 dark:text-gray-400">
+          © {new Date().getFullYear()}{" "}
+          <Link href="https://linkwarden.app" className="font-semibold">
+            Linkwarden
+          </Link>
+          . All rights reserved.
         </p>
       </div>
     </div>
diff --git a/pages/_app.tsx b/pages/_app.tsx
index c804bd20..7e8dd7c2 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -14,8 +14,11 @@ export default function App({
 }: AppProps<{
   session: Session;
 }>) {
+  const defaultTheme: "light" | "dark" = "dark";
+
   useEffect(() => {
-    if (!localStorage.getItem("theme")) localStorage.setItem("theme", "light");
+    if (!localStorage.getItem("theme"))
+      localStorage.setItem("theme", defaultTheme);
   }, []);
 
   return (
diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx
index 5e2c7d14..a664ce22 100644
--- a/pages/collections/[id].tsx
+++ b/pages/collections/[id].tsx
@@ -116,7 +116,7 @@ export default function Index() {
             ) : null}
           </div>
 
-          <div className="text-gray-500 dark:text-gray-300 flex justify-between items-end gap-5">
+          <div className="text-black dark:text-white flex justify-between items-end gap-5">
             <p>{activeCollection?.description}</p>
             <div className="flex items-center gap-2">
               <div className="relative">
diff --git a/pages/forgot.tsx b/pages/forgot.tsx
index 863fe9ac..5e37d3e4 100644
--- a/pages/forgot.tsx
+++ b/pages/forgot.tsx
@@ -41,7 +41,7 @@ export default function Forgot() {
   return (
     <CenteredForm>
       <div className="p-4 flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
-        <p className="text-2xl text-black dark:text-white font-bold">
+        <p className="text-2xl text-center text-black dark:text-white font-bold">
           Password Recovery
         </p>
         <div>
diff --git a/pages/login.tsx b/pages/login.tsx
index e1ef1ae4..65b36f2d 100644
--- a/pages/login.tsx
+++ b/pages/login.tsx
@@ -55,7 +55,7 @@ export default function Login() {
         <div>
           <p className="text-sm text-black dark:text-white w-fit font-semibold mb-1">
             Username
-            {emailEnabled ? "/Email" : undefined}
+            {emailEnabled ? " or Email" : undefined}
           </p>
 
           <input
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 713a8b7c..126d464b 100644
Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
index 95ccf39b..c517e7ae 100644
Binary files a/public/android-chrome-512x512.png and b/public/android-chrome-512x512.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index bbef715d..92374589 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
index 96fc790c..d66a6c3c 100644
Binary files a/public/favicon-16x16.png and b/public/favicon-16x16.png differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
index 993c56ad..4ab1df55 100644
Binary files a/public/favicon-32x32.png and b/public/favicon-32x32.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index 3e2b0792..3c54efd1 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/linkwarden.png b/public/linkwarden.png
index 6ae5903a..235fa728 100644
Binary files a/public/linkwarden.png and b/public/linkwarden.png differ
diff --git a/public/linkwarden_darkmode.png b/public/linkwarden_darkmode.png
new file mode 100644
index 00000000..081f0652
Binary files /dev/null and b/public/linkwarden_darkmode.png differ