diff --git a/apps/www/src/lib/registry/new-york/example/AlertDestructiveDemo.vue b/apps/www/src/lib/registry/new-york/example/AlertDestructiveDemo.vue
index 091d13ad..b5aaecb3 100644
--- a/apps/www/src/lib/registry/new-york/example/AlertDestructiveDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/AlertDestructiveDemo.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { AlertTriangle } from 'lucide-vue-next'
+import { AlertTriangle } from '@radix-icons/vue'
 import { Alert, AlertDescription, AlertTitle } from '@/lib/registry/new-york/ui/alert'
 </script>
 
diff --git a/apps/www/src/lib/registry/new-york/example/ButtonIconDemo.vue b/apps/www/src/lib/registry/new-york/example/ButtonIconDemo.vue
index 994625aa..d1bc3d2d 100644
--- a/apps/www/src/lib/registry/new-york/example/ButtonIconDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/ButtonIconDemo.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { ChevronRight } from 'lucide-vue-next'
+import { ChevronRightIcon } from '@radix-icons/vue'
 import { Button } from '@/lib/registry/new-york/ui/button'
 </script>
 
 <template>
   <Button variant="outline" size="icon">
-    <ChevronRight class="w-4 h-4" />
+    <ChevronRightIcon class="w-4 h-4" />
   </Button>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/example/ButtonLoadingDemo.vue b/apps/www/src/lib/registry/new-york/example/ButtonLoadingDemo.vue
index ef8643b7..6835086e 100644
--- a/apps/www/src/lib/registry/new-york/example/ButtonLoadingDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/ButtonLoadingDemo.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { Loader2 } from 'lucide-vue-next'
+import { ReloadIcon } from '@radix-icons/vue'
 import { Button } from '@/lib/registry/new-york/ui/button'
 </script>
 
 <template>
   <Button disabled>
-    <Loader2 class="w-4 h-4 mr-2 animate-spin" />
+    <ReloadIcon class="w-4 h-4 mr-2 animate-spin" />
     Please wait
   </Button>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/example/ButtonWithIconDemo.vue b/apps/www/src/lib/registry/new-york/example/ButtonWithIconDemo.vue
index 15080cf3..648764a4 100644
--- a/apps/www/src/lib/registry/new-york/example/ButtonWithIconDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/ButtonWithIconDemo.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { Mail } from 'lucide-vue-next'
+import { EnvelopeOpenIcon } from '@radix-icons/vue'
 import { Button } from '@/lib/registry/new-york/ui/button'
 </script>
 
 <template>
   <Button>
-    <Mail class="w-4 h-4 mr-2" /> Login with Email
+    <EnvelopeOpenIcon class="w-4 h-4 mr-2" /> Login with Email
   </Button>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/example/DialogCustomCloseButton.vue b/apps/www/src/lib/registry/new-york/example/DialogCustomCloseButton.vue
index a9c6498b..2bdadf67 100644
--- a/apps/www/src/lib/registry/new-york/example/DialogCustomCloseButton.vue
+++ b/apps/www/src/lib/registry/new-york/example/DialogCustomCloseButton.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import { Copy } from 'lucide-vue-next'
+import { CopyIcon } from '@radix-icons/vue'
 import { Button } from '@/lib/registry/new-york/ui/button'
 import {
   Dialog,
+  DialogClose,
   DialogContent,
   DialogDescription,
   DialogFooter,
@@ -41,7 +42,7 @@ import { Label } from '@/lib/registry/new-york/ui/label'
         </div>
         <Button type="submit" size="sm" class="px-3">
           <span class="sr-only">Copy</span>
-          <Copy class="w-4 h-4" />
+          <CopyIcon class="w-4 h-4" />
         </Button>
       </div>
       <DialogFooter class="sm:justify-start">
diff --git a/apps/www/src/lib/registry/new-york/example/ToggleDisabledDemo.vue b/apps/www/src/lib/registry/new-york/example/ToggleDisabledDemo.vue
index 1e1a5d7c..72106472 100644
--- a/apps/www/src/lib/registry/new-york/example/ToggleDisabledDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/ToggleDisabledDemo.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { Underline } from 'lucide-vue-next'
+import { UnderlineIcon } from '@radix-icons/vue'
 
 import { Toggle } from '@/lib/registry/new-york/ui/toggle'
 </script>
 
 <template>
   <Toggle aria-label="Toggle italic" disabled>
-    <Underline class="w-4 h-4" />
+    <UnderlineIcon class="w-4 h-4" />
   </Toggle>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/example/ToggleItalicDemo.vue b/apps/www/src/lib/registry/new-york/example/ToggleItalicDemo.vue
index 0ba02d7a..2501f084 100644
--- a/apps/www/src/lib/registry/new-york/example/ToggleItalicDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/ToggleItalicDemo.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { Italic } from 'lucide-vue-next'
+import { FontItalicIcon } from '@radix-icons/vue'
 
 import { Toggle } from '@/lib/registry/new-york/ui/toggle'
 </script>
 
 <template>
   <Toggle variant="outline" aria-label="Toggle italic">
-    <Italic class="w-4 h-4" />
+    <FontItalicIcon class="w-4 h-4" />
   </Toggle>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/example/ToggleItalicWithTextDemo.vue b/apps/www/src/lib/registry/new-york/example/ToggleItalicWithTextDemo.vue
index c02ad893..4bb35909 100644
--- a/apps/www/src/lib/registry/new-york/example/ToggleItalicWithTextDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/ToggleItalicWithTextDemo.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { Italic } from 'lucide-vue-next'
+import { FontItalicIcon } from '@radix-icons/vue'
 
 import { Toggle } from '@/lib/registry/new-york/ui/toggle'
 </script>
 
 <template>
   <Toggle aria-label="Toggle italic">
-    <Italic class="w-4 h-4 mr-2" />
+    <FontItalicIcon class="w-4 h-4 mr-2" />
     Italic
   </Toggle>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/example/ToggleLargeDemo.vue b/apps/www/src/lib/registry/new-york/example/ToggleLargeDemo.vue
index 67aa5b72..b5e4ea50 100644
--- a/apps/www/src/lib/registry/new-york/example/ToggleLargeDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/ToggleLargeDemo.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { Italic } from 'lucide-vue-next'
+import { FontItalicIcon } from '@radix-icons/vue'
 
 import { Toggle } from '@/lib/registry/new-york/ui/toggle'
 </script>
 
 <template>
   <Toggle size="lg" aria-label="Toggle italic">
-    <Italic class="w-4 h-4" />
+    <FontItalicIcon class="w-4 h-4" />
   </Toggle>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/example/ToggleSmallDemo.vue b/apps/www/src/lib/registry/new-york/example/ToggleSmallDemo.vue
index ce164e16..00cffdf9 100644
--- a/apps/www/src/lib/registry/new-york/example/ToggleSmallDemo.vue
+++ b/apps/www/src/lib/registry/new-york/example/ToggleSmallDemo.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { Italic } from 'lucide-vue-next'
+import { FontItalicIcon } from '@radix-icons/vue'
 
 import { Toggle } from '@/lib/registry/new-york/ui/toggle'
 </script>
 
 <template>
   <Toggle size="sm" aria-label="Toggle italic">
-    <Italic class="w-4 h-4" />
+    <FontItalicIcon class="w-4 h-4" />
   </Toggle>
 </template>
diff --git a/apps/www/src/lib/registry/new-york/ui/toast/ToastClose.vue b/apps/www/src/lib/registry/new-york/ui/toast/ToastClose.vue
index 183e1aeb..e1686592 100644
--- a/apps/www/src/lib/registry/new-york/ui/toast/ToastClose.vue
+++ b/apps/www/src/lib/registry/new-york/ui/toast/ToastClose.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ToastClose } from 'radix-vue'
-import { XIcon } from 'lucide-vue-next'
+import { Cross2Icon } from '@radix-icons/vue'
 import { cn } from '@/lib/utils'
 
 const props = defineProps<{
@@ -10,6 +10,6 @@ const props = defineProps<{
 
 <template>
   <ToastClose v-bind="props" :class="cn('absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600', props.class)">
-    <XIcon class="h-4 w-4" />
+    <Cross2Icon class="h-4 w-4" />
   </ToastClose>
 </template>
diff --git a/apps/www/src/public/registry/styles/new-york/toast.json b/apps/www/src/public/registry/styles/new-york/toast.json
index 82c3d702..0da0967e 100644
--- a/apps/www/src/public/registry/styles/new-york/toast.json
+++ b/apps/www/src/public/registry/styles/new-york/toast.json
@@ -17,7 +17,7 @@
     },
     {
       "name": "ToastClose.vue",
-      "content": "<script setup lang=\"ts\">\nimport { ToastClose } from 'radix-vue'\nimport { XIcon } from 'lucide-vue-next'\nimport { cn } from '@/lib/utils'\n\nconst props = defineProps<{\n  class?: string\n}>()\n</script>\n\n<template>\n  <ToastClose v-bind=\"props\" :class=\"cn('absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600', props.class)\">\n    <XIcon class=\"h-4 w-4\" />\n  </ToastClose>\n</template>\n"
+      "content": "<script setup lang=\"ts\">\nimport { ToastClose } from 'radix-vue'\nimport { Cross2Icon } from '@radix-icons/vue'\nimport { cn } from '@/lib/utils'\n\nconst props = defineProps<{\n  class?: string\n}>()\n</script>\n\n<template>\n  <ToastClose v-bind=\"props\" :class=\"cn('absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600', props.class)\">\n    <Cross2Icon class=\"h-4 w-4\" />\n  </ToastClose>\n</template>\n"
     },
     {
       "name": "ToastDescription.vue",