diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index c7b94b080..93d4b61f9 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -72,7 +72,7 @@ export function Navbar({ children }: { children: React.ReactNode }) {
           <Link
             to="/login"
             className="flex items-center gap-1 bg-gray-500/20 rounded-lg p-2 opacity-80
-            hover:opacity-100 whitespace-nowrap uppercase font-black text-xs"
+            hover:opacity-100 transition-opacity duration-300 ease-in-out whitespace-nowrap uppercase font-black text-xs"
           >
             <LuUser className="scale-125" />
             <div className="">Log In</div>
@@ -112,36 +112,41 @@ export function Navbar({ children }: { children: React.ReactNode }) {
     </>
   )
 
+  const socialLinksData = [
+    {
+      href: 'https://x.com/tan_stack',
+      label: 'Follow TanStack on X.com',
+      icon: <TbBrandX className="text-xl" />,
+    },
+    {
+      href: 'https://bsky.app/profile/tanstack.com',
+      label: 'Follow TanStack on Bluesky',
+      icon: <TbBrandBluesky className="text-xl" />,
+    },
+    {
+      href: 'https://instagram.com/tan_stack',
+      label: 'Follow TanStack on Instagram',
+      icon: <FaInstagram className="text-xl" />,
+    },
+    {
+      href: 'https://tlinz.com/discord',
+      label: 'Join TanStack Discord',
+      icon: <FaDiscord className="text-xl" />,
+    },
+  ]
+
   const socialLinks = (
     <div className="flex items-center gap-1">
-      <a
-        href="https://x.com/tan_stack"
-        className="opacity-70 hover:opacity-100"
-        aria-label="Follow TanStack on X.com"
-      >
-        <TbBrandX className="text-xl" />
-      </a>
-      <a
-        href="https://bsky.app/profile/tanstack.com"
-        className="opacity-70 hover:opacity-100"
-        aria-label="Follow TanStack on Bluesky"
-      >
-        <TbBrandBluesky className="text-xl" />
-      </a>
-      <a
-        href="https://instagram.com/tan_stack"
-        className="opacity-70 hover:opacity-100"
-        aria-label="Follow TanStack on Instagram"
-      >
-        <FaInstagram className="text-xl" />
-      </a>
-      <a
-        href="https://tlinz.com/discord"
-        className="opacity-70 hover:opacity-100"
-        aria-label="Join TanStack Discord"
-      >
-        <FaDiscord className="text-xl" />
-      </a>
+      {socialLinksData.map((link, index) => (
+        <a
+          key={index}
+          href={link.href}
+          className="transition-opacity duration-300 ease-in-out opacity-70 hover:opacity-100"
+          aria-label={link.label}
+        >
+          {link.icon}
+        </a>
+      ))}
     </div>
   )
 
diff --git a/src/components/ThemeToggle.tsx b/src/components/ThemeToggle.tsx
index 2b93087b5..bee92928c 100644
--- a/src/components/ThemeToggle.tsx
+++ b/src/components/ThemeToggle.tsx
@@ -18,7 +18,7 @@ export function ThemeToggle() {
       onClick={handleToggleMode}
       className={`bg-gray-500/10 dark:bg-gray-500/30 rounded-lg flex items-center justify-between
         hover:bg-gray-500/20 dark:hover:bg-gray-500/40
-        cursor-pointer transition-all text-xs font-black`}
+        cursor-pointer transition-all duration-300 ease-in-out text-xs font-black`}
     >
       <div className="flex-1 flex items-center justify-between p-2 gap-1">
         <FaSun className={`hidden light:block`} />