diff --git a/src/assets/ts/icons.ts b/src/assets/ts/icons.ts
index b2bfe86..d659309 100644
--- a/src/assets/ts/icons.ts
+++ b/src/assets/ts/icons.ts
@@ -1,5 +1,7 @@
 import {createIcons, icons} from "lucide";
 
+import {toLucideIconsPascalCase} from "../../common/StringUtils.js";
+
 let hasAlreadyReplacedIcons = false;
 
 export function replaceIcons(once: boolean): void {
@@ -9,3 +11,7 @@ export function replaceIcons(once: boolean): void {
         hasAlreadyReplacedIcons = true;
     }
 }
+
+export function isLucideIcon(iconName: string): boolean {
+    return Object.keys(icons).indexOf(toLucideIconsPascalCase(iconName)) >= 0;
+}
diff --git a/src/assets/views/utils/Icon.svelte b/src/assets/views/utils/Icon.svelte
index ff5da20..78f232e 100644
--- a/src/assets/views/utils/Icon.svelte
+++ b/src/assets/views/utils/Icon.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import {replaceIcons} from "../../ts/icons.js";
+    import {replaceIcons, isLucideIcon} from "../../ts/icons.js";
     import {afterUpdate, onMount} from "svelte";
 
     export let name: string;
@@ -39,9 +39,9 @@
 </style>
 
 {#if name}
-    {#if name.startsWith('fa') }
-        <i class="{name} icon" aria-hidden="true" {...$$restProps}></i>
-    {:else}
+    {#if isLucideIcon(name) >= 0 }
         <i icon-name="{name}" class="icon" aria-hidden="true" {...$$restProps}></i>
+    {:else}
+        <i class="{name} icon" aria-hidden="true" {...$$restProps}></i>
     {/if}
 {/if}
diff --git a/src/common/StringUtils.ts b/src/common/StringUtils.ts
new file mode 100644
index 0000000..e797a49
--- /dev/null
+++ b/src/common/StringUtils.ts
@@ -0,0 +1,2 @@
+export const toLucideIconsPascalCase = (string: string): string =>
+    string.replace(/(\w)(\w*)(_|-|\s*)/g, (g0, g1, g2) => g1.toUpperCase() + g2.toLowerCase());