diff --git a/apps/web/public/logo-dark.png b/apps/web/public/logo-dark.png
index 0bbe5e0..7f7505d 100644
Binary files a/apps/web/public/logo-dark.png and b/apps/web/public/logo-dark.png differ
diff --git a/apps/web/public/logo-dark.svg b/apps/web/public/logo-dark.svg
new file mode 100644
index 0000000..be1e348
--- /dev/null
+++ b/apps/web/public/logo-dark.svg
@@ -0,0 +1,14 @@
+<svg width="650" height="650" viewBox="0 0 650 650" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_43_2" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="650" height="650">
+<path d="M0 200C0 105.719 0 58.5786 29.2893 29.2893C58.5786 0 105.719 0 200 0H450C544.281 0 591.421 0 620.711 29.2893C650 58.5786 650 105.719 650 200V450C650 544.281 650 591.421 620.711 620.711C591.421 650 544.281 650 450 650H200C105.719 650 58.5786 650 29.2893 620.711C0 591.421 0 544.281 0 450V200Z" fill="black"/>
+</mask>
+<g mask="url(#mask0_43_2)">
+<path d="M0 200C0 105.719 0 58.5786 29.2893 29.2893C58.5786 0 105.719 0 200 0H450C544.281 0 591.421 0 620.711 29.2893C650 58.5786 650 105.719 650 200V450C650 544.281 650 591.421 620.711 620.711C591.421 650 544.281 650 450 650H200C105.719 650 58.5786 650 29.2893 620.711C0 591.421 0 544.281 0 450V200Z" fill="white"/>
+<path d="M431.817 203.253C435.698 188.755 437.639 181.506 441.477 181.506C445.314 181.506 447.255 188.755 451.136 203.253L481.757 317.625C488.908 344.332 492.483 357.686 488.449 359.37C484.415 361.055 477.433 349.124 463.467 325.262L450.107 302.435C446.265 295.87 444.344 292.588 441.477 292.588C438.61 292.588 436.688 295.87 432.846 302.435L419.486 325.262C405.521 349.124 398.538 361.055 394.504 359.37C390.47 357.686 394.046 344.332 401.196 317.625L431.817 203.253Z" fill="black"/>
+<path d="M467.077 364.883C467.077 385.571 463.002 406.057 455.085 425.17C447.168 444.284 435.564 461.651 420.935 476.28C406.306 490.908 388.939 502.513 369.826 510.43C350.712 518.347 330.227 522.422 309.538 522.422C288.85 522.422 268.365 518.347 249.251 510.43C230.138 502.513 212.771 490.908 198.142 476.28C183.513 461.651 171.909 444.284 163.992 425.17C156.075 406.057 152 385.571 152 364.883L202.528 364.883C202.528 378.936 205.296 392.851 210.674 405.834C216.052 418.817 223.934 430.614 233.871 440.551C243.808 450.488 255.604 458.37 268.587 463.748C281.571 469.125 295.486 471.893 309.538 471.893C323.591 471.893 337.506 469.125 350.489 463.748C363.473 458.37 375.269 450.488 385.206 440.551C395.143 430.614 403.025 418.817 408.403 405.834C413.781 392.851 416.549 378.936 416.549 364.883H467.077Z" fill="black"/>
+<path d="M152 156.145C152 142.224 163.285 130.938 177.206 130.938V130.938C191.127 130.938 202.412 142.224 202.412 156.145V366.458C202.412 380.379 191.127 391.665 177.206 391.665V391.665C163.285 391.665 152 380.379 152 366.458V156.145Z" fill="black"/>
+<path d="M416.665 152.206C416.665 138.285 427.95 127 441.871 127V127C455.792 127 467.077 138.285 467.077 152.206V362.52C467.077 376.441 455.792 387.726 441.871 387.726V387.726C427.95 387.726 416.665 376.441 416.665 362.52V152.206Z" fill="black"/>
+<path d="M419.676 139.67C421.558 133.877 427.78 130.708 433.572 132.59V132.59C439.364 134.472 442.534 140.693 440.652 146.485L366.899 373.475C365.017 379.267 358.795 382.437 353.003 380.555V380.555C347.211 378.673 344.041 372.452 345.923 366.659L419.676 139.67Z" fill="black"/>
+<path d="M442.916 147.452C441.034 141.66 444.203 135.439 449.996 133.556V133.556C455.788 131.674 462.009 134.844 463.891 140.637L537.645 367.626C539.527 373.418 536.357 379.64 530.565 381.522V381.522C524.772 383.404 518.551 380.234 516.669 374.442L442.916 147.452Z" fill="black"/>
+</g>
+</svg>
diff --git a/apps/web/public/logo-light.png b/apps/web/public/logo-light.png
new file mode 100644
index 0000000..8779c72
Binary files /dev/null and b/apps/web/public/logo-light.png differ
diff --git a/apps/web/public/logo-light.svg b/apps/web/public/logo-light.svg
new file mode 100644
index 0000000..38e2455
--- /dev/null
+++ b/apps/web/public/logo-light.svg
@@ -0,0 +1,14 @@
+<svg width="650" height="650" viewBox="0 0 650 650" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_43_13" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="650" height="650">
+<path d="M0 200C0 105.719 0 58.5786 29.2893 29.2893C58.5786 0 105.719 0 200 0H450C544.281 0 591.421 0 620.711 29.2893C650 58.5786 650 105.719 650 200V450C650 544.281 650 591.421 620.711 620.711C591.421 650 544.281 650 450 650H200C105.719 650 58.5786 650 29.2893 620.711C0 591.421 0 544.281 0 450V200Z" fill="black"/>
+</mask>
+<g mask="url(#mask0_43_13)">
+<path d="M0 200C0 105.719 0 58.5786 29.2893 29.2893C58.5786 0 105.719 0 200 0H450C544.281 0 591.421 0 620.711 29.2893C650 58.5786 650 105.719 650 200V450C650 544.281 650 591.421 620.711 620.711C591.421 650 544.281 650 450 650H200C105.719 650 58.5786 650 29.2893 620.711C0 591.421 0 544.281 0 450V200Z" fill="black"/>
+<path d="M431.817 203.253C435.698 188.755 437.639 181.506 441.477 181.506C445.314 181.506 447.255 188.755 451.136 203.253L481.757 317.625C488.908 344.332 492.483 357.686 488.449 359.37C484.415 361.055 477.433 349.124 463.467 325.262L450.107 302.435C446.265 295.87 444.344 292.588 441.477 292.588C438.61 292.588 436.688 295.87 432.846 302.435L419.486 325.262C405.521 349.124 398.538 361.055 394.504 359.37C390.47 357.686 394.046 344.332 401.196 317.625L431.817 203.253Z" fill="white"/>
+<path d="M467.077 364.883C467.077 385.571 463.002 406.057 455.085 425.17C447.168 444.284 435.564 461.651 420.935 476.28C406.306 490.908 388.939 502.513 369.826 510.43C350.712 518.347 330.227 522.422 309.538 522.422C288.85 522.422 268.365 518.347 249.251 510.43C230.138 502.513 212.771 490.908 198.142 476.28C183.513 461.651 171.909 444.284 163.992 425.17C156.075 406.057 152 385.571 152 364.883L202.528 364.883C202.528 378.936 205.296 392.851 210.674 405.834C216.052 418.817 223.934 430.614 233.871 440.551C243.808 450.488 255.604 458.37 268.587 463.748C281.571 469.125 295.486 471.893 309.538 471.893C323.591 471.893 337.506 469.125 350.489 463.748C363.473 458.37 375.269 450.488 385.206 440.551C395.143 430.614 403.025 418.817 408.403 405.834C413.781 392.851 416.549 378.936 416.549 364.883H467.077Z" fill="white"/>
+<path d="M152 156.145C152 142.224 163.285 130.938 177.206 130.938V130.938C191.127 130.938 202.412 142.224 202.412 156.145V366.458C202.412 380.379 191.127 391.665 177.206 391.665V391.665C163.285 391.665 152 380.379 152 366.458V156.145Z" fill="white"/>
+<path d="M416.665 152.206C416.665 138.285 427.95 127 441.871 127V127C455.792 127 467.077 138.285 467.077 152.206V362.52C467.077 376.441 455.792 387.726 441.871 387.726V387.726C427.95 387.726 416.665 376.441 416.665 362.52V152.206Z" fill="white"/>
+<path d="M419.676 139.67C421.558 133.877 427.78 130.708 433.572 132.59V132.59C439.364 134.472 442.534 140.693 440.652 146.485L366.899 373.475C365.017 379.267 358.795 382.437 353.003 380.555V380.555C347.211 378.673 344.041 372.452 345.923 366.659L419.676 139.67Z" fill="white"/>
+<path d="M442.916 147.452C441.034 141.66 444.203 135.439 449.996 133.556V133.556C455.788 131.674 462.009 134.844 463.891 140.637L537.645 367.626C539.527 373.418 536.357 379.64 530.565 381.522V381.522C524.772 383.404 518.551 380.234 516.669 374.442L442.916 147.452Z" fill="white"/>
+</g>
+</svg>
diff --git a/apps/web/src/app/(dashboard)/emails/email-details.tsx b/apps/web/src/app/(dashboard)/emails/email-details.tsx
index 9626995..b62ee89 100644
--- a/apps/web/src/app/(dashboard)/emails/email-details.tsx
+++ b/apps/web/src/app/(dashboard)/emails/email-details.tsx
@@ -93,7 +93,7 @@ export default function EmailDetails({ emailId }: { emailId: string }) {
           </div>
         </div>
         {emailQuery.data?.latestStatus !== "SCHEDULED" ? (
-          <div className=" border rounded-lg w-full shadow ">
+          <div className=" border rounded-lg w-full shadow mb-2 ">
             <div className="  p-4 flex flex-col gap-8 w-full">
               <div className="font-medium">Events History</div>
               <div className="flex items-stretch px-4 w-full">
diff --git a/apps/web/src/app/login/login-page.tsx b/apps/web/src/app/login/login-page.tsx
index 146e975..ac59b08 100644
--- a/apps/web/src/app/login/login-page.tsx
+++ b/apps/web/src/app/login/login-page.tsx
@@ -26,6 +26,7 @@ import { env } from "~/env";
 import { BuiltInProviderType, Provider } from "next-auth/providers/index";
 import Spinner from "@unsend/ui/src/spinner";
 import Link from "next/link";
+import { useTheme } from "@unsend/ui";
 
 const emailSchema = z.object({
   email: z
@@ -110,15 +111,17 @@ export default function LoginPage({
     signIn(provider);
   };
 
+  const { resolvedTheme } = useTheme();
+
   return (
     <main className="h-screen flex justify-center items-center">
       <div className="flex flex-col gap-6">
         <Image
-          src="/logo-dark.png"
+          src={resolvedTheme === "dark" ? "/logo-dark.png" : "/logo-light.png"}
           alt="Unsend"
-          width={60}
-          height={60}
-          className="mx-auto border rounded-lg p-2 bg-black"
+          width={50}
+          height={50}
+          className="mx-auto"
         />
         <div>
           <p className="text-2xl text-center font-semibold">
diff --git a/apps/web/src/components/FullScreenLoading.tsx b/apps/web/src/components/FullScreenLoading.tsx
index b6711a3..c6ea56f 100644
--- a/apps/web/src/components/FullScreenLoading.tsx
+++ b/apps/web/src/components/FullScreenLoading.tsx
@@ -1,9 +1,17 @@
-import { Logo } from "@unsend/ui/src/logo";
+import { useTheme } from "@unsend/ui";
+import Image from "next/image";
 
 export const FullScreenLoading = () => {
+  const { resolvedTheme } = useTheme();
   return (
     <div className="flex items-center justify-center min-h-screen">
-      <Logo className="w-10 h-10" />
+      <Image
+        src={"/logo-light.png"}
+        alt="Unsend"
+        width={45}
+        height={45}
+        className="mx-auto"
+      />
     </div>
   );
 };