diff --git a/astro.config.mjs b/astro.config.mjs
index f36e63a..637a6a0 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -2,14 +2,12 @@
 import { defineConfig } from "astro/config";
 import vue from "@astrojs/vue";
 import tailwindcss from "@tailwindcss/vite";
-import icon from "astro-icon";
-
 import node from "@astrojs/node";
 
 // https://astro.build/config
 export default defineConfig({
   output: "server",
-  integrations: [vue(), icon()],
+  integrations: [vue()],
   security: {
     csp: process.env.NODE_ENV === "production",
   },
diff --git a/package.json b/package.json
index 30435e6..3829638 100644
--- a/package.json
+++ b/package.json
@@ -16,13 +16,11 @@
     "@astrojs/node": "10.0.0-beta.2",
     "@astrojs/vue": "6.0.0-beta.0",
     "@ceereals/vue-pdf": "^0.2.1",
-    "@iconify/vue": "^5.0.0",
     "@libsql/client": "^0.17.0",
     "@simplewebauthn/browser": "^13.2.2",
     "@simplewebauthn/server": "^13.2.2",
     "@tailwindcss/vite": "^4.1.18",
     "astro": "6.0.0-beta.9",
-    "astro-icon": "^1.1.5",
     "bcryptjs": "^3.0.3",
     "chart.js": "^4.5.1",
     "daisyui": "^5.5.18",
@@ -36,7 +34,6 @@
   },
   "devDependencies": {
     "@catppuccin/daisyui": "^2.1.1",
-    "@iconify-json/heroicons": "^1.2.3",
     "@react-pdf/types": "^2.9.2",
     "drizzle-kit": "0.31.9"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1284a4f..6492463 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,9 +20,6 @@ importers:
       '@ceereals/vue-pdf':
         specifier: ^0.2.1
         version: 0.2.1(vue@3.5.28(typescript@5.9.3))
-      '@iconify/vue':
-        specifier: ^5.0.0
-        version: 5.0.0(vue@3.5.28(typescript@5.9.3))
       '@libsql/client':
         specifier: ^0.17.0
         version: 0.17.0
@@ -38,9 +35,6 @@ importers:
       astro:
         specifier: 6.0.0-beta.9
         version: 6.0.0-beta.9(@types/node@25.2.2)(jiti@2.6.1)(lightningcss@1.30.2)(rollup@4.57.1)(typescript@5.9.3)(yaml@2.8.2)
-      astro-icon:
-        specifier: ^1.1.5
-        version: 1.1.5
       bcryptjs:
         specifier: ^3.0.3
         version: 3.0.3
@@ -75,9 +69,6 @@ importers:
       '@catppuccin/daisyui':
         specifier: ^2.1.1
         version: 2.1.1(tailwindcss@4.1.18)
-      '@iconify-json/heroicons':
-        specifier: ^1.2.3
-        version: 1.2.3
       '@react-pdf/types':
         specifier: ^2.9.2
         version: 2.9.2
@@ -87,15 +78,9 @@ importers:
 
 packages:
 
-  '@antfu/install-pkg@1.1.0':
-    resolution: {integrity: sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==}
-
   '@antfu/utils@0.7.10':
     resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
 
-  '@antfu/utils@8.1.1':
-    resolution: {integrity: sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==}
-
   '@astrojs/check@0.9.6':
     resolution: {integrity: sha512-jlaEu5SxvSgmfGIFfNgcn5/f+29H61NJzEMfAZ82Xopr4XBchXB1GVlcJsE+elUlsYSbXlptZLX+JMG3b/wZEA==}
     hasBin: true
@@ -792,23 +777,6 @@ packages:
   '@hexagon/base64@1.1.28':
     resolution: {integrity: sha512-lhqDEAvWixy3bZ+UOYbPwUbBkwBq5C1LAJ/xPC8Oi+lL54oyakv/npbA0aU2hgCsx/1NUd4IBvV03+aUBWxerw==}
 
-  '@iconify-json/heroicons@1.2.3':
-    resolution: {integrity: sha512-n+vmCEgTesRsOpp5AB5ILB6srsgsYK+bieoQBNlafvoEhjVXLq8nIGN4B0v/s4DUfa0dOrjwE/cKJgIKdJXOEg==}
-
-  '@iconify/tools@4.2.0':
-    resolution: {integrity: sha512-WRxPva/ipxYkqZd1+CkEAQmd86dQmrwH0vwK89gmp2Kh2WyyVw57XbPng0NehP3x4V1LzLsXUneP1uMfTMZmUA==}
-
-  '@iconify/types@2.0.0':
-    resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
-
-  '@iconify/utils@2.3.0':
-    resolution: {integrity: sha512-GmQ78prtwYW6EtzXRU1rY+KwOKfz32PD7iJh6Iyqw68GiKuoZ2A6pRtzWONz5VQJbp50mEjXh/7NkumtrAgRKA==}
-
-  '@iconify/vue@5.0.0':
-    resolution: {integrity: sha512-C+KuEWIF5nSBrobFJhT//JS87OZ++QDORB6f2q2Wm6fl2mueSTpFBeBsveK0KW9hWiZ4mNiPjsh6Zs4jjdROSg==}
-    peerDependencies:
-      vue: '>=3'
-
   '@img/colour@1.0.0':
     resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
     engines: {node: '>=18'}
@@ -839,89 +807,105 @@ packages:
     resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-arm@1.2.4':
     resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-ppc64@1.2.4':
     resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-riscv64@1.2.4':
     resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-s390x@1.2.4':
     resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-x64@1.2.4':
     resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
     resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@img/sharp-libvips-linuxmusl-x64@1.2.4':
     resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@img/sharp-linux-arm64@0.34.5':
     resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-arm@0.34.5':
     resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-ppc64@0.34.5':
     resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-riscv64@0.34.5':
     resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-s390x@0.34.5':
     resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-x64@0.34.5':
     resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linuxmusl-arm64@0.34.5':
     resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@img/sharp-linuxmusl-x64@0.34.5':
     resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@img/sharp-wasm32@0.34.5':
     resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
@@ -946,10 +930,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@isaacs/fs-minipass@4.0.1':
-    resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
-    engines: {node: '>=18.0.0'}
-
   '@jridgewell/gen-mapping@0.3.13':
     resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
 
@@ -1154,66 +1134,79 @@ packages:
     resolution: {integrity: sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.57.1':
     resolution: {integrity: sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.57.1':
     resolution: {integrity: sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.57.1':
     resolution: {integrity: sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.57.1':
     resolution: {integrity: sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-loong64-musl@4.57.1':
     resolution: {integrity: sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==}
     cpu: [loong64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-ppc64-gnu@4.57.1':
     resolution: {integrity: sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-musl@4.57.1':
     resolution: {integrity: sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==}
     cpu: [ppc64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-riscv64-gnu@4.57.1':
     resolution: {integrity: sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.57.1':
     resolution: {integrity: sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.57.1':
     resolution: {integrity: sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.57.1':
     resolution: {integrity: sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.57.1':
     resolution: {integrity: sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-openbsd-x64@4.57.1':
     resolution: {integrity: sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==}
@@ -1321,24 +1314,28 @@ packages:
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@tailwindcss/oxide-linux-arm64-musl@4.1.18':
     resolution: {integrity: sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@tailwindcss/oxide-linux-x64-gnu@4.1.18':
     resolution: {integrity: sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@tailwindcss/oxide-linux-x64-musl@4.1.18':
     resolution: {integrity: sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@tailwindcss/oxide-wasm32-wasi@4.1.18':
     resolution: {integrity: sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==}
@@ -1373,10 +1370,6 @@ packages:
     peerDependencies:
       vite: ^5.2.0 || ^6 || ^7
 
-  '@trysound/sax@0.2.0':
-    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
-    engines: {node: '>=10.13.0'}
-
   '@types/better-sqlite3@7.6.13':
     resolution: {integrity: sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==}
 
@@ -1410,9 +1403,6 @@ packages:
   '@types/ws@8.18.1':
     resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
 
-  '@types/yauzl@2.10.3':
-    resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
-
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
 
@@ -1540,11 +1530,6 @@ packages:
   abs-svg-path@0.1.1:
     resolution: {integrity: sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==}
 
-  acorn@8.15.0:
-    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-
   ajv-draft-04@1.0.0:
     resolution: {integrity: sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==}
     peerDependencies:
@@ -1593,9 +1578,6 @@ packages:
     resolution: {integrity: sha512-uLvq6KJu04qoQM6gvBfKFjlh6Gl0vOKQuR5cJMDHQkmwfMOQeN3F3SHCv9SNYSL+CRoHvOGFfllDlVz03GQjvQ==}
     engines: {node: '>=12.0.0'}
 
-  astro-icon@1.1.5:
-    resolution: {integrity: sha512-CJYS5nWOw9jz4RpGWmzNQY7D0y2ZZacH7atL2K9DeJXJVaz7/5WrxeyIxO8KASk1jCM96Q4LjRx/F3R+InjJrw==}
-
   astro@6.0.0-beta.9:
     resolution: {integrity: sha512-hWQNloN6eFJiFYxnrWn4Vi7X/5v6IabgKOa4dqpW1lHAKdlzZHvxHXOUhm4JZUMG4v9kKdvSWamm7XBmTcCltw==}
     engines: {node: ^20.19.1 || >=22.12.0, npm: '>=9.6.5', pnpm: '>=7.1.0'}
@@ -1664,9 +1646,6 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
-  buffer-crc32@0.2.13:
-    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
-
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
@@ -1720,13 +1699,6 @@ packages:
     resolution: {integrity: sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==}
     engines: {pnpm: '>=8'}
 
-  cheerio-select@2.1.0:
-    resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
-
-  cheerio@1.2.0:
-    resolution: {integrity: sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==}
-    engines: {node: '>=20.18.1'}
-
   chokidar@4.0.3:
     resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
     engines: {node: '>= 14.16.0'}
@@ -1738,10 +1710,6 @@ packages:
   chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
 
-  chownr@3.0.0:
-    resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
-    engines: {node: '>=18'}
-
   ci-info@3.9.0:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
@@ -1783,20 +1751,10 @@ packages:
     resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
     engines: {node: '>=16'}
 
-  commander@7.2.0:
-    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
-    engines: {node: '>= 10'}
-
   common-ancestor-path@2.0.0:
     resolution: {integrity: sha512-dnN3ibLeoRf2HNC+OlCiNc5d2zxbLJXOtiZUudNFSXZrNSydxcCsSpRzXwfu7BBWCIfHPw+xTayeBvJCP/D8Ng==}
     engines: {node: '>= 18'}
 
-  confbox@0.1.8:
-    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
-
-  confbox@0.2.4:
-    resolution: {integrity: sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==}
-
   convert-source-map@2.0.0:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
@@ -1831,10 +1789,6 @@ packages:
     resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
 
-  css-tree@2.3.1:
-    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
-
   css-tree@3.1.0:
     resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
@@ -2083,9 +2037,6 @@ packages:
     resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
     engines: {node: '>= 0.8'}
 
-  encoding-sniffer@0.2.1:
-    resolution: {integrity: sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==}
-
   end-of-stream@1.4.5:
     resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
 
@@ -2172,26 +2123,15 @@ packages:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
 
-  exsolve@1.0.8:
-    resolution: {integrity: sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==}
-
   extend@3.0.2:
     resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
-  extract-zip@2.0.1:
-    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
-    engines: {node: '>= 10.17.0'}
-    hasBin: true
-
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
   fast-uri@3.1.0:
     resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
 
-  fd-slicer@1.1.0:
-    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
-
   fdir@6.5.0:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
     engines: {node: '>=12.0.0'}
@@ -2280,10 +2220,6 @@ packages:
     resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
     engines: {node: '>= 0.4'}
 
-  get-stream@5.2.0:
-    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
-    engines: {node: '>=8'}
-
   get-stream@9.0.1:
     resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
     engines: {node: '>=18'}
@@ -2297,10 +2233,6 @@ packages:
   github-slugger@2.0.0:
     resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==}
 
-  globals@15.15.0:
-    resolution: {integrity: sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==}
-    engines: {node: '>=18'}
-
   gopd@1.2.0:
     resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
     engines: {node: '>= 0.4'}
@@ -2371,9 +2303,6 @@ packages:
   html-void-elements@3.0.0:
     resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
 
-  htmlparser2@10.1.0:
-    resolution: {integrity: sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==}
-
   http-cache-semantics@4.2.0:
     resolution: {integrity: sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==}
 
@@ -2388,10 +2317,6 @@ packages:
   hyphen@1.14.1:
     resolution: {integrity: sha512-kvL8xYl5QMTh+LwohVN72ciOxC0OEV79IPdJSTwEXok9y9QHebXGdFgrED4sWfiax/ODx++CAMk3hMy4XPJPOw==}
 
-  iconv-lite@0.6.3:
-    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
-    engines: {node: '>=0.10.0'}
-
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
@@ -2563,24 +2488,28 @@ packages:
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-arm64-musl@1.30.2:
     resolution: {integrity: sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-linux-x64-gnu@1.30.2:
     resolution: {integrity: sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-x64-musl@1.30.2:
     resolution: {integrity: sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-win32-arm64-msvc@1.30.2:
     resolution: {integrity: sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==}
@@ -2601,10 +2530,6 @@ packages:
   linebreak@1.1.0:
     resolution: {integrity: sha512-MHp03UImeVhB7XZtjd0E4n6+3xr5Dq/9xI/5FptGk5FrbDR3zagPa2DS6U8ks/3HjbKWG9Q1M2ufOzxV2qLYSQ==}
 
-  local-pkg@1.1.2:
-    resolution: {integrity: sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==}
-    engines: {node: '>=14'}
-
   lodash@4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
@@ -2673,9 +2598,6 @@ packages:
   mdn-data@2.0.28:
     resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
 
-  mdn-data@2.0.30:
-    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
-
   mdn-data@2.12.2:
     resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
 
@@ -2785,23 +2707,12 @@ packages:
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
-  minipass@7.1.2:
-    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
-  minizlib@3.1.0:
-    resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
-    engines: {node: '>= 18'}
-
   mitt@3.0.1:
     resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
 
   mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
 
-  mlly@1.8.0:
-    resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==}
-
   mrmime@2.0.1:
     resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
     engines: {node: '>=10'}
@@ -2939,12 +2850,6 @@ packages:
   parse-svg-path@0.1.2:
     resolution: {integrity: sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==}
 
-  parse5-htmlparser2-tree-adapter@7.1.0:
-    resolution: {integrity: sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==}
-
-  parse5-parser-stream@7.1.2:
-    resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==}
-
   parse5@7.3.0:
     resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
 
@@ -2967,9 +2872,6 @@ packages:
   pathe@2.0.3:
     resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
 
-  pend@1.2.0:
-    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
-
   perfect-debounce@1.0.0:
     resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
 
@@ -2990,12 +2892,6 @@ packages:
     resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
 
-  pkg-types@1.3.1:
-    resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
-
-  pkg-types@2.3.0:
-    resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
-
   postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
@@ -3041,9 +2937,6 @@ packages:
     resolution: {integrity: sha512-KTqnxsgGiQ6ZAzZCVlJH5eOjSnvlyEgx1m8bkRJfOhmGRqfo5KLvmAlACQkrjEtOQ4B7wF9TdSLIs9O90MX9xA==}
     engines: {node: '>=16.0.0'}
 
-  quansync@0.2.11:
-    resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}
-
   queue@6.0.2:
     resolution: {integrity: sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==}
 
@@ -3157,9 +3050,6 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-
   sax@1.4.4:
     resolution: {integrity: sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==}
     engines: {node: '>=11.0.0'}
@@ -3293,11 +3183,6 @@ packages:
   svg-arc-to-cubic-bezier@3.2.0:
     resolution: {integrity: sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==}
 
-  svgo@3.3.2:
-    resolution: {integrity: sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
-
   svgo@4.0.0:
     resolution: {integrity: sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==}
     engines: {node: '>=16'}
@@ -3317,10 +3202,6 @@ packages:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
 
-  tar@7.5.7:
-    resolution: {integrity: sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==}
-    engines: {node: '>=18'}
-
   tiny-inflate@1.0.3:
     resolution: {integrity: sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==}
 
@@ -3407,10 +3288,6 @@ packages:
   undici-types@7.16.0:
     resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
 
-  undici@7.21.0:
-    resolution: {integrity: sha512-Hn2tCQpoDt1wv23a68Ctc8Cr/BHpUSfaPYrkajTXOS9IKpxVRx/X5m1K2YkbK2ipgZgxXSgsUinl3x+2YdSSfg==}
-    engines: {node: '>=20.18.1'}
-
   unicode-properties@1.4.1:
     resolution: {integrity: sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==}
 
@@ -3732,15 +3609,6 @@ packages:
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
-  whatwg-encoding@3.1.1:
-    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
-    engines: {node: '>=18'}
-    deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation
-
-  whatwg-mimetype@4.0.0:
-    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
-    engines: {node: '>=18'}
-
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
@@ -3794,10 +3662,6 @@ packages:
   yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
-  yallist@5.0.0:
-    resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}
-    engines: {node: '>=18'}
-
   yaml-language-server@1.19.2:
     resolution: {integrity: sha512-9F3myNmJzUN/679jycdMxqtydPSDRAarSj3wPiF7pchEPnO9Dg07Oc+gIYLqXR4L+g+FSEVXXv2+mr54StLFOg==}
     hasBin: true
@@ -3824,9 +3688,6 @@ packages:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}
 
-  yauzl@2.10.0:
-    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
-
   yocto-queue@1.2.2:
     resolution: {integrity: sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==}
     engines: {node: '>=12.20'}
@@ -3850,15 +3711,8 @@ packages:
 
 snapshots:
 
-  '@antfu/install-pkg@1.1.0':
-    dependencies:
-      package-manager-detector: 1.6.0
-      tinyexec: 1.0.2
-
   '@antfu/utils@0.7.10': {}
 
-  '@antfu/utils@8.1.1': {}
-
   '@astrojs/check@0.9.6(prettier@3.8.1)(typescript@5.9.3)':
     dependencies:
       '@astrojs/language-server': 2.16.3(prettier@3.8.1)(typescript@5.9.3)
@@ -4464,44 +4318,6 @@ snapshots:
 
   '@hexagon/base64@1.1.28': {}
 
-  '@iconify-json/heroicons@1.2.3':
-    dependencies:
-      '@iconify/types': 2.0.0
-
-  '@iconify/tools@4.2.0':
-    dependencies:
-      '@iconify/types': 2.0.0
-      '@iconify/utils': 2.3.0
-      cheerio: 1.2.0
-      domhandler: 5.0.3
-      extract-zip: 2.0.1
-      local-pkg: 1.1.2
-      pathe: 2.0.3
-      svgo: 3.3.2
-      tar: 7.5.7
-    transitivePeerDependencies:
-      - supports-color
-
-  '@iconify/types@2.0.0': {}
-
-  '@iconify/utils@2.3.0':
-    dependencies:
-      '@antfu/install-pkg': 1.1.0
-      '@antfu/utils': 8.1.1
-      '@iconify/types': 2.0.0
-      debug: 4.4.3
-      globals: 15.15.0
-      kolorist: 1.8.0
-      local-pkg: 1.1.2
-      mlly: 1.8.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@iconify/vue@5.0.0(vue@3.5.28(typescript@5.9.3))':
-    dependencies:
-      '@iconify/types': 2.0.0
-      vue: 3.5.28(typescript@5.9.3)
-
   '@img/colour@1.0.0':
     optional: true
 
@@ -4599,10 +4415,6 @@ snapshots:
   '@img/sharp-win32-x64@0.34.5':
     optional: true
 
-  '@isaacs/fs-minipass@4.0.1':
-    dependencies:
-      minipass: 7.1.2
-
   '@jridgewell/gen-mapping@0.3.13':
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -5075,8 +4887,6 @@ snapshots:
       tailwindcss: 4.1.18
       vite: 7.3.1(@types/node@25.2.2)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2)
 
-  '@trysound/sax@0.2.0': {}
-
   '@types/better-sqlite3@7.6.13':
     dependencies:
       '@types/node': 25.2.2
@@ -5114,11 +4924,6 @@ snapshots:
     dependencies:
       '@types/node': 25.2.2
 
-  '@types/yauzl@2.10.3':
-    dependencies:
-      '@types/node': 25.2.2
-    optional: true
-
   '@ungap/structured-clone@1.3.0': {}
 
   '@vitejs/plugin-vue-jsx@4.2.0(vite@7.3.1(@types/node@25.2.2)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2))(vue@3.5.28(typescript@5.9.3))':
@@ -5331,8 +5136,6 @@ snapshots:
 
   abs-svg-path@0.1.1: {}
 
-  acorn@8.15.0: {}
-
   ajv-draft-04@1.0.0(ajv@8.17.1):
     optionalDependencies:
       ajv: 8.17.1
@@ -5375,14 +5178,6 @@ snapshots:
       pvutils: 1.1.5
       tslib: 2.8.1
 
-  astro-icon@1.1.5:
-    dependencies:
-      '@iconify/tools': 4.2.0
-      '@iconify/types': 2.0.0
-      '@iconify/utils': 2.3.0
-    transitivePeerDependencies:
-      - supports-color
-
   astro@6.0.0-beta.9(@types/node@25.2.2)(jiti@2.6.1)(lightningcss@1.30.2)(rollup@4.57.1)(typescript@5.9.3)(yaml@2.8.2):
     dependencies:
       '@astrojs/compiler': 0.0.0-render-script-20251003120459
@@ -5551,8 +5346,6 @@ snapshots:
       node-releases: 2.0.27
       update-browserslist-db: 1.2.3(browserslist@4.28.1)
 
-  buffer-crc32@0.2.13: {}
-
   buffer-from@1.1.2: {}
 
   buffer@5.7.1:
@@ -5605,29 +5398,6 @@ snapshots:
     dependencies:
       '@kurkle/color': 0.3.4
 
-  cheerio-select@2.1.0:
-    dependencies:
-      boolbase: 1.0.0
-      css-select: 5.2.2
-      css-what: 6.2.2
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      domutils: 3.2.2
-
-  cheerio@1.2.0:
-    dependencies:
-      cheerio-select: 2.1.0
-      dom-serializer: 2.0.0
-      domhandler: 5.0.3
-      domutils: 3.2.2
-      encoding-sniffer: 0.2.1
-      htmlparser2: 10.1.0
-      parse5: 7.3.0
-      parse5-htmlparser2-tree-adapter: 7.1.0
-      parse5-parser-stream: 7.1.2
-      undici: 7.21.0
-      whatwg-mimetype: 4.0.0
-
   chokidar@4.0.3:
     dependencies:
       readdirp: 4.1.2
@@ -5639,8 +5409,6 @@ snapshots:
   chownr@1.1.4:
     optional: true
 
-  chownr@3.0.0: {}
-
   ci-info@3.9.0: {}
 
   ci-info@4.4.0: {}
@@ -5672,14 +5440,8 @@ snapshots:
 
   commander@11.1.0: {}
 
-  commander@7.2.0: {}
-
   common-ancestor-path@2.0.0: {}
 
-  confbox@0.1.8: {}
-
-  confbox@0.2.4: {}
-
   convert-source-map@2.0.0: {}
 
   cookie-es@1.2.2: {}
@@ -5721,11 +5483,6 @@ snapshots:
       mdn-data: 2.0.28
       source-map-js: 1.2.1
 
-  css-tree@2.3.1:
-    dependencies:
-      mdn-data: 2.0.30
-      source-map-js: 1.2.1
-
   css-tree@3.1.0:
     dependencies:
       mdn-data: 2.12.2
@@ -5864,14 +5621,10 @@ snapshots:
 
   encodeurl@2.0.0: {}
 
-  encoding-sniffer@0.2.1:
-    dependencies:
-      iconv-lite: 0.6.3
-      whatwg-encoding: 3.1.1
-
   end-of-stream@1.4.5:
     dependencies:
       once: 1.4.0
+    optional: true
 
   enhanced-resolve@5.19.0:
     dependencies:
@@ -6016,28 +5769,12 @@ snapshots:
   expand-template@2.0.3:
     optional: true
 
-  exsolve@1.0.8: {}
-
   extend@3.0.2: {}
 
-  extract-zip@2.0.1:
-    dependencies:
-      debug: 4.4.3
-      get-stream: 5.2.0
-      yauzl: 2.10.0
-    optionalDependencies:
-      '@types/yauzl': 2.10.3
-    transitivePeerDependencies:
-      - supports-color
-
   fast-deep-equal@3.1.3: {}
 
   fast-uri@3.1.0: {}
 
-  fd-slicer@1.1.0:
-    dependencies:
-      pend: 1.2.0
-
   fdir@6.5.0(picomatch@4.0.3):
     optionalDependencies:
       picomatch: 4.0.3
@@ -6134,10 +5871,6 @@ snapshots:
       dunder-proto: 1.0.1
       es-object-atoms: 1.1.1
 
-  get-stream@5.2.0:
-    dependencies:
-      pump: 3.0.3
-
   get-stream@9.0.1:
     dependencies:
       '@sec-ant/readable-stream': 0.4.1
@@ -6152,8 +5885,6 @@ snapshots:
 
   github-slugger@2.0.0: {}
 
-  globals@15.15.0: {}
-
   gopd@1.2.0: {}
 
   graceful-fs@4.2.11: {}
@@ -6281,13 +6012,6 @@ snapshots:
 
   html-void-elements@3.0.0: {}
 
-  htmlparser2@10.1.0:
-    dependencies:
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      domutils: 3.2.2
-      entities: 7.0.1
-
   http-cache-semantics@4.2.0: {}
 
   http-errors@2.0.1:
@@ -6302,10 +6026,6 @@ snapshots:
 
   hyphen@1.14.1: {}
 
-  iconv-lite@0.6.3:
-    dependencies:
-      safer-buffer: 2.1.2
-
   ieee754@1.2.1:
     optional: true
 
@@ -6471,12 +6191,6 @@ snapshots:
       base64-js: 0.0.8
       unicode-trie: 2.0.0
 
-  local-pkg@1.1.2:
-    dependencies:
-      mlly: 1.8.0
-      pkg-types: 2.3.0
-      quansync: 0.2.11
-
   lodash@4.17.21: {}
 
   longest-streak@3.1.0: {}
@@ -6623,8 +6337,6 @@ snapshots:
 
   mdn-data@2.0.28: {}
 
-  mdn-data@2.0.30: {}
-
   mdn-data@2.12.2: {}
 
   media-engine@1.0.3: {}
@@ -6836,24 +6548,11 @@ snapshots:
 
   minimist@1.2.8: {}
 
-  minipass@7.1.2: {}
-
-  minizlib@3.1.0:
-    dependencies:
-      minipass: 7.1.2
-
   mitt@3.0.1: {}
 
   mkdirp-classic@0.5.3:
     optional: true
 
-  mlly@1.8.0:
-    dependencies:
-      acorn: 8.15.0
-      pathe: 2.0.3
-      pkg-types: 1.3.1
-      ufo: 1.6.3
-
   mrmime@2.0.1: {}
 
   ms@2.1.3: {}
@@ -6928,6 +6627,7 @@ snapshots:
   once@1.4.0:
     dependencies:
       wrappy: 1.0.2
+    optional: true
 
   oniguruma-parser@0.12.1: {}
 
@@ -6979,15 +6679,6 @@ snapshots:
 
   parse-svg-path@0.1.2: {}
 
-  parse5-htmlparser2-tree-adapter@7.1.0:
-    dependencies:
-      domhandler: 5.0.3
-      parse5: 7.3.0
-
-  parse5-parser-stream@7.1.2:
-    dependencies:
-      parse5: 7.3.0
-
   parse5@7.3.0:
     dependencies:
       entities: 6.0.1
@@ -7017,8 +6708,6 @@ snapshots:
 
   pathe@2.0.3: {}
 
-  pend@1.2.0: {}
-
   perfect-debounce@1.0.0: {}
 
   perfect-debounce@2.1.0: {}
@@ -7031,18 +6720,6 @@ snapshots:
 
   picomatch@4.0.3: {}
 
-  pkg-types@1.3.1:
-    dependencies:
-      confbox: 0.1.8
-      mlly: 1.8.0
-      pathe: 2.0.3
-
-  pkg-types@2.3.0:
-    dependencies:
-      confbox: 0.2.4
-      exsolve: 1.0.8
-      pathe: 2.0.3
-
   postcss-value-parser@4.2.0: {}
 
   postcss@8.5.6:
@@ -7088,6 +6765,7 @@ snapshots:
     dependencies:
       end-of-stream: 1.4.5
       once: 1.4.0
+    optional: true
 
   pvtsutils@1.3.6:
     dependencies:
@@ -7095,8 +6773,6 @@ snapshots:
 
   pvutils@1.1.5: {}
 
-  quansync@0.2.11: {}
-
   queue@6.0.2:
     dependencies:
       inherits: 2.0.4
@@ -7276,8 +6952,6 @@ snapshots:
 
   safe-buffer@5.2.1: {}
 
-  safer-buffer@2.1.2: {}
-
   sax@1.4.4: {}
 
   semver@6.3.1: {}
@@ -7449,16 +7123,6 @@ snapshots:
 
   svg-arc-to-cubic-bezier@3.2.0: {}
 
-  svgo@3.3.2:
-    dependencies:
-      '@trysound/sax': 0.2.0
-      commander: 7.2.0
-      css-select: 5.2.2
-      css-tree: 2.3.1
-      css-what: 6.2.2
-      csso: 5.0.5
-      picocolors: 1.1.1
-
   svgo@4.0.0:
     dependencies:
       commander: 11.1.0
@@ -7490,14 +7154,6 @@ snapshots:
       readable-stream: 3.6.2
     optional: true
 
-  tar@7.5.7:
-    dependencies:
-      '@isaacs/fs-minipass': 4.0.1
-      chownr: 3.0.0
-      minipass: 7.1.2
-      minizlib: 3.1.0
-      yallist: 5.0.0
-
   tiny-inflate@1.0.3: {}
 
   tinyexec@1.0.2: {}
@@ -7558,8 +7214,6 @@ snapshots:
 
   undici-types@7.16.0: {}
 
-  undici@7.21.0: {}
-
   unicode-properties@1.4.1:
     dependencies:
       base64-js: 1.5.1
@@ -7860,12 +7514,6 @@ snapshots:
 
   webidl-conversions@3.0.1: {}
 
-  whatwg-encoding@3.1.1:
-    dependencies:
-      iconv-lite: 0.6.3
-
-  whatwg-mimetype@4.0.0: {}
-
   whatwg-url@5.0.0:
     dependencies:
       tr46: 0.0.3
@@ -7893,7 +7541,8 @@ snapshots:
       string-width: 7.2.0
       strip-ansi: 7.1.2
 
-  wrappy@1.0.2: {}
+  wrappy@1.0.2:
+    optional: true
 
   ws@8.19.0: {}
 
@@ -7907,8 +7556,6 @@ snapshots:
 
   yallist@3.1.1: {}
 
-  yallist@5.0.0: {}
-
   yaml-language-server@1.19.2:
     dependencies:
       '@vscode/l10n': 0.0.18
@@ -7942,11 +7589,6 @@ snapshots:
       y18n: 5.0.8
       yargs-parser: 21.1.1
 
-  yauzl@2.10.0:
-    dependencies:
-      buffer-crc32: 0.2.13
-      fd-slicer: 1.1.0
-
   yocto-queue@1.2.2: {}
 
   yocto-spinner@1.1.0:
diff --git a/src/components/Icon.astro b/src/components/Icon.astro
new file mode 100644
index 0000000..984ca87
--- /dev/null
+++ b/src/components/Icon.astro
@@ -0,0 +1,27 @@
+---
+import { icons, type IconName } from "../config/icons";
+
+interface Props {
+  name: IconName;
+  class?: string;
+  "class:list"?: any;
+}
+
+const { name, class: className, "class:list": classList } = Astro.props;
+const svg = icons[name];
+
+if (!svg) {
+  throw new Error(`Icon "${name}" not found in icon registry`);
+}
+---
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 24 24"
+  width="1em"
+  height="1em"
+  fill="none"
+  class:list={[className, classList]}
+  aria-hidden="true"
+  set:html={svg}
+/>
diff --git a/src/components/Icon.vue b/src/components/Icon.vue
new file mode 100644
index 0000000..9322666
--- /dev/null
+++ b/src/components/Icon.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { icons, type IconName } from "../config/icons";
+
+const props = defineProps<{
+  name: IconName;
+  class?: string;
+}>();
+
+const svg = computed(() => {
+  const icon = icons[props.name];
+  if (!icon) {
+    throw new Error(`Icon "${props.name}" not found in icon registry`);
+  }
+  return icon;
+});
+</script>
+
+<template>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 24 24"
+    width="1em"
+    height="1em"
+    fill="none"
+    :class="props.class"
+    aria-hidden="true"
+    v-html="svg"
+  />
+</template>
diff --git a/src/components/ManualEntry.vue b/src/components/ManualEntry.vue
index 1d0146f..8be092c 100644
--- a/src/components/ManualEntry.vue
+++ b/src/components/ManualEntry.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
+import Icon from "./Icon.vue";
 
 const props = defineProps<{
   clients: { id: string; name: string }[];
@@ -164,37 +165,13 @@ function clearForm() {
 
       <!-- Success Message -->
       <div v-if="success" class="alert alert-success">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          class="stroke-current shrink-0 h-6 w-6"
-          fill="none"
-          viewBox="0 0 24 24"
-        >
-          <path
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            stroke-width="2"
-            d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
-          />
-        </svg>
+        <Icon name="check-circle" class="stroke-current shrink-0 h-6 w-6" />
         <span>Manual time entry created successfully!</span>
       </div>
 
       <!-- Error Message -->
       <div v-if="error" class="alert alert-error">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          class="stroke-current shrink-0 h-6 w-6"
-          fill="none"
-          viewBox="0 0 24 24"
-        >
-          <path
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            stroke-width="2"
-            d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
-          />
-        </svg>
+        <Icon name="x-circle" class="stroke-current shrink-0 h-6 w-6" />
         <span>{{ error }}</span>
       </div>
 
diff --git a/src/components/StatCard.astro b/src/components/StatCard.astro
index a5e8cc4..2609e22 100644
--- a/src/components/StatCard.astro
+++ b/src/components/StatCard.astro
@@ -1,5 +1,5 @@
 ---
-import { Icon } from 'astro-icon/components';
+import Icon from './Icon.astro';
 
 interface Props {
   title: string;
diff --git a/src/components/TagChart.vue b/src/components/TagChart.vue
index baa8563..325d63e 100644
--- a/src/components/TagChart.vue
+++ b/src/components/TagChart.vue
@@ -33,7 +33,7 @@ const chartData = computed(() => ({
     {
       data: props.tags.map((t) => t.totalTime / (1000 * 60)), // Convert to minutes
       backgroundColor: props.tags.map((t) => t.color),
-      borderColor: "#1e293b", // Matches typical dark mode bg
+      borderColor: "#1e293b",
       borderWidth: 2,
     },
   ],
diff --git a/src/components/ThemeToggle.vue b/src/components/ThemeToggle.vue
index bf9ac52..ca0beb6 100644
--- a/src/components/ThemeToggle.vue
+++ b/src/components/ThemeToggle.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { Icon } from '@iconify/vue';
+import Icon from './Icon.vue';
 
 const theme = ref('macchiato');
 
@@ -27,7 +27,7 @@ function toggleTheme() {
     aria-label="Toggle Theme"
   >
     <Icon 
-      :icon="theme === 'macchiato' ? 'heroicons:moon' : 'heroicons:sun'" 
+      :name="theme === 'macchiato' ? 'moon' : 'sun'" 
       class="w-5 h-5" 
     />
   </button>
diff --git a/src/components/Timer.vue b/src/components/Timer.vue
index 84b9fd5..5c5a51f 100644
--- a/src/components/Timer.vue
+++ b/src/components/Timer.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from "vue";
-import { Icon } from "@iconify/vue";
+import Icon from "./Icon.vue";
 
 const props = defineProps<{
   initialRunningEntry: {
@@ -188,7 +188,7 @@ async function stopTimer() {
           @click="startTimer"
           class="btn btn-primary btn-lg min-w-40 shadow-lg shadow-primary/20 hover:shadow-xl hover:shadow-primary/30 transition-all"
         >
-          <Icon icon="heroicons:play" class="w-5 h-5" />
+          <Icon name="play" class="w-5 h-5" />
           Start Timer
         </button>
         <button
@@ -196,7 +196,7 @@ async function stopTimer() {
           @click="stopTimer"
           class="btn btn-error btn-lg min-w-40 shadow-lg shadow-error/20 hover:shadow-xl hover:shadow-error/30 transition-all"
         >
-          <Icon icon="heroicons:stop" class="w-5 h-5" />
+          <Icon name="stop" class="w-5 h-5" />
           Stop Timer
         </button>
       </div>
diff --git a/src/components/auth/PasskeyLogin.vue b/src/components/auth/PasskeyLogin.vue
index ac83298..8e0cbd8 100644
--- a/src/components/auth/PasskeyLogin.vue
+++ b/src/components/auth/PasskeyLogin.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import { Icon } from "@iconify/vue";
+import Icon from "../Icon.vue";
 import { startAuthentication } from "@simplewebauthn/browser";
 
 const loading = ref(false);
@@ -60,12 +60,12 @@ async function handlePasskeyLogin() {
       :disabled="loading"
     >
       <span v-if="loading" class="loading loading-spinner loading-sm"></span>
-      <Icon v-else icon="heroicons:finger-print" class="w-5 h-5 mr-2" />
+      <Icon v-else name="finger-print" class="w-5 h-5 mr-2" />
       Sign in with Passkey
     </button>
 
     <div v-if="error" role="alert" class="alert alert-error mt-4">
-      <Icon icon="heroicons:exclamation-circle" class="w-6 h-6" />
+      <Icon name="exclamation-circle" class="w-6 h-6" />
       <span>{{ error }}</span>
     </div>
   </div>
diff --git a/src/components/settings/ApiTokenManager.vue b/src/components/settings/ApiTokenManager.vue
index 70bb4f1..e722edc 100644
--- a/src/components/settings/ApiTokenManager.vue
+++ b/src/components/settings/ApiTokenManager.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
-import { Icon } from "@iconify/vue";
+import Icon from "../Icon.vue";
 
 interface ApiToken {
   id: string;
@@ -112,7 +112,7 @@ function closeShowTokenModal() {
         <div class="flex justify-between items-center mb-6">
           <h2 class="card-title text-lg sm:text-xl">
             <Icon
-              icon="heroicons:code-bracket-square"
+              name="code-bracket-square"
               class="w-5 h-5 sm:w-6 sm:h-6"
             />
             API Tokens
@@ -121,7 +121,7 @@ function closeShowTokenModal() {
             class="btn btn-primary btn-sm"
             @click="createModalOpen = true"
           >
-            <Icon icon="heroicons:plus" class="w-4 h-4" />
+            <Icon name="plus" class="w-4 h-4" />
             Create Token
           </button>
         </div>
@@ -161,7 +161,7 @@ function closeShowTokenModal() {
                     class="btn btn-ghost btn-xs text-error"
                     @click="deleteToken(token.id)"
                   >
-                    <Icon icon="heroicons:trash" class="w-4 h-4" />
+                    <Icon name="trash" class="w-4 h-4" />
                   </button>
                 </td>
               </tr>
@@ -222,7 +222,7 @@ function closeShowTokenModal() {
     <dialog class="modal" :class="{ 'modal-open': showTokenModalOpen }">
       <div class="modal-box">
         <h3 class="font-bold text-lg text-success flex items-center gap-2">
-          <Icon icon="heroicons:check-circle" class="w-6 h-6" />
+          <Icon name="check-circle" class="w-6 h-6" />
           Token Created
         </h3>
         <p class="py-4">
@@ -239,7 +239,7 @@ function closeShowTokenModal() {
             @click="copyToken"
             title="Copy to clipboard"
           >
-            <Icon icon="heroicons:clipboard" class="w-4 h-4" />
+            <Icon name="clipboard" class="w-4 h-4" />
           </button>
         </div>
 
diff --git a/src/components/settings/PasskeyManager.vue b/src/components/settings/PasskeyManager.vue
index eb145ea..3ca0794 100644
--- a/src/components/settings/PasskeyManager.vue
+++ b/src/components/settings/PasskeyManager.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
-import { Icon } from "@iconify/vue";
+import Icon from "../Icon.vue";
 import { startRegistration } from "@simplewebauthn/browser";
 
 interface Passkey {
@@ -98,7 +98,7 @@ async function deletePasskey(id: string) {
     <div class="card-body p-4 sm:p-6">
       <div class="flex justify-between items-center mb-6">
         <h2 class="card-title text-lg sm:text-xl">
-          <Icon icon="heroicons:finger-print" class="w-5 h-5 sm:w-6 sm:h-6" />
+          <Icon name="finger-print" class="w-5 h-5 sm:w-6 sm:h-6" />
           Passkeys
         </h2>
         <button
@@ -110,7 +110,7 @@ async function deletePasskey(id: string) {
             v-if="loading"
             class="loading loading-spinner loading-xs"
           ></span>
-          <Icon v-else icon="heroicons:plus" class="w-4 h-4" />
+          <Icon v-else name="plus" class="w-4 h-4" />
           Add Passkey
         </button>
       </div>
@@ -157,7 +157,7 @@ async function deletePasskey(id: string) {
                   class="btn btn-ghost btn-xs text-error"
                   @click="deletePasskey(pk.id)"
                 >
-                  <Icon icon="heroicons:trash" class="w-4 h-4" />
+                  <Icon name="trash" class="w-4 h-4" />
                 </button>
               </td>
             </tr>
diff --git a/src/components/settings/PasswordForm.vue b/src/components/settings/PasswordForm.vue
index 551b0f9..b2b9b55 100644
--- a/src/components/settings/PasswordForm.vue
+++ b/src/components/settings/PasswordForm.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import { Icon } from "@iconify/vue";
+import Icon from "../Icon.vue";
 
 const currentPassword = ref("");
 const newPassword = ref("");
@@ -76,10 +76,10 @@ async function changePassword() {
       ]"
     >
       <Icon
-        :icon="
+        :name="
           message.type === 'success'
-            ? 'heroicons:check-circle'
-            : 'heroicons:exclamation-circle'
+            ? 'check-circle'
+            : 'exclamation-circle'
         "
         class="w-6 h-6 shrink-0"
       />
@@ -89,7 +89,7 @@ async function changePassword() {
     <div class="card bg-base-100 shadow-xl border border-base-200 mb-6">
       <div class="card-body p-4 sm:p-6">
         <h2 class="card-title mb-6 text-lg sm:text-xl">
-          <Icon icon="heroicons:key" class="w-5 h-5 sm:w-6 sm:h-6" />
+          <Icon name="key" class="w-5 h-5 sm:w-6 sm:h-6" />
           Change Password
         </h2>
 
@@ -163,7 +163,7 @@ async function changePassword() {
                 v-if="loading"
                 class="loading loading-spinner loading-sm"
               ></span>
-              <Icon v-else icon="heroicons:lock-closed" class="w-5 h-5" />
+              <Icon v-else name="lock-closed" class="w-5 h-5" />
               Update Password
             </button>
           </div>
diff --git a/src/components/settings/ProfileForm.vue b/src/components/settings/ProfileForm.vue
index 34f9cd8..f42a62f 100644
--- a/src/components/settings/ProfileForm.vue
+++ b/src/components/settings/ProfileForm.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import { Icon } from "@iconify/vue";
+import Icon from "../Icon.vue";
 
 const props = defineProps<{
   user: {
@@ -61,10 +61,10 @@ async function updateProfile() {
       ]"
     >
       <Icon
-        :icon="
+        :name="
           message.type === 'success'
-            ? 'heroicons:check-circle'
-            : 'heroicons:exclamation-circle'
+            ? 'check-circle'
+            : 'exclamation-circle'
         "
         class="w-6 h-6 shrink-0"
       />
@@ -74,7 +74,7 @@ async function updateProfile() {
     <div class="card bg-base-100 shadow-xl border border-base-200 mb-6">
       <div class="card-body p-4 sm:p-6">
         <h2 class="card-title mb-6 text-lg sm:text-xl">
-          <Icon icon="heroicons:user-circle" class="w-5 h-5 sm:w-6 sm:h-6" />
+          <Icon name="user-circle" class="w-5 h-5 sm:w-6 sm:h-6" />
           Profile Information
         </h2>
 
@@ -128,7 +128,7 @@ async function updateProfile() {
                 v-if="loading"
                 class="loading loading-spinner loading-sm"
               ></span>
-              <Icon v-else icon="heroicons:check" class="w-5 h-5" />
+              <Icon v-else name="check" class="w-5 h-5" />
               Save Changes
             </button>
           </div>
diff --git a/src/config/icons.ts b/src/config/icons.ts
new file mode 100644
index 0000000..c1e1b76
--- /dev/null
+++ b/src/config/icons.ts
@@ -0,0 +1,62 @@
+export const icons = {
+  "arrow-down-tray": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3 16.5v2.25A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3"/>`,
+  "arrow-left": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18"/>`,
+  "arrow-right": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M13.5 4.5L21 12m0 0l-7.5 7.5M21 12H3"/>`,
+  "arrow-right-on-rectangle": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15.75 9V5.25A2.25 2.25 0 0 0 13.5 3h-6a2.25 2.25 0 0 0-2.25 2.25v13.5A2.25 2.25 0 0 0 7.5 21h6a2.25 2.25 0 0 0 2.25-2.25V15m3 0l3-3m0 0l-3-3m3 3H9"/>`,
+  "banknotes": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.25 18.75a60 60 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0a3 3 0 0 1 6 0m3 0h.008v.008H18zm-12 0h.008v.008H6z"/>`,
+  "bars-3": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"/>`,
+  "bolt": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75L12 13.5z"/>`,
+  "building-office": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.75 21h16.5M4.5 3h15M5.25 3v18m13.5-18v18M9 6.75h1.5m-1.5 3h1.5m-1.5 3h1.5m3-6H15m-1.5 3H15m-1.5 3H15M9 21v-3.375c0-.621.504-1.125 1.125-1.125h3.75c.621 0 1.125.504 1.125 1.125V21"/>`,
+  "building-office-2": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008zm0 3h.008v.008h-.008zm0 3h.008v.008h-.008z"/>`,
+  "calendar": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 0 1 2.25-2.25h13.5A2.25 2.25 0 0 1 21 7.5v11.25m-18 0A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75m-18 0v-7.5A2.25 2.25 0 0 1 5.25 9h13.5A2.25 2.25 0 0 1 21 11.25v7.5"/>`,
+  "chart-bar": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3 13.125C3 12.504 3.504 12 4.125 12h2.25c.621 0 1.125.504 1.125 1.125v6.75C7.5 20.496 6.996 21 6.375 21h-2.25A1.125 1.125 0 0 1 3 19.875zm6.75-4.5c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125v11.25c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125zm6.75-4.5c0-.621.504-1.125 1.125-1.125h2.25C20.496 3 21 3.504 21 4.125v15.75c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125z"/>`,
+  "chart-pie": `<g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path d="M10.5 6a7.5 7.5 0 1 0 7.5 7.5h-7.5z"/><path d="M13.5 10.5H21A7.5 7.5 0 0 0 13.5 3z"/></g>`,
+  "check": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m4.5 12.75l6 6l9-13.5"/>`,
+  "check-circle": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 12.75L11.25 15L15 9.75M21 12a9 9 0 1 1-18 0a9 9 0 0 1 18 0"/>`,
+  "chevron-left": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15.75 19.5L8.25 12l7.5-7.5"/>`,
+  "chevron-right": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m8.25 4.5l7.5 7.5l-7.5 7.5"/>`,
+  "clipboard": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15.666 3.888A2.25 2.25 0 0 0 13.5 2.25h-3c-1.03 0-1.9.693-2.166 1.638m7.332 0q.083.292.084.612v0a.75.75 0 0 1-.75.75H9a.75.75 0 0 1-.75-.75v0q.002-.32.084-.612m7.332 0q.969.073 1.927.184c1.1.128 1.907 1.077 1.907 2.185V19.5a2.25 2.25 0 0 1-2.25 2.25H6.75A2.25 2.25 0 0 1 4.5 19.5V6.257c0-1.108.806-2.057 1.907-2.185a48 48 0 0 1 1.927-.184"/>`,
+  "clipboard-document-list": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 12h3.75M9 15h3.75M9 18h3.75m3 .75H18a2.25 2.25 0 0 0 2.25-2.25V6.108c0-1.135-.845-2.098-1.976-2.192a48 48 0 0 0-1.123-.08m-5.801 0q-.099.316-.1.664c0 .414.336.75.75.75h4.5a.75.75 0 0 0 .75-.75a2.3 2.3 0 0 0-.1-.664m-5.8 0A2.25 2.25 0 0 1 13.5 2.25H15a2.25 2.25 0 0 1 2.15 1.586m-5.8 0q-.563.035-1.124.08C9.095 4.01 8.25 4.973 8.25 6.108V8.25m0 0H4.875c-.621 0-1.125.504-1.125 1.125v11.25c0 .621.504 1.125 1.125 1.125h9.75c.621 0 1.125-.504 1.125-1.125V9.375c0-.621-.504-1.125-1.125-1.125zM6.75 12h.008v.008H6.75zm0 3h.008v.008H6.75zm0 3h.008v.008H6.75z"/>`,
+  "clock": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0a9 9 0 0 1 18 0"/>`,
+  "code-bracket-square": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M14.25 9.75L16.5 12l-2.25 2.25m-4.5 0L7.5 12l2.25-2.25M6 20.25h12A2.25 2.25 0 0 0 20.25 18V6A2.25 2.25 0 0 0 18 3.75H6A2.25 2.25 0 0 0 3.75 6v12A2.25 2.25 0 0 0 6 20.25"/>`,
+  "cog-6-tooth": `<g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87q.11.06.22.127c.325.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 0 1 1.37.49l1.296 2.247a1.125 1.125 0 0 1-.26 1.431l-1.003.827c-.293.241-.438.613-.43.992a8 8 0 0 1 0 .255c-.008.378.137.75.43.991l1.004.827c.424.35.534.955.26 1.43l-1.298 2.247a1.125 1.125 0 0 1-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a7 7 0 0 1-.22.128c-.331.183-.581.495-.644.869l-.213 1.281c-.09.543-.56.94-1.11.94h-2.594c-.55 0-1.019-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a7 7 0 0 1-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 0 1-1.369-.49l-1.297-2.247a1.125 1.125 0 0 1 .26-1.431l1.004-.827c.292-.24.437-.613.43-.991a7 7 0 0 1 0-.255c.007-.38-.138-.751-.43-.992l-1.004-.827a1.125 1.125 0 0 1-.26-1.43l1.297-2.247a1.125 1.125 0 0 1 1.37-.491l1.216.456c.356.133.751.072 1.076-.124q.108-.066.22-.128c.332-.183.582-.495.644-.869z"/><path d="M15 12a3 3 0 1 1-6 0a3 3 0 0 1 6 0"/></g>`,
+  "currency-dollar": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 6v12m-3-2.818l.879.659c1.171.879 3.07.879 4.242 0s1.172-2.303 0-3.182C13.536 12.219 12.768 12 12 12c-.725 0-1.45-.22-2.003-.659c-1.106-.879-1.106-2.303 0-3.182s2.9-.879 4.006 0l.415.33M21 12a9 9 0 1 1-18 0a9 9 0 0 1 18 0"/>`,
+  "document-currency-dollar": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m3.75 9v7.5m2.25-6.466a9 9 0 0 0-3.461-.203c-.536.072-.974.478-1.021 1.017a5 5 0 0 0-.018.402c0 .464.336.844.775.994l2.95 1.012c.44.15.775.53.775.994q0 .204-.018.402c-.047.539-.485.945-1.021 1.017a9.1 9.1 0 0 1-3.461-.203M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9"/>`,
+  "document-duplicate": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15.75 17.25v3.375c0 .621-.504 1.125-1.125 1.125h-9.75a1.125 1.125 0 0 1-1.125-1.125V7.875c0-.621.504-1.125 1.125-1.125H6.75a9 9 0 0 1 1.5.124m7.5 10.376h3.375c.621 0 1.125-.504 1.125-1.125V11.25c0-4.46-3.243-8.161-7.5-8.876a9 9 0 0 0-1.5-.124H9.375c-.621 0-1.125.504-1.125 1.125v3.5m7.5 10.375H9.375a1.125 1.125 0 0 1-1.125-1.125v-9.25m12 6.625v-1.875a3.375 3.375 0 0 0-3.375-3.375h-1.5a1.125 1.125 0 0 1-1.125-1.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H9.75"/>`,
+  "document-text": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9"/>`,
+  "ellipsis-horizontal": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.75 12a.75.75 0 1 1-1.5 0a.75.75 0 0 1 1.5 0m6 0a.75.75 0 1 1-1.5 0a.75.75 0 0 1 1.5 0m6 0a.75.75 0 1 1-1.5 0a.75.75 0 0 1 1.5 0"/>`,
+  "ellipsis-vertical": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 6.75a.75.75 0 1 1 0-1.5a.75.75 0 0 1 0 1.5m0 6a.75.75 0 1 1 0-1.5a.75.75 0 0 1 0 1.5m0 6a.75.75 0 1 1 0-1.5a.75.75 0 0 1 0 1.5"/>`,
+  "envelope": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M21.75 6.75v10.5a2.25 2.25 0 0 1-2.25 2.25h-15a2.25 2.25 0 0 1-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25m19.5 0v.243a2.25 2.25 0 0 1-1.07 1.916l-7.5 4.615a2.25 2.25 0 0 1-2.36 0L3.32 8.91a2.25 2.25 0 0 1-1.07-1.916V6.75"/>`,
+  "exclamation-circle": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 9v3.75m9-.75a9 9 0 1 1-18 0a9 9 0 0 1 18 0m-9 3.75h.008v.008H12z"/>`,
+  "exclamation-triangle": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0zM12 15.75h.007v.008H12z"/>`,
+  "eye": `<g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path d="M2.036 12.322a1 1 0 0 1 0-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178c.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178"/><path d="M15 12a3 3 0 1 1-6 0a3 3 0 0 1 6 0"/></g>`,
+  "finger-print": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7.864 4.243A7.5 7.5 0 0 1 19.5 10.5c0 2.92-.556 5.709-1.568 8.269M5.742 6.364A7.47 7.47 0 0 0 4.5 10.5a7.46 7.46 0 0 1-1.15 3.993m1.989 3.559A11.2 11.2 0 0 0 8.25 10.5a3.75 3.75 0 1 1 7.5 0q0 .79-.064 1.565M12 10.5a14.94 14.94 0 0 1-3.6 9.75m6.633-4.596a18.7 18.7 0 0 1-2.485 5.33"/>`,
+  "home": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m2.25 12l8.955-8.955a1.124 1.124 0 0 1 1.59 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"/>`,
+  "inbox": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.25 13.5h3.86a2.25 2.25 0 0 1 2.012 1.244l.256.512a2.25 2.25 0 0 0 2.013 1.244h3.218a2.25 2.25 0 0 0 2.013-1.244l.256-.512a2.25 2.25 0 0 1 2.013-1.244h3.859m-19.5.338V18a2.25 2.25 0 0 0 2.25 2.25h15A2.25 2.25 0 0 0 21.75 18v-4.162q0-.338-.1-.661l-2.41-7.839a2.25 2.25 0 0 0-2.15-1.588H6.911a2.25 2.25 0 0 0-2.15 1.588L2.35 13.177a2.3 2.3 0 0 0-.1.661"/>`,
+  "information-circle": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m11.25 11.25l.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0a9 9 0 0 1 18 0m-9-3.75h.008v.008H12z"/>`,
+  "key": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15.75 5.25a3 3 0 0 1 3 3m3 0a6 6 0 0 1-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1 1 21.75 8.25"/>`,
+  "list-bullet": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8.25 6.75h12M8.25 12h12m-12 5.25h12M3.75 6.75h.007v.008H3.75zm.375 0a.375.375 0 1 1-.75 0a.375.375 0 0 1 .75 0M3.75 12h.007v.008H3.75zm.375 0a.375.375 0 1 1-.75 0a.375.375 0 0 1 .75 0m-.375 5.25h.007v.008H3.75zm.375 0a.375.375 0 1 1-.75 0a.375.375 0 0 1 .75 0"/>`,
+  "lock-closed": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M16.5 10.5V6.75a4.5 4.5 0 1 0-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 0 0 2.25-2.25v-6.75a2.25 2.25 0 0 0-2.25-2.25H6.75a2.25 2.25 0 0 0-2.25 2.25v6.75a2.25 2.25 0 0 0 2.25 2.25"/>`,
+  "magnifying-glass": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m21 21l-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607"/>`,
+  "map-pin": `<g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path d="M15 10.5a3 3 0 1 1-6 0a3 3 0 0 1 6 0"/><path d="M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25S4.5 17.642 4.5 10.5a7.5 7.5 0 1 1 15 0"/></g>`,
+  "moon": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M21.752 15.002A9.7 9.7 0 0 1 18 15.75A9.75 9.75 0 0 1 8.25 6c0-1.33.266-2.597.748-3.752A9.75 9.75 0 0 0 3 11.25A9.75 9.75 0 0 0 12.75 21a9.75 9.75 0 0 0 9.002-5.998"/>`,
+  "paper-airplane": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6 12L3.269 3.125A59.8 59.8 0 0 1 21.486 12a59.8 59.8 0 0 1-18.217 8.875zm0 0h7.5"/>`,
+  "pencil": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m16.862 4.487l1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8l.8-2.685a4.5 4.5 0 0 1 1.13-1.897zm0 0L19.5 7.125"/>`,
+  "pencil-square": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m16.862 4.487l1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10"/>`,
+  "phone": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.04 12.04 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5z"/>`,
+  "photo": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m2.25 15.75l5.159-5.159a2.25 2.25 0 0 1 3.182 0l5.159 5.159m-1.5-1.5l1.409-1.409a2.25 2.25 0 0 1 3.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 0 0 1.5-1.5V6a1.5 1.5 0 0 0-1.5-1.5H3.75A1.5 1.5 0 0 0 2.25 6v12a1.5 1.5 0 0 0 1.5 1.5m10.5-11.25h.008v.008h-.008zm.375 0a.375.375 0 1 1-.75 0a.375.375 0 0 1 .75 0"/>`,
+  "play": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.347a1.125 1.125 0 0 1 0 1.972l-11.54 6.347a1.125 1.125 0 0 1-1.667-.986z"/>`,
+  "play-circle": `<g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path d="M21 12a9 9 0 1 1-18 0a9 9 0 0 1 18 0"/><path d="M15.91 11.672a.375.375 0 0 1 0 .656l-5.603 3.113a.375.375 0 0 1-.557-.328V8.887c0-.286.307-.466.557-.327z"/></g>`,
+  "plus": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 4.5v15m7.5-7.5h-15"/>`,
+  "stop": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M5.25 7.5A2.25 2.25 0 0 1 7.5 5.25h9a2.25 2.25 0 0 1 2.25 2.25v9a2.25 2.25 0 0 1-2.25 2.25h-9a2.25 2.25 0 0 1-2.25-2.25z"/>`,
+  "sun": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 3v2.25m6.364.386l-1.591 1.591M21 12h-2.25m-.386 6.364l-1.591-1.591M12 18.75V21m-4.773-4.227l-1.591 1.591M5.25 12H3m4.227-4.773L5.636 5.636M15.75 12a3.75 3.75 0 1 1-7.5 0a3.75 3.75 0 0 1 7.5 0"/>`,
+  "tag": `<g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path d="M9.568 3H5.25A2.25 2.25 0 0 0 3 5.25v4.318c0 .597.237 1.17.659 1.591l9.581 9.581c.699.699 1.78.872 2.607.33a18.1 18.1 0 0 0 5.224-5.223c.54-.827.368-1.908-.33-2.607l-9.583-9.58A2.25 2.25 0 0 0 9.568 3"/><path d="M6 6h.008v.008H6z"/></g>`,
+  "trash": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21q.512.078 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48 48 0 0 0-3.478-.397m-12 .562q.51-.088 1.022-.165m0 0a48 48 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a52 52 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a49 49 0 0 0-7.5 0"/>`,
+  "user-circle": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17.982 18.725A7.49 7.49 0 0 0 12 15.75a7.49 7.49 0 0 0-5.982 2.975m11.964 0a9 9 0 1 0-11.963 0m11.962 0A8.97 8.97 0 0 1 12 21a8.97 8.97 0 0 1-5.982-2.275M15 9.75a3 3 0 1 1-6 0a3 3 0 0 1 6 0"/>`,
+  "user-group": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M18 18.72a9.1 9.1 0 0 0 3.741-.479q.01-.12.01-.241a3 3 0 0 0-4.692-2.478m.94 3.197l.001.031q0 .337-.037.666A11.94 11.94 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6 6 0 0 1 6 18.719m12 0a5.97 5.97 0 0 0-.941-3.197m0 0A6 6 0 0 0 12 12.75a6 6 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72a9 9 0 0 0 3.74.477m.94-3.197a5.97 5.97 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0a3 3 0 0 1 6 0m6 3a2.25 2.25 0 1 1-4.5 0a2.25 2.25 0 0 1 4.5 0m-13.5 0a2.25 2.25 0 1 1-4.5 0a2.25 2.25 0 0 1 4.5 0"/>`,
+  "users": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15 19.128a9.4 9.4 0 0 0 2.625.372a9.3 9.3 0 0 0 4.121-.952q.004-.086.004-.173a4.125 4.125 0 0 0-7.536-2.32M15 19.128v-.003c0-1.113-.285-2.16-.786-3.07M15 19.128v.106A12.3 12.3 0 0 1 8.624 21c-2.331 0-4.512-.645-6.374-1.766l-.001-.109a6.375 6.375 0 0 1 11.964-3.07M12 6.375a3.375 3.375 0 1 1-6.75 0a3.375 3.375 0 0 1 6.75 0m8.25 2.25a2.625 2.625 0 1 1-5.25 0a2.625 2.625 0 0 1 5.25 0"/>`,
+  "x-circle": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m9.75 9.75l4.5 4.5m0-4.5l-4.5 4.5M21 12a9 9 0 1 1-18 0a9 9 0 0 1 18 0"/>`,
+  "x-mark": `<path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6 18L18 6M6 6l12 12"/>`,
+} as const;
+
+export type IconName = keyof typeof icons;
diff --git a/src/layouts/DashboardLayout.astro b/src/layouts/DashboardLayout.astro
index b6e7782..e817743 100644
--- a/src/layouts/DashboardLayout.astro
+++ b/src/layouts/DashboardLayout.astro
@@ -1,6 +1,6 @@
 ---
 import '../styles/global.css';
-import { Icon } from 'astro-icon/components';
+import Icon from '../components/Icon.astro';
 import { db } from '../db';
 import { members, organizations } from '../db/schema';
 import { eq } from 'drizzle-orm';
@@ -32,12 +32,12 @@ const currentTeamId = Astro.cookies.get('currentTeamId')?.value || userMembershi
 const currentTeam = userMemberships.find(m => m.organization.id === currentTeamId);
 
 const navItems = [
-  { href: '/dashboard', label: 'Dashboard', icon: 'heroicons:home', exact: true },
-  { href: '/dashboard/tracker', label: 'Time Tracker', icon: 'heroicons:clock' },
-  { href: '/dashboard/invoices', label: 'Invoices & Quotes', icon: 'heroicons:document-currency-dollar' },
-  { href: '/dashboard/reports', label: 'Reports', icon: 'heroicons:chart-bar' },
-  { href: '/dashboard/clients', label: 'Clients', icon: 'heroicons:building-office' },
-  { href: '/dashboard/team', label: 'Team', icon: 'heroicons:user-group' },
+  { href: '/dashboard', label: 'Dashboard', icon: 'home', exact: true },
+  { href: '/dashboard/tracker', label: 'Time Tracker', icon: 'clock' },
+  { href: '/dashboard/invoices', label: 'Invoices & Quotes', icon: 'document-currency-dollar' },
+  { href: '/dashboard/reports', label: 'Reports', icon: 'chart-bar' },
+  { href: '/dashboard/clients', label: 'Clients', icon: 'building-office' },
+  { href: '/dashboard/team', label: 'Team', icon: 'user-group' },
 ];
 
 function isActive(item: { href: string; exact?: boolean }) {
@@ -69,7 +69,7 @@ function isActive(item: { href: string; exact?: boolean }) {
         <div class="navbar bg-base-100 sticky top-0 z-50 lg:hidden border-b border-base-200">
           <div class="flex-none">
             <label for="my-drawer-2" aria-label="open sidebar" class="btn btn-square btn-ghost btn-sm">
-              <Icon name="heroicons:bars-3" class="w-5 h-5" />
+              <Icon name="bars-3" class="w-5 h-5" />
             </label>
           </div>
           <div class="flex-1 px-2 flex items-center gap-2">
@@ -122,7 +122,7 @@ function isActive(item: { href: string; exact?: boolean }) {
           {userMemberships.length === 0 && (
             <div class="px-4 pb-2">
               <a href="/dashboard/organizations/new" class="btn btn-primary btn-sm btn-block">
-                <Icon name="heroicons:plus" class="w-4 h-4" />
+                <Icon name="plus" class="w-4 h-4" />
                 Create Team
               </a>
             </div>
@@ -159,7 +159,7 @@ function isActive(item: { href: string; exact?: boolean }) {
                         ? "bg-primary/10 text-primary"
                         : "text-base-content/70 hover:text-base-content hover:bg-base-300/50"
                     ]}>
-                      <Icon name="heroicons:cog-6-tooth" class="w-[18px] h-[18px]" />
+                      <Icon name="cog-6-tooth" class="w-[18px] h-[18px]" />
                       Site Admin
                     </a>
                   </li>
@@ -177,7 +177,7 @@ function isActive(item: { href: string; exact?: boolean }) {
                   <div class="font-medium text-sm truncate">{user.name}</div>
                   <div class="text-xs text-base-content/50 truncate">{user.email}</div>
                 </div>
-                <Icon name="heroicons:chevron-right" class="w-4 h-4 text-base-content/30 group-hover:text-base-content/50" />
+                <Icon name="chevron-right" class="w-4 h-4 text-base-content/30 group-hover:text-base-content/50" />
               </a>
             </div>
 
@@ -189,7 +189,7 @@ function isActive(item: { href: string; exact?: boolean }) {
             <div class="px-3 pb-3">
               <form action="/api/auth/logout" method="POST">
                 <button type="submit" class="btn btn-ghost btn-sm btn-block justify-start gap-2 text-base-content/60 hover:text-error hover:bg-error/10 font-medium">
-                  <Icon name="heroicons:arrow-right-on-rectangle" class="w-[18px] h-[18px]" />
+                  <Icon name="arrow-right-on-rectangle" class="w-[18px] h-[18px]" />
                   Logout
                 </button>
               </form>
diff --git a/src/pages/api/invoices/[id]/generate.ts b/src/pages/api/invoices/[id]/generate.ts
index 0cd8fbf..7d7527a 100644
--- a/src/pages/api/invoices/[id]/generate.ts
+++ b/src/pages/api/invoices/[id]/generate.ts
@@ -69,7 +69,6 @@ export const GET: APIRoute = async ({ params, locals }) => {
       invoice: {
         ...invoice,
         notes: invoice.notes || null,
-        // Ensure null safety for optional fields that might be undefined in some runtimes depending on driver
         discountValue: invoice.discountValue ?? null,
         discountType: invoice.discountType ?? null,
         discountAmount: invoice.discountAmount ?? null,
diff --git a/src/pages/api/invoices/[id]/import-time.ts b/src/pages/api/invoices/[id]/import-time.ts
index 3e2e149..8a2a128 100644
--- a/src/pages/api/invoices/[id]/import-time.ts
+++ b/src/pages/api/invoices/[id]/import-time.ts
@@ -44,7 +44,6 @@ export const POST: APIRoute = async ({ request, params, locals, redirect }) => {
 
   const startDate = new Date(startDateStr);
   const endDate = new Date(endDateStr);
-  // Set end date to end of day
   endDate.setHours(23, 59, 59, 999);
 
   const invoice = await db
@@ -174,7 +173,6 @@ export const POST: APIRoute = async ({ request, params, locals, redirect }) => {
 
     for (const day of days.values()) {
       const hours = day.totalDuration / (1000 * 60 * 60);
-      // Avoid division by zero
       const unitPrice = hours > 0 ? Math.round(day.totalAmount / hours) : 0;
 
       newItems.push({
@@ -193,7 +191,6 @@ export const POST: APIRoute = async ({ request, params, locals, redirect }) => {
       const duration = entry.endTime.getTime() - entry.startTime.getTime();
       const hours = duration / (1000 * 60 * 60);
 
-      // Determine rate: max of tags, or 0
       const rate = rates.length > 0 ? Math.max(...rates) : 0;
       const amount = Math.round(hours * rate);
 
diff --git a/src/pages/dashboard/clients/[id]/edit.astro b/src/pages/dashboard/clients/[id]/edit.astro
index 82178f0..51904b3 100644
--- a/src/pages/dashboard/clients/[id]/edit.astro
+++ b/src/pages/dashboard/clients/[id]/edit.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../../components/Icon.astro';
 import { db } from '../../../../db';
 import { clients } from '../../../../db/schema';
 import { eq, and } from 'drizzle-orm';
@@ -30,7 +30,7 @@ if (!client) return Astro.redirect('/dashboard/clients');
   <div class="max-w-2xl mx-auto">
     <div class="flex items-center gap-3 mb-6">
       <a href={`/dashboard/clients/${client.id}`} class="btn btn-ghost btn-xs">
-        <Icon name="heroicons:arrow-left" class="w-4 h-4" />
+        <Icon name="arrow-left" class="w-4 h-4" />
       </a>
       <h1 class="text-2xl font-extrabold tracking-tight">Edit Client</h1>
     </div>
diff --git a/src/pages/dashboard/clients/[id]/index.astro b/src/pages/dashboard/clients/[id]/index.astro
index f9701aa..7064318 100644
--- a/src/pages/dashboard/clients/[id]/index.astro
+++ b/src/pages/dashboard/clients/[id]/index.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../../components/Icon.astro';
 import { db } from '../../../../db';
 import { clients, timeEntries, tags, users } from '../../../../db/schema';
 import { eq, and, desc, sql } from 'drizzle-orm';
@@ -64,7 +64,7 @@ const totalEntriesCount = totalEntriesResult?.count || 0;
 <DashboardLayout title={`${client.name} - Clients - Chronus`}>
   <div class="flex items-center gap-3 mb-6">
     <a href="/dashboard/clients" class="btn btn-ghost btn-xs">
-      <Icon name="heroicons:arrow-left" class="w-4 h-4" />
+      <Icon name="arrow-left" class="w-4 h-4" />
     </a>
     <h1 class="text-2xl font-extrabold tracking-tight">{client.name}</h1>
   </div>
@@ -79,19 +79,19 @@ const totalEntriesCount = totalEntriesResult?.count || 0;
             <div class="space-y-2 mb-4">
               {client.email && (
                 <div class="flex items-center gap-2 text-base-content/60 text-sm">
-                  <Icon name="heroicons:envelope" class="w-4 h-4" />
+                  <Icon name="envelope" class="w-4 h-4" />
                   <a href={`mailto:${client.email}`} class="link link-hover">{client.email}</a>
                 </div>
               )}
               {client.phone && (
                 <div class="flex items-center gap-2 text-base-content/60 text-sm">
-                  <Icon name="heroicons:phone" class="w-4 h-4" />
+                  <Icon name="phone" class="w-4 h-4" />
                   <a href={`tel:${client.phone}`} class="link link-hover">{client.phone}</a>
                 </div>
               )}
               {(client.street || client.city || client.state || client.zip || client.country) && (
                 <div class="flex items-start gap-2 text-base-content/60">
-                  <Icon name="heroicons:map-pin" class="w-4 h-4 mt-0.5" />
+                  <Icon name="map-pin" class="w-4 h-4 mt-0.5" />
                   <div class="text-sm space-y-0.5">
                     {client.street && <div>{client.street}</div>}
                     {(client.city || client.state || client.zip) && (
@@ -107,12 +107,12 @@ const totalEntriesCount = totalEntriesResult?.count || 0;
           </div>
           <div class="flex gap-2">
             <a href={`/dashboard/clients/${client.id}/edit`} class="btn btn-primary btn-xs">
-              <Icon name="heroicons:pencil" class="w-3 h-3" />
+              <Icon name="pencil" class="w-3 h-3" />
               Edit
             </a>
             <form method="POST" action={`/api/clients/${client.id}/delete`} onsubmit="return confirm('Are you sure you want to delete this client? This will also delete all associated time entries.');">
               <button type="submit" class="btn btn-error btn-outline btn-xs">
-                <Icon name="heroicons:trash" class="w-3 h-3" />
+                <Icon name="trash" class="w-3 h-3" />
                 Delete
               </button>
             </form>
@@ -126,14 +126,14 @@ const totalEntriesCount = totalEntriesResult?.count || 0;
             title="Total Time Tracked"
             value={`${totalHours}h ${totalMinutes}m`}
             description="Across all projects"
-            icon="heroicons:clock"
+            icon="clock"
             color="text-primary"
           />
           <StatCard
             title="Total Entries"
             value={String(totalEntriesCount)}
             description="Recorded entries"
-            icon="heroicons:list-bullet"
+            icon="list-bullet"
             color="text-secondary"
           />
         </div>
diff --git a/src/pages/dashboard/index.astro b/src/pages/dashboard/index.astro
index e1001c7..50321c3 100644
--- a/src/pages/dashboard/index.astro
+++ b/src/pages/dashboard/index.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../components/Icon.astro';
 import StatCard from '../../components/StatCard.astro';
 import { db } from '../../db';
 import { organizations, members, timeEntries, clients, tags } from '../../db/schema';
@@ -112,20 +112,20 @@ const hasMembership = userOrgs.length > 0;
       <p class="text-base-content/60 text-sm mt-1">Welcome back, {user.name}!</p>
     </div>
     <a href="/dashboard/organizations/new" class="btn btn-ghost btn-sm">
-      <Icon name="heroicons:plus" class="w-4 h-4" />
+      <Icon name="plus" class="w-4 h-4" />
       New Team
     </a>
   </div>
 
   {!hasMembership && (
     <div class="alert alert-info mb-6 text-sm">
-      <Icon name="heroicons:information-circle" class="w-5 h-5" />
+      <Icon name="information-circle" class="w-5 h-5" />
       <div>
         <h3 class="font-bold">Welcome to Chronus!</h3>
         <div class="text-xs">You're not part of any team yet. Create one or wait for an invitation.</div>
       </div>
       <a href="/dashboard/organizations/new" class="btn btn-primary btn-sm">
-        <Icon name="heroicons:plus" class="w-4 h-4" />
+        <Icon name="plus" class="w-4 h-4" />
         New Team
       </a>
     </div>
@@ -139,28 +139,28 @@ const hasMembership = userOrgs.length > 0;
           title="This Week"
           value={formatDuration(stats.totalTimeThisWeek)}
           description="Total tracked time"
-          icon="heroicons:clock"
+          icon="clock"
           color="text-primary"
         />
         <StatCard
           title="This Month"
           value={formatDuration(stats.totalTimeThisMonth)}
           description="Total tracked time"
-          icon="heroicons:calendar"
+          icon="calendar"
           color="text-secondary"
         />
         <StatCard
           title="Active Timers"
           value={String(stats.activeTimers)}
           description="Currently running"
-          icon="heroicons:play-circle"
+          icon="play-circle"
           color="text-accent"
         />
         <StatCard
           title="Clients"
           value={String(stats.totalClients)}
           description="Total active"
-          icon="heroicons:building-office"
+          icon="building-office"
           color="text-info"
         />
       </div>
@@ -170,20 +170,20 @@ const hasMembership = userOrgs.length > 0;
         <div class="card card-border bg-base-100">
           <div class="card-body p-4">
             <h2 class="text-sm font-semibold flex items-center gap-2">
-              <Icon name="heroicons:bolt" class="w-4 h-4 text-warning" />
+              <Icon name="bolt" class="w-4 h-4 text-warning" />
               Quick Actions
             </h2>
             <div class="flex flex-col gap-2 mt-3">
               <a href="/dashboard/tracker" class="btn btn-primary btn-sm">
-                <Icon name="heroicons:play" class="w-4 h-4" />
+                <Icon name="play" class="w-4 h-4" />
                 Start Timer
               </a>
               <a href="/dashboard/clients/new" class="btn btn-ghost btn-sm">
-                <Icon name="heroicons:plus" class="w-4 h-4" />
+                <Icon name="plus" class="w-4 h-4" />
                 Add Client
               </a>
               <a href="/dashboard/reports" class="btn btn-ghost btn-sm">
-                <Icon name="heroicons:chart-bar" class="w-4 h-4" />
+                <Icon name="chart-bar" class="w-4 h-4" />
                 View Reports
               </a>
             </div>
@@ -194,7 +194,7 @@ const hasMembership = userOrgs.length > 0;
         <div class="card card-border bg-base-100">
           <div class="card-body p-4">
             <h2 class="text-sm font-semibold flex items-center gap-2">
-              <Icon name="heroicons:clock" class="w-4 h-4 text-success" />
+              <Icon name="clock" class="w-4 h-4 text-success" />
               Recent Activity
             </h2>
             {stats.recentEntries.length > 0 ? (
@@ -215,7 +215,7 @@ const hasMembership = userOrgs.length > 0;
               </ul>
             ) : (
               <div class="flex flex-col items-center justify-center py-6 text-center mt-3">
-                <Icon name="heroicons:clock" class="w-10 h-10 text-base-content/15 mb-2" />
+                <Icon name="clock" class="w-10 h-10 text-base-content/15 mb-2" />
                 <p class="text-base-content/40 text-sm">No recent time entries</p>
               </div>
             )}
diff --git a/src/pages/dashboard/invoices/[id].astro b/src/pages/dashboard/invoices/[id].astro
index dc512db..158c3ea 100644
--- a/src/pages/dashboard/invoices/[id].astro
+++ b/src/pages/dashboard/invoices/[id].astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../components/Icon.astro';
 import { db } from '../../../db';
 import { invoices, invoiceItems, clients, members, organizations } from '../../../db/schema';
 import { eq, and } from 'drizzle-orm';
@@ -60,7 +60,7 @@ const isDraft = invoice.status === 'draft';
       <div>
         <div class="flex items-center gap-2 mb-1">
           <a href="/dashboard/invoices" class="btn btn-ghost btn-xs btn-square">
-            <Icon name="heroicons:arrow-left" class="w-4 h-4" />
+            <Icon name="arrow-left" class="w-4 h-4" />
           </a>
           <div class={`badge badge-xs ${
             invoice.status === 'paid' || invoice.status === 'accepted' ? 'badge-success' :
@@ -79,7 +79,7 @@ const isDraft = invoice.status === 'draft';
            <form method="POST" action={`/api/invoices/${invoice.id}/status`}>
             <input type="hidden" name="status" value="sent" />
             <button type="submit" class="btn btn-primary btn-sm">
-              <Icon name="heroicons:paper-airplane" class="w-4 h-4" />
+              <Icon name="paper-airplane" class="w-4 h-4" />
               Mark Sent
             </button>
           </form>
@@ -88,7 +88,7 @@ const isDraft = invoice.status === 'draft';
            <form method="POST" action={`/api/invoices/${invoice.id}/status`}>
             <input type="hidden" name="status" value="paid" />
             <button type="submit" class="btn btn-success btn-sm">
-              <Icon name="heroicons:check" class="w-4 h-4" />
+              <Icon name="check" class="w-4 h-4" />
               Mark Paid
             </button>
           </form>
@@ -97,7 +97,7 @@ const isDraft = invoice.status === 'draft';
            <form method="POST" action={`/api/invoices/${invoice.id}/status`}>
             <input type="hidden" name="status" value="accepted" />
             <button type="submit" class="btn btn-success btn-sm">
-              <Icon name="heroicons:check" class="w-4 h-4" />
+              <Icon name="check" class="w-4 h-4" />
               Mark Accepted
             </button>
           </form>
@@ -105,25 +105,25 @@ const isDraft = invoice.status === 'draft';
         {(invoice.type === 'quote' && invoice.status === 'accepted') && (
            <form method="POST" action={`/api/invoices/${invoice.id}/convert`}>
             <button type="submit" class="btn btn-primary btn-sm">
-              <Icon name="heroicons:document-duplicate" class="w-4 h-4" />
+              <Icon name="document-duplicate" class="w-4 h-4" />
               Convert to Invoice
             </button>
           </form>
         )}
         <div class="dropdown dropdown-end">
           <div role="button" tabindex="0" class="btn btn-square btn-ghost btn-sm border border-base-200">
-            <Icon name="heroicons:ellipsis-horizontal" class="w-4 h-4" />
+            <Icon name="ellipsis-horizontal" class="w-4 h-4" />
           </div>
           <ul tabindex="0" class="dropdown-content z-1 menu p-2 bg-base-100 rounded-box w-52 border border-base-200">
             <li>
               <a href={`/dashboard/invoices/${invoice.id}/edit`}>
-                <Icon name="heroicons:pencil-square" class="w-4 h-4" />
+                <Icon name="pencil-square" class="w-4 h-4" />
                 Edit Settings
               </a>
             </li>
             <li>
               <a href={`/api/invoices/${invoice.id}/generate`} download>
-                <Icon name="heroicons:arrow-down-tray" class="w-4 h-4" />
+                <Icon name="arrow-down-tray" class="w-4 h-4" />
                 Download PDF
               </a>
             </li>
@@ -132,7 +132,7 @@ const isDraft = invoice.status === 'draft';
                 <form method="POST" action={`/api/invoices/${invoice.id}/status`}>
                   <input type="hidden" name="status" value="void" />
                   <button type="submit" class="text-error">
-                    <Icon name="heroicons:x-circle" class="w-4 h-4" />
+                    <Icon name="x-circle" class="w-4 h-4" />
                     Void
                   </button>
                 </form>
@@ -142,7 +142,7 @@ const isDraft = invoice.status === 'draft';
                 <form method="POST" action="/api/invoices/delete" onsubmit="return confirm('Are you sure?');">
                   <input type="hidden" name="id" value={invoice.id} />
                   <button type="submit" class="text-error">
-                    <Icon name="heroicons:trash" class="w-4 h-4" />
+                    <Icon name="trash" class="w-4 h-4" />
                     Delete
                   </button>
                 </form>
@@ -236,7 +236,7 @@ const isDraft = invoice.status === 'draft';
                       <form method="POST" action={`/api/invoices/${invoice.id}/items/delete`}>
                         <input type="hidden" name="itemId" value={item.id} />
                          <button type="submit" class="btn btn-ghost btn-xs btn-square text-error opacity-50 hover:opacity-100">
-                          <Icon name="heroicons:trash" class="w-4 h-4" />
+                          <Icon name="trash" class="w-4 h-4" />
                         </button>
                       </form>
                     </td>
@@ -259,7 +259,7 @@ const isDraft = invoice.status === 'draft';
         {isDraft && (
           <div class="flex justify-end mb-4">
             <button onclick="document.getElementById('import_time_modal').showModal()" class="btn btn-sm btn-outline gap-2">
-              <Icon name="heroicons:clock" class="w-4 h-4" />
+              <Icon name="clock" class="w-4 h-4" />
               Import Time
             </button>
           </div>
@@ -281,7 +281,7 @@ const isDraft = invoice.status === 'draft';
               </div>
               <div class="sm:col-span-1">
                 <button type="submit" class="btn btn-sm btn-primary w-full">
-                  <Icon name="heroicons:plus" class="w-4 h-4" />
+                  <Icon name="plus" class="w-4 h-4" />
                 </button>
               </div>
             </div>
@@ -310,7 +310,7 @@ const isDraft = invoice.status === 'draft';
                   Tax ({invoice.taxRate ?? 0}%)
                   {isDraft && (
                     <button type="button" onclick="document.getElementById('tax_modal').showModal()" class="btn btn-ghost btn-xs btn-square opacity-0 group-hover:opacity-100 transition-opacity" title="Edit Tax Rate">
-                      <Icon name="heroicons:pencil" class="w-3 h-3" />
+                      <Icon name="pencil" class="w-3 h-3" />
                     </button>
                   )}
                 </span>
diff --git a/src/pages/dashboard/invoices/[id]/edit.astro b/src/pages/dashboard/invoices/[id]/edit.astro
index 68c8c3e..9835eda 100644
--- a/src/pages/dashboard/invoices/[id]/edit.astro
+++ b/src/pages/dashboard/invoices/[id]/edit.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../../components/Icon.astro';
 import { db } from '../../../../db';
 import { invoices, members } from '../../../../db/schema';
 import { eq, and } from 'drizzle-orm';
@@ -48,7 +48,7 @@ const discountValueDisplay = invoice.discountType === 'fixed'
   <div class="max-w-3xl mx-auto">
     <div class="mb-6">
       <a href={`/dashboard/invoices/${invoice.id}`} class="btn btn-ghost btn-xs gap-2 pl-0 hover:bg-transparent text-base-content/60">
-        <Icon name="heroicons:arrow-left" class="w-4 h-4" />
+        <Icon name="arrow-left" class="w-4 h-4" />
         Back to Invoice
       </a>
       <h1 class="text-2xl font-extrabold tracking-tight mt-2">Edit Details</h1>
diff --git a/src/pages/dashboard/invoices/index.astro b/src/pages/dashboard/invoices/index.astro
index d17c7d5..18638e1 100644
--- a/src/pages/dashboard/invoices/index.astro
+++ b/src/pages/dashboard/invoices/index.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../components/Icon.astro';
 import StatCard from '../../../components/StatCard.astro';
 import { db } from '../../../db';
 import { invoices, clients } from '../../../db/schema';
@@ -108,7 +108,7 @@ const getStatusColor = (status: string) => {
       <p class="text-base-content/60 text-sm mt-1">Manage your billing and estimates</p>
     </div>
     <a href="/dashboard/invoices/new" class="btn btn-primary btn-sm">
-      <Icon name="heroicons:plus" class="w-4 h-4" />
+      <Icon name="plus" class="w-4 h-4" />
       Create New
     </a>
   </div>
@@ -118,14 +118,14 @@ const getStatusColor = (status: string) => {
       title="Total Invoices"
       value={String(yearInvoices.filter(i => i.invoice.type === 'invoice').length)}
       description={selectedYear === 'current' ? `${currentYear} (YTD)` : String(selectedYear)}
-      icon="heroicons:document-text"
+      icon="document-text"
       color="text-primary"
     />
     <StatCard
       title="Open Quotes"
       value={String(yearInvoices.filter(i => i.invoice.type === 'quote' && i.invoice.status === 'sent').length)}
       description="Waiting for approval"
-      icon="heroicons:clipboard-document-list"
+      icon="clipboard-document-list"
       color="text-secondary"
     />
     <StatCard
@@ -134,7 +134,7 @@ const getStatusColor = (status: string) => {
         .filter(i => i.invoice.type === 'invoice' && i.invoice.status === 'paid')
         .reduce((acc, curr) => acc + curr.invoice.total, 0), 'USD')}
       description={`Paid invoices (${selectedYear === 'current' ? `${currentYear} YTD` : selectedYear})`}
-      icon="heroicons:currency-dollar"
+      icon="currency-dollar"
       color="text-success"
     />
   </div>
@@ -191,7 +191,7 @@ const getStatusColor = (status: string) => {
       {(selectedYear !== 'current' || selectedType !== 'all' || selectedStatus !== 'all' || sortBy !== 'date-desc') && (
         <div class="mt-3">
           <a href="/dashboard/invoices" class="btn btn-ghost btn-xs">
-            <Icon name="heroicons:x-mark" class="w-3 h-3" />
+            <Icon name="x-mark" class="w-3 h-3" />
             Clear Filters
           </a>
         </div>
@@ -260,24 +260,24 @@ const getStatusColor = (status: string) => {
                   <td class="text-right">
                     <div class="dropdown dropdown-end">
                       <div role="button" tabindex="0" class="btn btn-ghost btn-xs btn-square">
-                        <Icon name="heroicons:ellipsis-vertical" class="w-4 h-4" />
+                        <Icon name="ellipsis-vertical" class="w-4 h-4" />
                       </div>
                       <ul tabindex="0" class="dropdown-content menu p-2 bg-base-100 rounded-box w-52 border border-base-200 z-100">
                         <li>
                           <a href={`/dashboard/invoices/${invoice.id}`}>
-                            <Icon name="heroicons:eye" class="w-4 h-4" />
+                            <Icon name="eye" class="w-4 h-4" />
                             View Details
                           </a>
                         </li>
                         <li>
                           <a href={`/dashboard/invoices/${invoice.id}/edit`}>
-                            <Icon name="heroicons:pencil-square" class="w-4 h-4" />
+                            <Icon name="pencil-square" class="w-4 h-4" />
                             Edit
                           </a>
                         </li>
                         <li>
                           <a href={`/api/invoices/${invoice.id}/generate`} download>
-                            <Icon name="heroicons:arrow-down-tray" class="w-4 h-4" />
+                            <Icon name="arrow-down-tray" class="w-4 h-4" />
                             Download PDF
                           </a>
                         </li>
@@ -286,7 +286,7 @@ const getStatusColor = (status: string) => {
                             <form method="POST" action={`/api/invoices/${invoice.id}/status`} class="w-full">
                               <input type="hidden" name="status" value="sent" />
                               <button type="submit" class="w-full justify-start">
-                                <Icon name="heroicons:paper-airplane" class="w-4 h-4" />
+                                <Icon name="paper-airplane" class="w-4 h-4" />
                                 Mark as Sent
                               </button>
                             </form>
@@ -297,7 +297,7 @@ const getStatusColor = (status: string) => {
                           <form method="POST" action={`/api/invoices/delete`} onsubmit="return confirm('Are you sure? This action cannot be undone.');" class="w-full">
                             <input type="hidden" name="id" value={invoice.id} />
                             <button type="submit" class="w-full justify-start text-error hover:bg-error/10">
-                              <Icon name="heroicons:trash" class="w-4 h-4" />
+                              <Icon name="trash" class="w-4 h-4" />
                               Delete
                             </button>
                           </form>
diff --git a/src/pages/dashboard/invoices/new.astro b/src/pages/dashboard/invoices/new.astro
index e4740a2..0a1cbe2 100644
--- a/src/pages/dashboard/invoices/new.astro
+++ b/src/pages/dashboard/invoices/new.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../components/Icon.astro';
 import { db } from '../../../db';
 import { clients, invoices, organizations } from '../../../db/schema';
 import { eq, desc, and } from 'drizzle-orm';
@@ -81,7 +81,7 @@ const defaultDueDate = nextMonth.toISOString().split('T')[0];
   <div class="max-w-3xl mx-auto">
     <div class="mb-6">
       <a href="/dashboard/invoices" class="btn btn-ghost btn-xs gap-2 pl-0 hover:bg-transparent text-base-content/60">
-        <Icon name="heroicons:arrow-left" class="w-4 h-4" />
+        <Icon name="arrow-left" class="w-4 h-4" />
         Back to Invoices
       </a>
       <h1 class="text-2xl font-extrabold tracking-tight mt-2">Create New Document</h1>
@@ -89,7 +89,7 @@ const defaultDueDate = nextMonth.toISOString().split('T')[0];
 
     {teamClients.length === 0 ? (
       <div role="alert" class="alert alert-warning">
-        <Icon name="heroicons:exclamation-triangle" class="w-5 h-5" />
+        <Icon name="exclamation-triangle" class="w-5 h-5" />
         <div>
           <h3 class="font-semibold text-sm">No Clients Found</h3>
           <div class="text-xs">You need to add a client before you can create an invoice or quote.</div>
@@ -187,7 +187,7 @@ const defaultDueDate = nextMonth.toISOString().split('T')[0];
             <a href="/dashboard/invoices" class="btn btn-ghost btn-sm">Cancel</a>
             <button type="submit" class="btn btn-primary btn-sm">
               Create Draft
-              <Icon name="heroicons:arrow-right" class="w-4 h-4" />
+              <Icon name="arrow-right" class="w-4 h-4" />
             </button>
           </div>
         </div>
diff --git a/src/pages/dashboard/organizations/new.astro b/src/pages/dashboard/organizations/new.astro
index ef84f14..3f7adcb 100644
--- a/src/pages/dashboard/organizations/new.astro
+++ b/src/pages/dashboard/organizations/new.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../components/Icon.astro';
 import { db } from '../../../db';
 import { organizations, members } from '../../../db/schema';
 import { eq } from 'drizzle-orm';
@@ -13,7 +13,7 @@ if (!user) return Astro.redirect('/login');
   <div class="max-w-2xl mx-auto">
     <div class="flex items-center gap-3 mb-6">
       <a href="/dashboard" class="btn btn-ghost btn-xs">
-        <Icon name="heroicons:arrow-left" class="w-4 h-4" />
+        <Icon name="arrow-left" class="w-4 h-4" />
       </a>
       <h1 class="text-2xl font-extrabold tracking-tight">Create New Team</h1>
     </div>
@@ -21,7 +21,7 @@ if (!user) return Astro.redirect('/login');
     <form method="POST" action="/api/organizations/create" class="card card-border bg-base-100">
       <div class="card-body p-4">
         <div class="alert alert-info mb-4">
-          <Icon name="heroicons:information-circle" class="w-4 h-4" />
+          <Icon name="information-circle" class="w-4 h-4" />
           <span class="text-sm">Create a new team to manage separate projects and collaborators. You'll be the owner.</span>
         </div>
 
diff --git a/src/pages/dashboard/reports.astro b/src/pages/dashboard/reports.astro
index 6255654..03c5449 100644
--- a/src/pages/dashboard/reports.astro
+++ b/src/pages/dashboard/reports.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../components/Icon.astro';
 import StatCard from '../../components/StatCard.astro';
 import TagChart from '../../components/TagChart.vue';
 import ClientChart from '../../components/ClientChart.vue';
@@ -343,28 +343,28 @@ function getTimeRangeLabel(range: string) {
       title="Total Time"
       value={formatDuration(totalTime)}
       description={getTimeRangeLabel(timeRange)}
-      icon="heroicons:clock"
+      icon="clock"
       color="text-primary"
     />
     <StatCard
       title="Total Entries"
       value={String(entries.length)}
       description={getTimeRangeLabel(timeRange)}
-      icon="heroicons:list-bullet"
+      icon="list-bullet"
       color="text-secondary"
     />
     <StatCard
       title="Revenue"
       value={formatCurrency(revenueStats.total)}
       description={`${invoiceStats.paid} paid invoices`}
-      icon="heroicons:currency-dollar"
+      icon="currency-dollar"
       color="text-success"
     />
     <StatCard
       title="Active Members"
       value={String(statsByMember.filter(s => s.entryCount > 0).length)}
       description={`of ${teamMembers.length} total`}
-      icon="heroicons:user-group"
+      icon="user-group"
       color="text-accent"
     />
   </div>
@@ -374,7 +374,7 @@ function getTimeRangeLabel(range: string) {
     <div class="card card-border bg-base-100">
       <div class="card-body p-4">
         <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-          <Icon name="heroicons:document-text" class="w-4 h-4" />
+          <Icon name="document-text" class="w-4 h-4" />
           Invoices Overview
         </h2>
         <div class="grid grid-cols-2 gap-4">
@@ -410,7 +410,7 @@ function getTimeRangeLabel(range: string) {
     <div class="card card-border bg-base-100">
       <div class="card-body p-4">
         <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-          <Icon name="heroicons:clipboard-document-list" class="w-4 h-4" />
+          <Icon name="clipboard-document-list" class="w-4 h-4" />
           Quotes Overview
         </h2>
         <div class="grid grid-cols-2 gap-4">
@@ -451,7 +451,7 @@ function getTimeRangeLabel(range: string) {
     <div class="card card-border bg-base-100 mb-6">
       <div class="card-body p-4">
         <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-          <Icon name="heroicons:banknotes" class="w-4 h-4" />
+          <Icon name="banknotes" class="w-4 h-4" />
           Revenue by Client
         </h2>
         <div class="overflow-x-auto">
@@ -493,7 +493,7 @@ function getTimeRangeLabel(range: string) {
           <div class="card card-border bg-base-100">
             <div class="card-body p-4">
               <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-                <Icon name="heroicons:chart-pie" class="w-4 h-4" />
+                <Icon name="chart-pie" class="w-4 h-4" />
                 Tag Distribution
               </h2>
               <div class="h-64 w-full">
@@ -515,7 +515,7 @@ function getTimeRangeLabel(range: string) {
           <div class="card card-border bg-base-100">
             <div class="card-body p-4">
               <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-                <Icon name="heroicons:chart-bar" class="w-4 h-4" />
+                <Icon name="chart-bar" class="w-4 h-4" />
                 Time by Client
               </h2>
               <div class="h-64 w-full">
@@ -537,7 +537,7 @@ function getTimeRangeLabel(range: string) {
         <div class="card card-border bg-base-100 mb-6">
           <div class="card-body p-4">
             <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-              <Icon name="heroicons:users" class="w-4 h-4" />
+              <Icon name="users" class="w-4 h-4" />
               Time by Team Member
             </h2>
             <div class="h-64 w-full">
@@ -560,7 +560,7 @@ function getTimeRangeLabel(range: string) {
     <div class="card card-border bg-base-100 mb-6">
       <div class="card-body p-4">
         <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-          <Icon name="heroicons:users" class="w-4 h-4" />
+          <Icon name="users" class="w-4 h-4" />
           By Team Member
         </h2>
         <div class="overflow-x-auto">
@@ -601,7 +601,7 @@ function getTimeRangeLabel(range: string) {
     <div class="card card-border bg-base-100 mb-6">
       <div class="card-body p-4">
         <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-          <Icon name="heroicons:tag" class="w-4 h-4" />
+          <Icon name="tag" class="w-4 h-4" />
           By Tag
         </h2>
         <div class="overflow-x-auto">
@@ -653,7 +653,7 @@ function getTimeRangeLabel(range: string) {
     <div class="card card-border bg-base-100 mb-6">
       <div class="card-body p-4">
         <h2 class="text-sm font-semibold flex items-center gap-2 mb-3">
-          <Icon name="heroicons:building-office" class="w-4 h-4" />
+          <Icon name="building-office" class="w-4 h-4" />
           By Client
         </h2>
         <div class="overflow-x-auto">
@@ -698,12 +698,12 @@ function getTimeRangeLabel(range: string) {
     <div class="card-body p-4">
       <div class="flex justify-between items-center mb-3">
         <h2 class="text-sm font-semibold flex items-center gap-2">
-          <Icon name="heroicons:document-text" class="w-4 h-4" />
+          <Icon name="document-text" class="w-4 h-4" />
           Detailed Entries ({entries.length})
         </h2>
         {entries.length > 0 && (
           <a href={`/api/reports/export${url.search}`} class="btn btn-xs btn-ghost" target="_blank">
-            <Icon name="heroicons:arrow-down-tray" class="w-3.5 h-3.5" />
+            <Icon name="arrow-down-tray" class="w-3.5 h-3.5" />
             Export CSV
           </a>
         )}
@@ -758,11 +758,11 @@ function getTimeRangeLabel(range: string) {
         </div>
       ) : (
         <div class="flex flex-col items-center justify-center py-10 text-center">
-          <Icon name="heroicons:inbox" class="w-12 h-12 text-base-content/15 mb-3" />
+          <Icon name="inbox" class="w-12 h-12 text-base-content/15 mb-3" />
           <h3 class="text-base font-semibold mb-1">No time entries found</h3>
           <p class="text-base-content/50 text-sm mb-4">Try adjusting your filters or select a different time range.</p>
           <a href="/dashboard/tracker" class="btn btn-primary btn-sm">
-            <Icon name="heroicons:play" class="w-4 h-4" />
+            <Icon name="play" class="w-4 h-4" />
             Start Tracking Time
           </a>
         </div>
diff --git a/src/pages/dashboard/settings.astro b/src/pages/dashboard/settings.astro
index 694f585..67b425d 100644
--- a/src/pages/dashboard/settings.astro
+++ b/src/pages/dashboard/settings.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../components/Icon.astro';
 import { db } from '../../db';
 import { apiTokens, passkeys } from '../../db/schema';
 import { eq, desc } from 'drizzle-orm';
@@ -37,14 +37,14 @@ const userPasskeys = await db.select()
     {/* Success Messages */}
     {successType === 'profile' && (
       <div class="alert alert-success mb-6">
-        <Icon name="heroicons:check-circle" class="w-5 h-5 sm:w-6 sm:h-6 shrink-0" />
+        <Icon name="check-circle" class="w-5 h-5 sm:w-6 sm:h-6 shrink-0" />
         <span class="text-sm sm:text-base">Profile updated successfully!</span>
       </div>
     )}
 
     {successType === 'password' && (
       <div class="alert alert-success mb-6">
-        <Icon name="heroicons:check-circle" class="w-5 h-5 sm:w-6 sm:h-6 shrink-0" />
+        <Icon name="check-circle" class="w-5 h-5 sm:w-6 sm:h-6 shrink-0" />
         <span class="text-sm sm:text-base">Password changed successfully!</span>
       </div>
     )}
@@ -72,7 +72,7 @@ const userPasskeys = await db.select()
     <div class="card card-border bg-base-100">
       <div class="card-body p-4">
         <h2 class="text-sm font-semibold flex items-center gap-2 mb-4">
-          <Icon name="heroicons:information-circle" class="w-4 h-4" />
+          <Icon name="information-circle" class="w-4 h-4" />
           Account Information
         </h2>
 
diff --git a/src/pages/dashboard/team.astro b/src/pages/dashboard/team.astro
index 152f1b5..7b55154 100644
--- a/src/pages/dashboard/team.astro
+++ b/src/pages/dashboard/team.astro
@@ -1,7 +1,7 @@
 ---
 import DashboardLayout from '../../layouts/DashboardLayout.astro';
 import Avatar from '../../components/Avatar.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../components/Icon.astro';
 import { db } from '../../db';
 import { members, users } from '../../db/schema';
 import { eq } from 'drizzle-orm';
@@ -36,7 +36,7 @@ const isAdmin = currentUserMember?.member.role === 'owner' || currentUserMember?
       {isAdmin && (
         <>
           <a href="/dashboard/team/settings" class="btn btn-ghost btn-sm">
-            <Icon name="heroicons:cog-6-tooth" class="w-4 h-4" />
+            <Icon name="cog-6-tooth" class="w-4 h-4" />
             Settings
           </a>
           <a href="/dashboard/team/invite" class="btn btn-primary btn-sm">Invite Member</a>
@@ -88,7 +88,7 @@ const isAdmin = currentUserMember?.member.role === 'owner' || currentUserMember?
                     {teamUser.id !== user.id && member.role !== 'owner' && (
                       <div class="dropdown dropdown-end">
                         <div role="button" tabindex="0" class="btn btn-ghost btn-xs btn-square">
-                          <Icon name="heroicons:ellipsis-vertical" class="w-4 h-4" />
+                          <Icon name="ellipsis-vertical" class="w-4 h-4" />
                         </div>
                         <ul tabindex="0" class="dropdown-content z-1 menu p-2 bg-base-100 rounded-box w-52 border border-base-200">
                           <li>
diff --git a/src/pages/dashboard/team/invite.astro b/src/pages/dashboard/team/invite.astro
index 64b99ad..4523800 100644
--- a/src/pages/dashboard/team/invite.astro
+++ b/src/pages/dashboard/team/invite.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../components/Icon.astro';
 import { db } from '../../../db';
 import { members } from '../../../db/schema';
 import { eq } from 'drizzle-orm';
@@ -34,7 +34,7 @@ if (!isAdmin) return Astro.redirect('/dashboard/team');
     <form method="POST" action="/api/team/invite" class="card card-border bg-base-100">
       <div class="card-body p-4">
         <div class="alert alert-info mb-4">
-          <Icon name="heroicons:information-circle" class="w-4 h-4 shrink-0" />
+          <Icon name="information-circle" class="w-4 h-4 shrink-0" />
           <span class="text-sm">The user must already have an account. They'll be added to your organization.</span>
         </div>
 
diff --git a/src/pages/dashboard/team/settings.astro b/src/pages/dashboard/team/settings.astro
index 0e836ab..dd91f49 100644
--- a/src/pages/dashboard/team/settings.astro
+++ b/src/pages/dashboard/team/settings.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../../components/Icon.astro';
 import { db } from '../../../db';
 import { organizations, tags } from '../../../db/schema';
 import { eq } from 'drizzle-orm';
@@ -38,7 +38,7 @@ const successType = url.searchParams.get('success');
 <DashboardLayout title="Team Settings - Chronus">
   <div class="flex items-center gap-3 mb-6">
     <a href="/dashboard/team" class="btn btn-ghost btn-xs">
-      <Icon name="heroicons:arrow-left" class="w-4 h-4" />
+      <Icon name="arrow-left" class="w-4 h-4" />
     </a>
     <h1 class="text-2xl font-extrabold tracking-tight">Team Settings</h1>
   </div>
@@ -47,13 +47,13 @@ const successType = url.searchParams.get('success');
   <div class="card card-border bg-base-100 mb-6">
     <div class="card-body p-4">
       <h2 class="text-sm font-semibold flex items-center gap-2 mb-4">
-        <Icon name="heroicons:building-office-2" class="w-4 h-4" />
+        <Icon name="building-office-2" class="w-4 h-4" />
         Team Settings
       </h2>
 
       {successType === 'org-name' && (
         <div class="alert alert-success mb-4">
-          <Icon name="heroicons:check-circle" class="w-4 h-4" />
+          <Icon name="check-circle" class="w-4 h-4" />
           <span class="text-sm">Team information updated successfully!</span>
         </div>
       )}
@@ -79,7 +79,7 @@ const successType = url.searchParams.get('success');
                   />
                 ) : (
                   <Icon
-                    name="heroicons:photo"
+                    name="photo"
                     class="w-6 h-6 opacity-40 text-base-content"
                   />
                 )}
@@ -218,7 +218,7 @@ const successType = url.searchParams.get('success');
           </span>
 
           <button type="submit" class="btn btn-primary btn-sm w-full sm:w-auto">
-            <Icon name="heroicons:check" class="w-4 h-4" />
+            <Icon name="check" class="w-4 h-4" />
             Save Changes
           </button>
         </div>
@@ -231,11 +231,11 @@ const successType = url.searchParams.get('success');
     <div class="card-body p-4">
       <div class="flex justify-between items-center mb-4">
         <h2 class="text-sm font-semibold flex items-center gap-2">
-          <Icon name="heroicons:tag" class="w-4 h-4" />
+          <Icon name="tag" class="w-4 h-4" />
           Tags & Rates
         </h2>
         <button onclick="document.getElementById('new_tag_modal').showModal()" class="btn btn-primary btn-xs">
-          <Icon name="heroicons:plus" class="w-3 h-3" />
+          <Icon name="plus" class="w-3 h-3" />
           Add Tag
         </button>
       </div>
@@ -246,7 +246,7 @@ const successType = url.searchParams.get('success');
 
       {allTags.length === 0 ? (
         <div class="alert alert-info">
-          <Icon name="heroicons:information-circle" class="w-4 h-4" />
+          <Icon name="information-circle" class="w-4 h-4" />
           <div>
             <div class="font-semibold text-sm">No tags yet</div>
             <div class="text-xs">Create tags to add context and rates to your time entries.</div>
@@ -286,11 +286,11 @@ const successType = url.searchParams.get('success');
                         onclick={`document.getElementById('edit_tag_modal_${tag.id}').showModal()`}
                         class="btn btn-ghost btn-xs btn-square"
                       >
-                        <Icon name="heroicons:pencil" class="w-3 h-3" />
+                        <Icon name="pencil" class="w-3 h-3" />
                       </button>
                        <form method="POST" action={`/api/tags/${tag.id}/delete`} onsubmit="return confirm('Are you sure you want to delete this tag?');">
                         <button class="btn btn-ghost btn-xs btn-square text-error">
-                          <Icon name="heroicons:trash" class="w-3 h-3" />
+                          <Icon name="trash" class="w-3 h-3" />
                         </button>
                       </form>
                     </div>
diff --git a/src/pages/dashboard/tracker.astro b/src/pages/dashboard/tracker.astro
index 969cc34..297c054 100644
--- a/src/pages/dashboard/tracker.astro
+++ b/src/pages/dashboard/tracker.astro
@@ -1,6 +1,6 @@
 ---
 import DashboardLayout from '../../layouts/DashboardLayout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../../components/Icon.astro';
 import Timer from '../../components/Timer.vue';
 import ManualEntry from '../../components/ManualEntry.vue';
 import { db } from '../../db';
@@ -147,7 +147,7 @@ const paginationPages = getPaginationPages(page, totalPages);
     <div class="tab-content bg-base-100 border-base-300 p-6">
       {allClients.length === 0 ? (
         <div class="alert alert-warning flex flex-col sm:flex-row items-center gap-4">
-          <Icon name="heroicons:exclamation-triangle" class="stroke-current shrink-0 h-6 w-6" />
+          <Icon name="exclamation-triangle" class="stroke-current shrink-0 h-6 w-6" />
           <span class="flex-1 text-center sm:text-left">You need to create a client before tracking time.</span>
           <a href="/dashboard/clients/new" class="btn btn-sm btn-primary whitespace-nowrap">Add Client</a>
         </div>
@@ -170,7 +170,7 @@ const paginationPages = getPaginationPages(page, totalPages);
     <div class="tab-content bg-base-100 border-base-300 p-6">
       {allClients.length === 0 ? (
         <div class="alert alert-warning flex flex-col sm:flex-row items-center gap-4">
-          <Icon name="heroicons:exclamation-triangle" class="stroke-current shrink-0 h-6 w-6" />
+          <Icon name="exclamation-triangle" class="stroke-current shrink-0 h-6 w-6" />
           <span class="flex-1 text-center sm:text-left">You need to create a client before adding time entries.</span>
           <a href="/dashboard/clients/new" class="btn btn-sm btn-primary whitespace-nowrap">Add Client</a>
         </div>
@@ -247,7 +247,7 @@ const paginationPages = getPaginationPages(page, totalPages);
         <input type="hidden" name="page" value="1" />
         <div class="flex items-end md:col-span-2 lg:col-span-1">
           <button type="submit" class="btn btn-primary btn-sm w-full">
-            <Icon name="heroicons:magnifying-glass" class="w-4 h-4" />
+            <Icon name="magnifying-glass" class="w-4 h-4" />
             Search
           </button>
         </div>
@@ -259,12 +259,12 @@ const paginationPages = getPaginationPages(page, totalPages);
     <div class="card-body p-4">
       <div class="flex justify-between items-center mb-3">
         <h2 class="text-sm font-semibold flex items-center gap-2">
-          <Icon name="heroicons:list-bullet" class="w-4 h-4" />
+          <Icon name="list-bullet" class="w-4 h-4" />
           Time Entries ({totalCount?.count || 0} total)
         </h2>
         {(filterClient || filterStatus || filterType || searchTerm) && (
           <a href="/dashboard/tracker" class="btn btn-xs btn-ghost">
-            <Icon name="heroicons:x-mark" class="w-3 h-3" />
+            <Icon name="x-mark" class="w-3 h-3" />
             Clear Filters
           </a>
         )}
@@ -289,12 +289,12 @@ const paginationPages = getPaginationPages(page, totalPages);
                 <td>
                   {entry.isManual ? (
                     <span class="badge badge-info badge-xs gap-1" title="Manual Entry">
-                      <Icon name="heroicons:pencil" class="w-3 h-3" />
+                      <Icon name="pencil" class="w-3 h-3" />
                       Manual
                     </span>
                   ) : (
                     <span class="badge badge-success badge-xs gap-1" title="Timed Entry">
-                      <Icon name="heroicons:clock" class="w-3 h-3" />
+                      <Icon name="clock" class="w-3 h-3" />
                       Timed
                     </span>
                   )}
@@ -328,7 +328,7 @@ const paginationPages = getPaginationPages(page, totalPages);
                       class="btn btn-ghost btn-xs text-error"
                       onclick="return confirm('Are you sure you want to delete this entry?')"
                     >
-                      <Icon name="heroicons:trash" class="w-3.5 h-3.5" />
+                      <Icon name="trash" class="w-3.5 h-3.5" />
                     </button>
                   </form>
                 </td>
@@ -345,7 +345,7 @@ const paginationPages = getPaginationPages(page, totalPages);
             href={`?page=${Math.max(1, page - 1)}${filterClient ? `&client=${filterClient}` : ''}${filterStatus ? `&status=${filterStatus}` : ''}${filterType ? `&type=${filterType}` : ''}${sortBy ? `&sort=${sortBy}` : ''}${searchTerm ? `&search=${searchTerm}` : ''}`}
             class={`btn btn-xs ${page === 1 ? 'btn-disabled' : ''}`}
           >
-            <Icon name="heroicons:chevron-left" class="w-3 h-3" />
+            <Icon name="chevron-left" class="w-3 h-3" />
             Prev
           </a>
 
@@ -365,7 +365,7 @@ const paginationPages = getPaginationPages(page, totalPages);
             class={`btn btn-xs ${page === totalPages ? 'btn-disabled' : ''}`}
           >
             Next
-            <Icon name="heroicons:chevron-right" class="w-3 h-3" />
+            <Icon name="chevron-right" class="w-3 h-3" />
           </a>
         </div>
       )}
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 016788d..8e5ba2a 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,5 +1,6 @@
 ---
 import Layout from '../layouts/Layout.astro';
+import Icon from '../components/Icon.astro';
 
 if (Astro.locals.user) {
   return Astro.redirect('/dashboard');
@@ -22,9 +23,7 @@ if (Astro.locals.user) {
         <div class="flex gap-3 justify-center flex-wrap">
           <a href="/signup" class="btn btn-primary btn-lg px-8">
             Get Started
-            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-              <path fill-rule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clip-rule="evenodd" />
-            </svg>
+            <Icon name="arrow-right" class="h-5 w-5" />
           </a>
           <a href="/login" class="btn btn-ghost btn-lg px-8">Login</a>
         </div>
@@ -37,9 +36,7 @@ if (Astro.locals.user) {
         <div class="card bg-base-100 card-border">
           <div class="card-body">
             <div class="w-10 h-10 rounded-lg bg-primary/10 flex items-center justify-center mb-2">
-              <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-primary" viewBox="0 0 20 20" fill="currentColor">
-                <path fill-rule="evenodd" d="M11.3 1.046A1 1 0 0112 2v5h4a1 1 0 01.82 1.573l-7 10A1 1 0 018 18v-5H4a1 1 0 01-.82-1.573l7-10a1 1 0 011.12-.38z" clip-rule="evenodd" />
-              </svg>
+              <Icon name="bolt" class="h-5 w-5 text-primary" />
             </div>
             <h3 class="card-title text-base">Lightning Fast</h3>
             <p class="text-sm text-base-content/60">Track tasks with a single click. Start, stop, and organize in seconds.</p>
@@ -48,9 +45,7 @@ if (Astro.locals.user) {
         <div class="card bg-base-100 card-border">
           <div class="card-body">
             <div class="w-10 h-10 rounded-lg bg-secondary/10 flex items-center justify-center mb-2">
-              <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-secondary" viewBox="0 0 20 20" fill="currentColor">
-                <path d="M2 11a1 1 0 011-1h2a1 1 0 011 1v5a1 1 0 01-1 1H3a1 1 0 01-1-1v-5zM8 7a1 1 0 011-1h2a1 1 0 011 1v9a1 1 0 01-1 1H9a1 1 0 01-1-1V7zM14 4a1 1 0 011-1h2a1 1 0 011 1v12a1 1 0 01-1 1h-2a1 1 0 01-1-1V4z" />
-              </svg>
+              <Icon name="chart-bar" class="h-5 w-5 text-secondary" />
             </div>
             <h3 class="card-title text-base">Detailed Reports</h3>
             <p class="text-sm text-base-content/60">Get actionable insights with charts, filters, and CSV exports.</p>
@@ -59,9 +54,7 @@ if (Astro.locals.user) {
         <div class="card bg-base-100 card-border">
           <div class="card-body">
             <div class="w-10 h-10 rounded-lg bg-accent/10 flex items-center justify-center mb-2">
-              <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-accent" viewBox="0 0 20 20" fill="currentColor">
-                <path d="M13 6a3 3 0 11-6 0 3 3 0 016 0zM18 8a2 2 0 11-4 0 2 2 0 014 0zM14 15a4 4 0 00-8 0v3h8v-3zM6 8a2 2 0 11-4 0 2 2 0 014 0zM16 18v-3a5.972 5.972 0 00-.75-2.906A3.005 3.005 0 0119 15v3h-3zM4.75 12.094A5.973 5.973 0 004 15v3H1v-3a3 3 0 013.75-2.906z" />
-              </svg>
+              <Icon name="users" class="h-5 w-5 text-accent" />
             </div>
             <h3 class="card-title text-base">Team Collaboration</h3>
             <p class="text-sm text-base-content/60">Built for teams with roles, permissions, and shared workspaces.</p>
diff --git a/src/pages/login.astro b/src/pages/login.astro
index 6417698..c55a048 100644
--- a/src/pages/login.astro
+++ b/src/pages/login.astro
@@ -1,6 +1,6 @@
 ---
 import Layout from '../layouts/Layout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../components/Icon.astro';
 import PasskeyLogin from '../components/auth/PasskeyLogin.vue';
 
 if (Astro.locals.user) {
@@ -26,7 +26,7 @@ const errorMessage =
 
         {errorMessage && (
           <div role="alert" class="alert alert-error mb-4 text-sm">
-            <Icon name="heroicons:exclamation-circle" class="w-5 h-5" />
+            <Icon name="exclamation-circle" class="w-5 h-5" />
             <span>{errorMessage}</span>
           </div>
         )}
diff --git a/src/pages/signup.astro b/src/pages/signup.astro
index 0ec70b3..97c621a 100644
--- a/src/pages/signup.astro
+++ b/src/pages/signup.astro
@@ -1,6 +1,6 @@
 ---
 import Layout from '../layouts/Layout.astro';
-import { Icon } from 'astro-icon/components';
+import Icon from '../components/Icon.astro';
 import { db } from '../db';
 import { siteSettings, users } from '../db/schema';
 import { eq, count } from 'drizzle-orm';
@@ -42,7 +42,7 @@ const errorMessage =
 
         {errorMessage && (
           <div role="alert" class="alert alert-error mb-4 text-sm">
-            <Icon name="heroicons:exclamation-circle" class="w-5 h-5" />
+            <Icon name="exclamation-circle" class="w-5 h-5" />
             <span>{errorMessage}</span>
           </div>
         )}
@@ -50,7 +50,7 @@ const errorMessage =
         {registrationDisabled ? (
           <>
             <div class="alert alert-warning text-sm">
-              <Icon name="heroicons:exclamation-triangle" class="w-5 h-5" />
+              <Icon name="exclamation-triangle" class="w-5 h-5" />
               <span>Registration is currently disabled by the site administrator.</span>
             </div>
             <div class="divider text-xs"></div>