diff --git a/apps/admin/package.json b/apps/admin/package.json
index b5a790f..167c741 100644
--- a/apps/admin/package.json
+++ b/apps/admin/package.json
@@ -29,7 +29,7 @@
     "radix-ui": "^1.4.3",
     "react-hook-form": "^7.71.2",
     "sonner": "^2.0.7",
-    "tailwind-merge": "^2.6.1",
+    "tailwind-merge": "^3.4.0",
     "zod": "^3.25.76"
   },
   "devDependencies": {
diff --git a/apps/storefront/package.json b/apps/storefront/package.json
index 25274ac..53a2481 100644
--- a/apps/storefront/package.json
+++ b/apps/storefront/package.json
@@ -18,6 +18,7 @@
     "@repo/utils": "*",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.8.0",
-    "framer-motion": "^11.0.0"
+    "framer-motion": "^11.0.0",
+    "lucide-react": "^0.400.0"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index b5dcd47..357bf80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,7 +65,7 @@
         "radix-ui": "^1.4.3",
         "react-hook-form": "^7.71.2",
         "sonner": "^2.0.7",
-        "tailwind-merge": "^2.6.1",
+        "tailwind-merge": "^3.4.0",
         "zod": "^3.25.76"
       },
       "devDependencies": {
@@ -87,7 +87,8 @@
         "@repo/utils": "*",
         "@stripe/react-stripe-js": "^5.6.0",
         "@stripe/stripe-js": "^8.8.0",
-        "framer-motion": "^11.0.0"
+        "framer-motion": "^11.0.0",
+        "lucide-react": "^0.400.0"
       }
     },
     "apps/storefront/node_modules/@heroui/react": {
@@ -16541,17 +16542,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/shadcn/node_modules/tailwind-merge": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
-      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/dcastil"
-      }
-    },
     "node_modules/shadcn/node_modules/tsconfig-paths": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
@@ -17175,9 +17165,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz",
-      "integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
+      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
       "license": "MIT",
       "funding": {
         "type": "github",