diff --git a/apps/web/src/app/(home)/_components/FeatureCard.tsx b/apps/web/src/app/(home)/_components/FeatureCard.tsx
index cf6ec0c..4ab4007 100644
--- a/apps/web/src/app/(home)/_components/FeatureCard.tsx
+++ b/apps/web/src/app/(home)/_components/FeatureCard.tsx
@@ -3,26 +3,78 @@
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { cn } from "@/lib/utils";
 import { motion } from "motion/react";
+import { useTheme } from "next-themes";
 import Image from "next/image";
+import { useEffect, useState } from "react";
 
-interface TechOption {
+type TechOption = {
 	id: string;
 	name: string;
 	icon: string;
-}
+};
 
-interface FeatureCardProps {
+type FeatureCardProps = {
 	title: string;
 	description?: string;
 	options: TechOption[];
 	className?: string;
+};
+
+function TechIcon({
+	icon,
+	name,
+	className,
+}: {
+	icon: string;
+	name: string;
+	className?: string;
+}) {
+	const [mounted, setMounted] = useState(false);
+	const { theme } = useTheme();
+
+	useEffect(() => {
+		setMounted(true);
+	}, []);
+
+	if (mounted && icon.startsWith("/icon/")) {
+		if (
+			theme === "light" &&
+			(icon.includes("drizzle") ||
+				icon.includes("prisma") ||
+				icon.includes("express"))
+		) {
+			icon = icon.replace(".svg", "-light.svg");
+		}
+
+		return (
+			<Image
+				src={icon}
+				alt={`${name} icon`}
+				width={24}
+				height={24}
+				className={cn("h-6 w-6 object-contain", className)}
+				unoptimized
+			/>
+		);
+	}
+
+	return (
+		<span
+			className={cn(
+				"flex h-6 w-6 items-center justify-center text-2xl",
+				className,
+			)}
+		>
+			{icon}
+		</span>
+	);
 }
 
-const FeatureCard: React.FC<FeatureCardProps> = ({
+export default function FeatureCard({
 	title,
 	options,
 	className,
-}) => {
+}: FeatureCardProps) {
 	return (
 		<motion.div
 			className={cn(
@@ -45,7 +97,7 @@ const FeatureCard: React.FC<FeatureCardProps> = ({
 								title={option.name}
 								className="flex items-center justify-center"
 							>
-								{option.icon.startsWith("/") ? (
+								{/* {option.icon.startsWith("/") ? (
 									<Image
 										src={option.icon}
 										alt={option.name}
@@ -57,7 +109,12 @@ const FeatureCard: React.FC<FeatureCardProps> = ({
 									<span className="flex h-6 w-6 items-center justify-center text-2xl">
 										{option.icon}
 									</span>
-								)}
+								)} */}
+								<TechIcon
+									icon={option.icon}
+									name={option.name}
+									className="h-6 w-6 object-contain"
+								/>
 							</li>
 						))}
 					</ul>
@@ -65,6 +122,4 @@ const FeatureCard: React.FC<FeatureCardProps> = ({
 			</div>
 		</motion.div>
 	);
-};
-
-export default FeatureCard;
+}
diff --git a/apps/web/src/app/(home)/_components/code-container.tsx b/apps/web/src/app/(home)/_components/code-container.tsx
index ef26ff2..f29048c 100644
--- a/apps/web/src/app/(home)/_components/code-container.tsx
+++ b/apps/web/src/app/(home)/_components/code-container.tsx
@@ -29,7 +29,7 @@ const CodeContainer = () => {
 			<div className="overflow-hidden rounded-lg border border-border bg-muted/30 shadow-sm">
 				<div className="flex items-center justify-between border-border border-b bg-muted/50 px-4 py-2">
 					<span className="text-muted-foreground text-xs">
-						Choose your package manager:
+						Package manager:
 					</span>
 					<div className="flex items-center rounded-md border border-border bg-background p-0.5">
 						{packageManagers.map((pm) => (
diff --git a/apps/web/src/app/(home)/page.tsx b/apps/web/src/app/(home)/page.tsx
index d8284b0..5de79a1 100644
--- a/apps/web/src/app/(home)/page.tsx
+++ b/apps/web/src/app/(home)/page.tsx
@@ -108,9 +108,9 @@ export default function HomePage() {
 	return (
 		<>
 			<Navbar />
-			<main className="flex min-h-screen flex-col items-center justify-center overflow-x-hidden bg-background px-4 pt-24 pb-10 sm:px-6 md:px-8 md:pt-28 lg:pt-32">
+			<main className="flex min-h-svh flex-col items-center justify-center overflow-x-hidden bg-background px-4 pt-24 pb-10 sm:px-6 md:px-8 md:pt-28 lg:pt-32">
 				<motion.div
-					className="relative z-10 mx-auto mb-12 w-full max-w-6xl sm:mb-16"
+					className="mx-auto mb-12 w-full max-w-6xl sm:mb-16"
 					initial="hidden"
 					animate="visible"
 					variants={containerVariants}