diff --git a/app/(auth)/register/page.tsx b/app/(auth)/register/page.tsx
index 7ce889d..f9b1621 100644
--- a/app/(auth)/register/page.tsx
+++ b/app/(auth)/register/page.tsx
@@ -51,7 +51,7 @@ export default function RegisterPage() {
             }}
           >
             <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-primary/10">
-              <IconLock size={24} className="text-primary" />
+              <IconLock className="size-6 text-primary" />
             </div>
             <div className="space-y-2">
               <h1 className="font-display text-xl tracking-tight">
diff --git a/app/(pages)/dashboard/_components/continue-watching-card.tsx b/app/(pages)/dashboard/_components/continue-watching-card.tsx
index 904e3e4..1f71dcd 100644
--- a/app/(pages)/dashboard/_components/continue-watching-card.tsx
+++ b/app/(pages)/dashboard/_components/continue-watching-card.tsx
@@ -48,7 +48,7 @@ export function ContinueWatchingCard({
           />
         ) : (
           <div className="flex h-full items-center justify-center bg-gradient-to-br from-card via-secondary to-muted">
-            <IconPlayerPlay size={32} className="text-muted-foreground/30" />
+            <IconPlayerPlay className="size-8 text-muted-foreground/30" />
           </div>
         )}
         <div className="absolute inset-0 bg-gradient-to-t from-black/70 via-black/20 to-transparent" />
@@ -76,7 +76,7 @@ export function ContinueWatchingCard({
           </p>
         </div>
         <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-primary/10 text-primary transition-colors group-hover:bg-primary group-hover:text-primary-foreground">
-          <IconPlayerPlay size={14} />
+          <IconPlayerPlay className="size-3.5" />
         </div>
       </div>
       {progress > 0 && (
diff --git a/app/(pages)/dashboard/_components/continue-watching-section.tsx b/app/(pages)/dashboard/_components/continue-watching-section.tsx
index 197e700..07d4775 100644
--- a/app/(pages)/dashboard/_components/continue-watching-section.tsx
+++ b/app/(pages)/dashboard/_components/continue-watching-section.tsx
@@ -34,7 +34,7 @@ export async function ContinueWatchingSection({ userId }: { userId: string }) {
   return (
     <FeedSection
       title="Continue Watching"
-      icon={<IconPlayerPlay size={20} className="text-primary" />}
+      icon={<IconPlayerPlay className="size-5 text-primary" />}
     >
       <ContinueWatchingList items={items} />
     </FeedSection>
diff --git a/app/(pages)/dashboard/_components/library-section.tsx b/app/(pages)/dashboard/_components/library-section.tsx
index 51f6c9f..b2f5adc 100644
--- a/app/(pages)/dashboard/_components/library-section.tsx
+++ b/app/(pages)/dashboard/_components/library-section.tsx
@@ -21,7 +21,7 @@ export async function LibrarySection({ userId }: { userId: string }) {
   return (
     <FeedSection
       title="In Your Library"
-      icon={<IconSparkles size={20} className="text-primary" />}
+      icon={<IconSparkles className="size-5 text-primary" />}
     >
       <TitleGrid items={items} />
     </FeedSection>
diff --git a/app/(pages)/dashboard/_components/recommendations-section.tsx b/app/(pages)/dashboard/_components/recommendations-section.tsx
index 5585bfc..13ac76e 100644
--- a/app/(pages)/dashboard/_components/recommendations-section.tsx
+++ b/app/(pages)/dashboard/_components/recommendations-section.tsx
@@ -24,7 +24,7 @@ export async function RecommendationsSection({ userId }: { userId: string }) {
   return (
     <FeedSection
       title="Recommended for You"
-      icon={<IconSparkles size={20} className="text-primary" />}
+      icon={<IconSparkles className="size-5 text-primary" />}
     >
       <TitleGrid items={items} />
     </FeedSection>
diff --git a/app/(pages)/dashboard/_components/stats-display.tsx b/app/(pages)/dashboard/_components/stats-display.tsx
index 3a3eb3d..29cec28 100644
--- a/app/(pages)/dashboard/_components/stats-display.tsx
+++ b/app/(pages)/dashboard/_components/stats-display.tsx
@@ -63,7 +63,7 @@ export function StatsDisplay({ stats }: { stats: DashboardStats }) {
               <div
                 className={`flex h-6 w-6 items-center justify-center rounded-md ${def.bgColor}`}
               >
-                <Icon size={13} className={def.color} />
+                <Icon className={`size-[13px] ${def.color}`} />
               </div>
               <span className="text-[10px] font-medium uppercase tracking-wider text-muted-foreground">
                 {def.label}
diff --git a/app/(pages)/dashboard/_components/stats-section.tsx b/app/(pages)/dashboard/_components/stats-section.tsx
index 3666aa1..cce6988 100644
--- a/app/(pages)/dashboard/_components/stats-section.tsx
+++ b/app/(pages)/dashboard/_components/stats-section.tsx
@@ -18,7 +18,7 @@ export async function StatsSection({ userId }: { userId: string }) {
       {isEmpty && (
         <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed border-border/50 py-16 text-center">
           <div className="animate-gentle-float rounded-full bg-primary/10 p-4">
-            <IconDeviceTv size={32} className="text-primary" />
+            <IconDeviceTv className="size-8 text-primary" />
           </div>
           <div className="space-y-1">
             <p className="font-medium">Your library is empty</p>
diff --git a/app/(pages)/explore/hero-banner.tsx b/app/(pages)/explore/hero-banner.tsx
index 92ae30d..c619b82 100644
--- a/app/(pages)/explore/hero-banner.tsx
+++ b/app/(pages)/explore/hero-banner.tsx
@@ -68,7 +68,7 @@ export function HeroBanner({
                   </span>
                   {voteAverage > 0 && (
                     <span className="flex items-center gap-1 text-sm text-primary">
-                      <IconStar size={14} className="fill-primary" />
+                      <IconStar className="size-3.5 fill-primary" />
                       {voteAverage.toFixed(1)}
                     </span>
                   )}
@@ -88,7 +88,7 @@ export function HeroBanner({
                   href={href}
                   className="mt-4 inline-flex h-9 items-center gap-2 rounded-lg bg-primary px-4 text-sm font-medium text-primary-foreground transition-all hover:shadow-md hover:shadow-primary/20"
                 >
-                  <IconPlus size={16} />
+                  <IconPlus className="size-4" />
                   Add to Library
                 </Link>
               </motion.div>
diff --git a/app/(pages)/explore/page.tsx b/app/(pages)/explore/page.tsx
index 4996a13..7e5b341 100644
--- a/app/(pages)/explore/page.tsx
+++ b/app/(pages)/explore/page.tsx
@@ -66,19 +66,19 @@ export default async function ExplorePage() {
 
       <TitleRow
         heading="Trending Today"
-        icon={<IconFlame size={20} className="text-primary" />}
+        icon={<IconFlame className="size-5 text-primary" />}
         items={trendingItems.slice(0, 20)}
       />
 
       <TitleRow
         heading="Popular Movies"
-        icon={<IconMovie size={20} className="text-primary" />}
+        icon={<IconMovie className="size-5 text-primary" />}
         items={popularMovieItems.slice(0, 20)}
       />
 
       <TitleRow
         heading="Popular TV Shows"
-        icon={<IconDeviceTv size={20} className="text-primary" />}
+        icon={<IconDeviceTv className="size-5 text-primary" />}
         items={popularTvItems.slice(0, 20)}
       />
 
diff --git a/app/(pages)/settings/_components/account-section.tsx b/app/(pages)/settings/_components/account-section.tsx
index e4c0b07..f9dce0a 100644
--- a/app/(pages)/settings/_components/account-section.tsx
+++ b/app/(pages)/settings/_components/account-section.tsx
@@ -27,7 +27,7 @@ export function AccountSection({
   return (
     <div>
       <div className="mb-3 flex items-center gap-2">
-        <IconUser size={16} className="text-muted-foreground" />
+        <IconUser className="size-4 text-muted-foreground" />
         <h2 className="text-xs font-medium uppercase tracking-wider text-muted-foreground">
           Account
         </h2>
@@ -59,7 +59,7 @@ export function AccountSection({
               router.refresh();
             }}
           >
-            <IconLogout size={14} />
+            <IconLogout />
             Sign out
           </Button>
         </CardContent>
diff --git a/app/(pages)/settings/_components/backup-section.tsx b/app/(pages)/settings/_components/backup-section.tsx
index 43ba684..56ef56a 100644
--- a/app/(pages)/settings/_components/backup-section.tsx
+++ b/app/(pages)/settings/_components/backup-section.tsx
@@ -27,6 +27,11 @@ import { Button } from "@/components/ui/button";
 import { CardContent, CardDescription, CardTitle } from "@/components/ui/card";
 import { Spinner } from "@/components/ui/spinner";
 import { Switch } from "@/components/ui/switch";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import type { BackupInfo } from "@/lib/services/backup";
 import {
   createBackupAction,
@@ -208,38 +213,50 @@ export function BackupSection({
                       )}
                     </div>
                     <div className="flex shrink-0 items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-                      <Button
-                        variant="ghost"
-                        size="icon-sm"
-                        nativeButton={false}
-                        render={
-                          <a
-                            href={`/api/backup/${backup.filename}`}
-                            download
-                            title="Download"
-                            aria-label="Download backup"
-                          >
-                            <IconCloudDownload />
-                          </a>
-                        }
-                      />
-                      <AlertDialog>
-                        <AlertDialogTrigger
+                      <Tooltip>
+                        <TooltipTrigger
                           render={
                             <Button
                               variant="ghost"
                               size="icon-sm"
-                              disabled={deleting === backup.filename}
-                              title="Delete"
+                              nativeButton={false}
+                              render={
+                                <a
+                                  href={`/api/backup/${backup.filename}`}
+                                  download
+                                  aria-label="Download backup"
+                                >
+                                  <IconCloudDownload />
+                                </a>
+                              }
                             />
                           }
-                        >
-                          {deleting === backup.filename ? (
-                            <Spinner />
-                          ) : (
-                            <IconTrash />
-                          )}
-                        </AlertDialogTrigger>
+                        />
+                        <TooltipContent>Download</TooltipContent>
+                      </Tooltip>
+                      <AlertDialog>
+                        <Tooltip>
+                          <AlertDialogTrigger
+                            render={
+                              <TooltipTrigger
+                                render={
+                                  <Button
+                                    variant="ghost"
+                                    size="icon-sm"
+                                    disabled={deleting === backup.filename}
+                                  />
+                                }
+                              />
+                            }
+                          >
+                            {deleting === backup.filename ? (
+                              <Spinner />
+                            ) : (
+                              <IconTrash />
+                            )}
+                          </AlertDialogTrigger>
+                          <TooltipContent>Delete</TooltipContent>
+                        </Tooltip>
                         <AlertDialogContent>
                           <AlertDialogHeader>
                             <AlertDialogTitle>Delete backup?</AlertDialogTitle>
diff --git a/app/(pages)/settings/_components/integrations-section.tsx b/app/(pages)/settings/_components/integrations-section.tsx
index 19dbcd8..4e06678 100644
--- a/app/(pages)/settings/_components/integrations-section.tsx
+++ b/app/(pages)/settings/_components/integrations-section.tsx
@@ -95,7 +95,7 @@ export function IntegrationsSection({
   return (
     <div>
       <div className="mb-3 flex items-center gap-2">
-        <IconWebhook size={16} className="text-muted-foreground" />
+        <IconWebhook className="size-4 text-muted-foreground" />
         <h2 className="text-xs font-medium uppercase tracking-wider text-muted-foreground">
           Integrations
         </h2>
diff --git a/app/(pages)/settings/_components/server-section.tsx b/app/(pages)/settings/_components/server-section.tsx
index 9ac9a93..a38e14c 100644
--- a/app/(pages)/settings/_components/server-section.tsx
+++ b/app/(pages)/settings/_components/server-section.tsx
@@ -37,7 +37,7 @@ export function ServerSection({
       <div className="flex items-center justify-between gap-4">
         <div className="flex items-start gap-3">
           <div className="mt-0.5 flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-primary/10">
-            <IconUserPlus size={16} className="text-primary" />
+            <IconUserPlus className="size-4 text-primary" />
           </div>
           <div>
             <CardTitle>Open registration</CardTitle>
diff --git a/app/(pages)/settings/_components/settings-shell.tsx b/app/(pages)/settings/_components/settings-shell.tsx
index 75557ec..871775d 100644
--- a/app/(pages)/settings/_components/settings-shell.tsx
+++ b/app/(pages)/settings/_components/settings-shell.tsx
@@ -32,7 +32,7 @@ export function SettingsShell({
     >
       <motion.div variants={sectionVariants}>
         <div className="flex items-center gap-2">
-          <IconSettings size={20} className="text-primary" />
+          <IconSettings className="size-5 text-primary" />
           <h1 className="font-display text-3xl tracking-tight">Settings</h1>
         </div>
         <p className="mt-1 text-sm text-muted-foreground">
diff --git a/app/(pages)/settings/_components/webhook-card.tsx b/app/(pages)/settings/_components/webhook-card.tsx
index 084807b..a06e50e 100644
--- a/app/(pages)/settings/_components/webhook-card.tsx
+++ b/app/(pages)/settings/_components/webhook-card.tsx
@@ -9,6 +9,7 @@ import {
   IconRefresh,
   IconTrash,
 } from "@tabler/icons-react";
+import { formatDistanceToNow } from "date-fns";
 import { AnimatePresence, motion } from "motion/react";
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
@@ -49,17 +50,6 @@ export interface WebhookConnection {
   }[];
 }
 
-export function timeAgo(dateStr: string): string {
-  const diff = Date.now() - new Date(dateStr).getTime();
-  const mins = Math.floor(diff / 60000);
-  if (mins < 1) return "just now";
-  if (mins < 60) return `${mins}m ago`;
-  const hours = Math.floor(mins / 60);
-  if (hours < 24) return `${hours}h ago`;
-  const days = Math.floor(hours / 24);
-  return `${days}d ago`;
-}
-
 export function WebhookCard({
   provider,
   connection,
@@ -122,15 +112,14 @@ export function WebhookCard({
                 <CardDescription>
                   {connection
                     ? connection.lastEventAt
-                      ? `Last event ${timeAgo(connection.lastEventAt)}`
+                      ? `Last event ${formatDistanceToNow(new Date(connection.lastEventAt), { addSuffix: true })}`
                       : "Connected — no events yet"
                     : "Not configured"}
                 </CardDescription>
               </div>
             </div>
             <IconChevronDown
-              size={16}
-              className={`text-muted-foreground transition-transform duration-200 ${cardOpen ? "rotate-180" : ""}`}
+              className={`size-4 text-muted-foreground transition-transform duration-200 ${cardOpen ? "rotate-180" : ""}`}
             />
           </CollapsibleTrigger>
         </CardContent>
@@ -151,10 +140,7 @@ export function WebhookCard({
 
             {isPlex && (
               <div className="flex gap-2.5 rounded-lg border border-primary/20 bg-primary/5 px-3 py-2.5">
-                <IconInfoCircle
-                  size={14}
-                  className="mt-0.5 shrink-0 text-primary"
-                />
+                <IconInfoCircle className="mt-0.5 size-3.5 shrink-0 text-primary" />
                 <p className="text-xs leading-relaxed text-foreground/80">
                   Plex webhooks require an active{" "}
                   <a
@@ -240,9 +226,9 @@ export function WebhookCard({
                           }
                         >
                           {copied ? (
-                            <IconCheck size={14} className="text-green-400" />
+                            <IconCheck className="text-green-400" />
                           ) : (
-                            <IconCopy size={14} />
+                            <IconCopy />
                           )}
                         </TooltipTrigger>
                         <TooltipContent>Copy URL</TooltipContent>
@@ -256,7 +242,7 @@ export function WebhookCard({
                       size="sm"
                       onClick={() => onRegenerateToken(provider)}
                     >
-                      <IconRefresh size={12} />
+                      <IconRefresh />
                       Regenerate URL
                     </Button>
                     <Button
@@ -264,7 +250,7 @@ export function WebhookCard({
                       size="sm"
                       onClick={() => onDelete(provider)}
                     >
-                      <IconTrash size={12} />
+                      <IconTrash />
                       Disconnect
                     </Button>
                   </div>
@@ -275,8 +261,7 @@ export function WebhookCard({
             <Collapsible open={setupOpen} onOpenChange={setSetupOpen}>
               <CollapsibleTrigger className="flex w-full items-center gap-1.5 rounded-md py-1 text-xs text-muted-foreground transition-colors hover:text-foreground">
                 <IconChevronDown
-                  size={12}
-                  className={`transition-transform ${setupOpen ? "rotate-0" : "-rotate-90"}`}
+                  className={`size-3 transition-transform ${setupOpen ? "rotate-0" : "-rotate-90"}`}
                 />
                 Setup instructions
               </CollapsibleTrigger>
diff --git a/app/(pages)/settings/page.tsx b/app/(pages)/settings/page.tsx
index af93689..1a11bbe 100644
--- a/app/(pages)/settings/page.tsx
+++ b/app/(pages)/settings/page.tsx
@@ -112,7 +112,7 @@ export default async function SettingsPage() {
       {isAdmin && (
         <div>
           <div className="mb-3 flex items-center gap-2">
-            <IconServerCog size={16} className="text-muted-foreground" />
+            <IconServerCog className="size-4 text-muted-foreground" />
             <h2 className="text-xs font-medium uppercase tracking-wider text-muted-foreground">
               Server
             </h2>
diff --git a/app/(pages)/setup/page.tsx b/app/(pages)/setup/page.tsx
index c7dee70..38bf302 100644
--- a/app/(pages)/setup/page.tsx
+++ b/app/(pages)/setup/page.tsx
@@ -24,7 +24,7 @@ const steps = [
           className="inline-flex items-center gap-1 font-medium text-primary underline decoration-primary/30 underline-offset-2 transition-colors hover:decoration-primary"
         >
           themoviedb.org
-          <IconExternalLink size={14} />
+          <IconExternalLink className="size-3.5" />
         </a>{" "}
         and sign up for a free account.
       </>
@@ -43,7 +43,7 @@ const steps = [
           className="inline-flex items-center gap-1 font-medium text-primary underline decoration-primary/30 underline-offset-2 transition-colors hover:decoration-primary"
         >
           Settings &rarr; API
-          <IconExternalLink size={14} />
+          <IconExternalLink className="size-3.5" />
         </a>{" "}
         and request an API key. Choose &ldquo;Developer&rdquo; when asked. You
         need the{" "}
@@ -133,7 +133,7 @@ export default function SetupPage() {
       {/* Header */}
       <motion.div variants={sectionVariants} className="space-y-3">
         <div className="inline-flex items-center gap-2 rounded-full border border-primary/20 bg-primary/5 px-3 py-1 text-xs font-medium text-primary">
-          <IconKey size={14} />
+          <IconKey className="size-3.5" />
           Setup required
         </div>
         <h1 className="font-display text-3xl tracking-tight sm:text-4xl">
@@ -188,12 +188,12 @@ export default function SetupPage() {
                         >
                           {copiedIdx === idx ? (
                             <>
-                              <IconCheck size={12} className="text-green-400" />
+                              <IconCheck className="size-3 text-green-400" />
                               Copied
                             </>
                           ) : (
                             <>
-                              <IconCopy size={12} />
+                              <IconCopy className="size-3" />
                               Copy
                             </>
                           )}
@@ -217,7 +217,7 @@ export default function SetupPage() {
           {configured === true ? (
             <div className="flex items-center gap-3">
               <div className="flex h-10 w-10 items-center justify-center rounded-full bg-green-500/10">
-                <IconCheck size={20} className="text-green-400" />
+                <IconCheck className="size-5 text-green-400" />
               </div>
               <div>
                 <p className="font-medium text-green-400">
diff --git a/app/(pages)/titles/[id]/_components/star-rating.tsx b/app/(pages)/titles/[id]/_components/star-rating.tsx
index 1d36952..49a702c 100644
--- a/app/(pages)/titles/[id]/_components/star-rating.tsx
+++ b/app/(pages)/titles/[id]/_components/star-rating.tsx
@@ -40,9 +40,9 @@ export function StarRating({ value, onChange }: StarRatingProps) {
             }}
           >
             {filled ? (
-              <IconStarFilled size={18} className="text-primary" />
+              <IconStarFilled className="size-4.5 text-primary" />
             ) : (
-              <IconStar size={18} className="text-muted-foreground/30" />
+              <IconStar className="size-4.5 text-muted-foreground/30" />
             )}
           </motion.button>
         );
diff --git a/app/(pages)/titles/[id]/_components/status-button.tsx b/app/(pages)/titles/[id]/_components/status-button.tsx
index a1814be..fced4c2 100644
--- a/app/(pages)/titles/[id]/_components/status-button.tsx
+++ b/app/(pages)/titles/[id]/_components/status-button.tsx
@@ -50,7 +50,7 @@ export function StatusButton({ currentStatus, onChange }: StatusButtonProps) {
           transition={{ duration: 0.15 }}
           className="inline-flex h-9 items-center gap-2 rounded-lg bg-primary/10 px-4 text-sm font-medium text-primary ring-1 ring-primary/20 transition-all hover:bg-primary/15 hover:ring-primary/30 active:scale-[0.97]"
         >
-          <IconPlus size={14} strokeWidth={2.5} />
+          <IconPlus className="size-3.5" strokeWidth={2.5} />
           Watchlist
         </motion.button>
       ) : (
@@ -66,14 +66,8 @@ export function StatusButton({ currentStatus, onChange }: StatusButtonProps) {
           className={`group inline-flex h-9 items-center gap-2 rounded-lg px-4 text-sm font-medium ring-1 transition-all active:scale-[0.97] ${config.class} ${config.bgClass} ${config.borderClass} hover:ring-destructive/30 hover:bg-destructive/10 hover:text-destructive`}
         >
           <span className="grid [&>svg]:col-start-1 [&>svg]:row-start-1">
-            <config.icon
-              size={14}
-              className="transition-opacity group-hover:opacity-0"
-            />
-            <IconX
-              size={14}
-              className="opacity-0 text-destructive transition-opacity group-hover:opacity-100"
-            />
+            <config.icon className="size-3.5 transition-opacity group-hover:opacity-0" />
+            <IconX className="size-3.5 opacity-0 text-destructive transition-opacity group-hover:opacity-100" />
           </span>
           <span className="grid [&>span]:col-start-1 [&>span]:row-start-1">
             <span className="transition-opacity group-hover:opacity-0">
diff --git a/app/(pages)/titles/[id]/_components/title-actions.tsx b/app/(pages)/titles/[id]/_components/title-actions.tsx
index 4497218..4f5d745 100644
--- a/app/(pages)/titles/[id]/_components/title-actions.tsx
+++ b/app/(pages)/titles/[id]/_components/title-actions.tsx
@@ -30,7 +30,7 @@ export function TitleActions() {
           onClick={handleWatchMovie}
           className="inline-flex h-9 items-center gap-2 rounded-lg bg-primary px-4 text-sm font-medium text-primary-foreground transition-all active:scale-[0.97] hover:shadow-md hover:shadow-primary/20"
         >
-          <IconPlayerPlay size={14} />
+          <IconPlayerPlay className="size-3.5" />
           Mark Watched
         </button>
       )}
diff --git a/app/(pages)/titles/[id]/_components/title-seasons.tsx b/app/(pages)/titles/[id]/_components/title-seasons.tsx
index 1984525..1d881b6 100644
--- a/app/(pages)/titles/[id]/_components/title-seasons.tsx
+++ b/app/(pages)/titles/[id]/_components/title-seasons.tsx
@@ -56,7 +56,7 @@ export function TitleSeasons() {
                   type="button"
                   className="inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-[10px] font-medium uppercase tracking-wider text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
                 >
-                  <IconChecks size={14} />
+                  <IconChecks className="size-3.5" />
                   Mark All Watched
                 </button>
               }
@@ -160,15 +160,9 @@ export function TitleSeasons() {
                     </button>
                   )}
                   {isOpen ? (
-                    <IconChevronUp
-                      size={16}
-                      className="text-muted-foreground"
-                    />
+                    <IconChevronUp className="size-4 text-muted-foreground" />
                   ) : (
-                    <IconChevronDown
-                      size={16}
-                      className="text-muted-foreground"
-                    />
+                    <IconChevronDown className="size-4 text-muted-foreground" />
                   )}
                 </div>
               </div>
@@ -221,7 +215,7 @@ export function TitleSeasons() {
                                   damping: 15,
                                 }}
                               >
-                                <IconCheck size={14} />
+                                <IconCheck className="size-3.5" />
                               </motion.div>
                             )}
                           </button>
diff --git a/components/auth-form.tsx b/components/auth-form.tsx
index c77ea04..240a2a6 100644
--- a/components/auth-form.tsx
+++ b/components/auth-form.tsx
@@ -97,7 +97,7 @@ export function AuthForm({
       >
         <div className="space-y-2 text-center">
           <Link href="/" className="inline-flex justify-center text-primary">
-            <SofaLogo size={36} />
+            <SofaLogo className="size-9" />
           </Link>
           <h1 className="text-lg font-medium">
             {isRegister ? "Create your account" : "Welcome back"}
@@ -124,7 +124,7 @@ export function AuthForm({
               whileTap={{ scale: 0.98 }}
               className="inline-flex h-11 w-full items-center justify-center gap-2 rounded-lg border border-border/50 bg-background/50 text-sm font-medium transition-all hover:bg-accent hover:text-foreground disabled:pointer-events-none disabled:opacity-50"
             >
-              <IconKey size={16} />
+              <IconKey className="size-4" />
               {oidcLoading
                 ? "Redirecting..."
                 : `Sign in with ${authConfig?.oidcProviderName || "SSO"}`}
diff --git a/components/command-palette.tsx b/components/command-palette.tsx
index 7249611..30f602d 100644
--- a/components/command-palette.tsx
+++ b/components/command-palette.tsx
@@ -235,9 +235,9 @@ export function CommandPalette() {
                         </p>
                         <div className="flex items-center gap-1.5 text-[10px] text-muted-foreground">
                           {r.type === "movie" ? (
-                            <IconMovie size={11} />
+                            <IconMovie className="size-[11px]" />
                           ) : (
-                            <IconDeviceTv size={11} />
+                            <IconDeviceTv className="size-[11px]" />
                           )}
                           <span className="uppercase">{r.type}</span>
                           {r.releaseDate && (
@@ -273,10 +273,7 @@ export function CommandPalette() {
                           onSelect={() => handleRecentSearch(q)}
                           className="group"
                         >
-                          <IconSearch
-                            size={14}
-                            className="text-muted-foreground"
-                          />
+                          <IconSearch className="size-3.5 text-muted-foreground" />
                           <span className="flex-1">{q}</span>
                           <span
                             data-slot="command-shortcut"
@@ -290,7 +287,7 @@ export function CommandPalette() {
                               }}
                               className="rounded-sm p-0.5 text-muted-foreground opacity-0 transition-opacity hover:text-foreground group-data-[selected=true]:opacity-100"
                             >
-                              <IconX size={12} />
+                              <IconX className="size-3" />
                             </button>
                           </span>
                         </CommandItem>
@@ -305,7 +302,7 @@ export function CommandPalette() {
                         router.push("/dashboard");
                       }}
                     >
-                      <IconHome size={14} />
+                      <IconHome className="size-3.5" />
                       Go to Dashboard
                       <CommandShortcut>G H</CommandShortcut>
                     </CommandItem>
@@ -315,7 +312,7 @@ export function CommandPalette() {
                         router.push("/explore");
                       }}
                     >
-                      <IconSearch size={14} />
+                      <IconSearch className="size-3.5" />
                       Go to Explore
                       <CommandShortcut>G E</CommandShortcut>
                     </CommandItem>
@@ -325,7 +322,7 @@ export function CommandPalette() {
                         setHelpOpen(true);
                       }}
                     >
-                      <IconKeyboard size={14} />
+                      <IconKeyboard className="size-3.5" />
                       Keyboard Shortcuts
                       <CommandShortcut>?</CommandShortcut>
                     </CommandItem>
diff --git a/components/landing-page.tsx b/components/landing-page.tsx
index 3ee3e6c..b5917d9 100644
--- a/components/landing-page.tsx
+++ b/components/landing-page.tsx
@@ -139,7 +139,7 @@ export function LandingPage({ posterUrls }: { posterUrls: string[] }) {
               delay: 0.1,
             }}
           >
-            <SofaLogo size={96} className="sm:h-28 sm:w-28 md:h-32 md:w-32" />
+            <SofaLogo className="size-24 sm:size-28 md:size-32" />
           </motion.div>
           <motion.p
             className="mx-auto max-w-md text-lg leading-relaxed text-muted-foreground"
diff --git a/components/mobile-tab-bar.tsx b/components/mobile-tab-bar.tsx
index 3b669ce..09013a1 100644
--- a/components/mobile-tab-bar.tsx
+++ b/components/mobile-tab-bar.tsx
@@ -34,8 +34,7 @@ export function MobileTabBar() {
               className="relative flex flex-1 flex-col items-center justify-center gap-0.5"
             >
               <Icon
-                size={20}
-                className={isActive ? "text-primary" : "text-muted-foreground"}
+                className={`size-5 ${isActive ? "text-primary" : "text-muted-foreground"}`}
               />
               <span
                 className={`text-[10px] font-medium ${isActive ? "text-primary" : "text-muted-foreground"}`}
diff --git a/components/nav-bar.tsx b/components/nav-bar.tsx
index 89dffa4..54c1e10 100644
--- a/components/nav-bar.tsx
+++ b/components/nav-bar.tsx
@@ -7,6 +7,11 @@ import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
 import { SofaLogo } from "@/components/sofa-logo";
 import { Kbd } from "@/components/ui/kbd";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import { commandPaletteOpenAtom } from "@/lib/atoms/command-palette";
 import { signOut, useSession } from "@/lib/auth/client";
 
@@ -29,7 +34,7 @@ export function NavBar() {
             href="/dashboard"
             className="shrink-0 text-foreground transition-colors hover:text-primary"
           >
-            <SofaLogo size={28} />
+            <SofaLogo className="size-7" />
           </Link>
           <div className="hidden items-center gap-1 sm:flex">
             {navLinks.map((link) => {
@@ -61,14 +66,14 @@ export function NavBar() {
           </div>
         </div>
 
-        <div className="flex flex-1 items-center justify-end gap-3 sm:flex-none">
+        <div className="flex flex-1 items-center justify-end gap-2 sm:flex-none sm:gap-1">
           {/* Mobile search trigger */}
           <button
             type="button"
             onClick={() => setCommandPaletteOpen(true)}
             className="flex flex-1 items-center gap-2 rounded-lg border border-border/50 bg-card/50 px-3 py-1.5 text-sm text-muted-foreground transition-all hover:border-primary/20 hover:bg-card sm:hidden"
           >
-            <IconSearch size={14} />
+            <IconSearch className="size-3.5" />
             <span>Search...</span>
           </button>
           {/* Desktop search trigger pill */}
@@ -77,32 +82,34 @@ export function NavBar() {
             onClick={() => setCommandPaletteOpen(true)}
             className="hidden items-center gap-2 rounded-lg border border-border/50 bg-card/50 px-3 py-1.5 text-sm text-muted-foreground transition-all hover:border-primary/20 hover:bg-card sm:inline-flex"
           >
-            <IconSearch size={14} />
+            <IconSearch className="size-3.5" />
             <span>Search...</span>
             <Kbd className="ml-1">⌘K</Kbd>
           </button>
-          <div className="hidden items-center gap-2 rounded-lg border border-border/30 px-2.5 py-1 sm:flex">
-            <span className="text-sm text-muted-foreground">
-              {session?.user?.name}
-            </span>
-            <Link
-              href="/settings"
-              className="inline-flex h-6 w-6 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
+          <div className="mx-1.5 hidden h-4 w-px bg-border/50 sm:block" />
+          <Tooltip>
+            <TooltipTrigger
+              render={<Link href="/settings" />}
+              className="hidden items-center gap-1.5 rounded-md px-2 py-1.5 text-sm leading-none text-muted-foreground transition-colors hover:text-foreground sm:inline-flex"
             >
-              <IconSettings size={14} />
-            </Link>
-            <button
-              type="button"
+              {session?.user?.name}
+              <IconSettings className="size-3.5" />
+            </TooltipTrigger>
+            <TooltipContent>Settings</TooltipContent>
+          </Tooltip>
+          <Tooltip>
+            <TooltipTrigger
               onClick={async () => {
                 await signOut();
                 router.push("/");
                 router.refresh();
               }}
-              className="inline-flex h-6 w-6 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
+              className="hidden h-7 w-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground sm:inline-flex"
             >
-              <IconLogout size={14} />
-            </button>
-          </div>
+              <IconLogout className="size-[15px]" />
+            </TooltipTrigger>
+            <TooltipContent>Log out</TooltipContent>
+          </Tooltip>
         </div>
       </nav>
     </header>
diff --git a/components/sofa-logo.tsx b/components/sofa-logo.tsx
index 7323349..0e0dde4 100644
--- a/components/sofa-logo.tsx
+++ b/components/sofa-logo.tsx
@@ -1,17 +1,9 @@
-export function SofaLogo({
-  size = 24,
-  className,
-}: {
-  size?: number;
-  className?: string;
-}) {
+export function SofaLogo({ className }: { className?: string }) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      width={size}
-      height={size}
       viewBox="0 0 24 24"
-      className={className}
+      className={className ?? "size-6"}
       role="img"
       aria-label="Sofa"
     >
diff --git a/components/title-card.tsx b/components/title-card.tsx
index 2f3baa9..bd88dd1 100644
--- a/components/title-card.tsx
+++ b/components/title-card.tsx
@@ -69,11 +69,11 @@ export function TitleCard({
       <div className="px-3 pb-3 pt-2.5">
         <p className="line-clamp-1 text-sm font-medium leading-snug">{title}</p>
         <div className="mt-1.5 flex items-center gap-2 text-xs text-muted-foreground">
-          <TypeIcon size={14} className="shrink-0 text-primary/60" />
+          <TypeIcon className="size-3.5 shrink-0 text-primary/60" />
           {year && <span>{year}</span>}
           {voteAverage != null && voteAverage > 0 && (
             <span className="ml-auto flex items-center gap-0.5 text-primary/80">
-              <IconStarFilled size={11} />
+              <IconStarFilled className="size-[11px]" />
               {voteAverage.toFixed(1)}
             </span>
           )}