diff --git a/scripts/migrate_fa_to_lucide.py b/scripts/migrate_fa_to_lucide.py
index 9515adc8..25faf7dd 100644
--- a/scripts/migrate_fa_to_lucide.py
+++ b/scripts/migrate_fa_to_lucide.py
@@ -84,6 +84,29 @@ FA_TO_LUCIDE = {
     'fa-calendar-day':       'CalendarDays',
     'fa-bell-slash':         'BellOff',
     'fa-bell':               'Bell',
+    # ── Additional mappings ──────────────────────────────────────────────────
+    'fa-arrow-left':         'ArrowLeft',
+    'fa-arrow-right':        'ArrowRight',
+    'fa-arrow-up':           'ArrowUp',
+    'fa-arrow-down':         'ArrowDown',
+    'fa-ban':                'Ban',
+    'fa-broom':              'Trash2',       # closest semantic match
+    'fa-calendar-alt':       'CalendarDays',
+    'fa-database':           'Database',
+    'fa-door-open':          'DoorOpen',
+    'fa-download':           'Download',
+    'fa-exchange-alt':       'ArrowLeftRight',
+    'fa-file-image':         'FileImage',
+    'fa-lock':               'Lock',
+    'fa-magic':              'Sparkles',
+    'fa-print':              'Printer',
+    'fa-sticky-note':        'StickyNote',
+    'fa-sync':               'RefreshCw',
+    'fa-tag':                'Tag',
+    'fa-trash':              'Trash2',
+    'fa-user-ninja':         'UserRound',
+    'fa-user-tie':           'UserRound',
+    'fa-video':              'Video',
 }
 
 # Skip modifiers — not real icon names
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index a8055f6e..87829f40 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -72,7 +72,7 @@
                 onclick={() => {
                     window.location.reload();
                 }}
-                class="btn btn-sm m-1 preset-tonal-surface hover:variant-outline-warning text-error-300 hover:text-error-800 transition-all"
+                class="btn btn-sm m-1 preset-tonal-surface hover:preset-outlined-warning text-error-300 hover:text-error-800 transition-all"
                 title="Reload page to clear some caches and check for updates"
             >
                 <!-- <span class="fas fa-sync mx-1"></span> -->
@@ -105,7 +105,7 @@
                     );
                     window.location.reload();
                 }}
-                class="btn btn-sm m-1 p-1 preset-tonal-surface hover:variant-outline-warning text-error-300 hover:text-error-800 transition-all"
+                class="btn btn-sm m-1 p-1 preset-tonal-surface hover:preset-outlined-warning text-error-300 hover:text-error-800 transition-all"
                 title="Clear IDB, localStorage, and sessionStorage and then reload to clear the page cache"
             >
                 <!-- <span class="fas fa-sync mx-1"></span> -->
diff --git a/src/routes/events/[event_id]/(badges)/badges/print_list/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/print_list/+page.svelte
index 2c43f024..f762f885 100644
--- a/src/routes/events/[event_id]/(badges)/badges/print_list/+page.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/print_list/+page.svelte
@@ -5,6 +5,7 @@
     import { events_slct } from '$lib/stores/ae_events_stores';
     import Comp_badge_obj_view from '../[badge_id]/ae_comp__badge_obj_view_v2.svelte';
     import type { ae_EventBadge } from '$lib/types/ae_types';
+    import { ArrowLeft, Printer } from 'lucide-svelte';
 
     interface Props {
         data: any; // PageData from SvelteKit
@@ -79,10 +80,10 @@
 
     <div class="print-button my-4">
         <button type="button" class="btn btn-primary" onclick={trigger_print}>
-            <span class="fas fa-print mr-2"></span> Print Badges
+            <Printer size="1em" class="mr-2" /> Print Badges
         </button>
         <a href={`/events/${event_id}/badges`} class="btn btn-tertiary ml-2">
-            <span class="fas fa-arrow-left mr-2"></span> Back to Search
+            <ArrowLeft size="1em" class="mr-2" /> Back to Search
         </a>
     </div>
 
diff --git a/src/routes/events/[event_id]/(badges)/templates/+page.svelte b/src/routes/events/[event_id]/(badges)/templates/+page.svelte
index b59fd919..0a17f308 100644
--- a/src/routes/events/[event_id]/(badges)/templates/+page.svelte
+++ b/src/routes/events/[event_id]/(badges)/templates/+page.svelte
@@ -6,6 +6,7 @@
     import { events_slct } from '$lib/stores/ae_events_stores';
     import { Modal } from 'flowbite-svelte';
     import Comp_badge_template_form from './ae_comp__badge_template_form.svelte';
+    import { Plus } from 'lucide-svelte';
 
     interface Props {
         data: any; // PageData from SvelteKit
@@ -88,7 +89,7 @@
             class="btn btn-primary"
             onclick={() => (show_create_template_modal = true)}
         >
-            <span class="fas fa-plus mr-2"></span> Add New Template
+            <Plus size="1em" class="mr-2" /> Add New Template
         </button>
     </div>
 
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
index c498d741..bf8c443e 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
@@ -13,19 +13,7 @@
     import Comp_exhibit_license_list from './ae_comp__exhibit_license_list.svelte';
     import Comp_exhibit_custom_questions from './ae_comp__exhibit_custom_questions.svelte';
     import Comp_exhibit_payment from './ae_comp__exhibit_payment.svelte';
-    import {
-        Store,
-        Settings,
-        Lock,
-        Info,
-        MessageSquare,
-        CreditCard,
-        Key,
-        Users,
-        ChevronRight,
-        ChevronDown,
-        LogOut
-    } from 'lucide-svelte';
+    import { ChevronDown, ChevronRight, Clock, CreditCard, Database, Info, Key, Lock, LogOut, MessageSquare, RefreshCw, Settings, Store, UserX, Users } from 'lucide-svelte';
 
     const exhibit_id = $derived(page.params.exhibit_id ?? '');
 
@@ -365,7 +353,7 @@
                 <div class="flex items-center justify-between">
                     <div class="text-[10px] uppercase font-black opacity-40 tracking-widest">Data Synchronization</div>
                     <div class="flex items-center gap-2 text-[10px] font-mono opacity-60">
-                        <span class="fas fa-clock"></span>
+                        <Clock size="1em" />
                         {#if $events_sess.leads.last_refresh_time}
                             Last: {new Date($events_sess.leads.last_refresh_time).toLocaleTimeString()}
                         {:else}
@@ -397,14 +385,14 @@
                 <div class="text-[10px] uppercase font-black opacity-40 tracking-widest">Maintenance & Reset</div>
                 <div class="grid grid-cols-2 gap-2">
                     <button class="btn btn-sm preset-filled-warning" onclick={() => window.location.reload()}>
-                        <span class="fas fa-sync mr-2"></span> Reload App
+                        <RefreshCw size="1em" class="mr-2" /> Reload App
                     </button>
                     <button class="btn btn-sm preset-outlined-error" onclick={() => {
                         if(confirm('Clear all local cached data (IDB)?')) {
                             db_events.delete().then(() => window.location.reload());
                         }
                     }}>
-                        <span class="fas fa-database mr-2"></span> Clear IDB
+                        <Database size="1em" class="mr-2" /> Clear IDB
                     </button>
                     <button class="btn btn-sm preset-outlined-error col-span-2" onclick={() => {
                         if(confirm('Reset all local app settings and sign out?')) {
@@ -412,7 +400,7 @@
                             window.location.reload();
                         }
                     }}>
-                        <span class="fas fa-user-slash mr-2"></span> Clear Local Settings (Hard Reset)
+                        <UserX size="1em" class="mr-2" /> Clear Local Settings (Hard Reset)
                     </button>
                 </div>
             </div>
diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte
index d2884699..1641cf27 100644
--- a/src/routes/events/[event_id]/+page.svelte
+++ b/src/routes/events/[event_id]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { liveQuery } from 'dexie';
-    import { Wrench } from '@lucide/svelte';
+    import { Wrench, Presentation, Plane, IdCard, Contact } from '@lucide/svelte';
     import { db_events } from '$lib/ae_events/db_events';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { events_slct } from '$lib/stores/ae_events_stores';
@@ -21,7 +21,7 @@
         {
             name: 'Presentation Management',
             path: 'pres_mgmt',
-            icon: 'fas fa-chalkboard-teacher',
+            icon: Presentation,
             description: 'Manage sessions, presentations, and presenters.',
             color: 'preset-filled-primary-200-800',
             access: 'authenticated_access'
@@ -29,7 +29,7 @@
         {
             name: 'Launcher',
             path: 'launcher',
-            icon: 'fas fa-plane',
+            icon: Plane,
             description: 'Launch presentations and manage live session display.',
             color: 'preset-filled-secondary-200-800',
             access: 'authenticated_access'
@@ -37,7 +37,7 @@
         {
             name: 'Badges',
             path: 'badges',
-            icon: 'fas fa-id-badge',
+            icon: IdCard,
             description: 'Manage and print event badges.',
             color: 'preset-filled-tertiary-200-800',
             access: 'authenticated_access'
@@ -45,7 +45,7 @@
         {
             name: 'Leads',
             path: 'leads',
-            icon: 'fas fa-address-card',
+            icon: Contact,
             description: 'Exhibitor lead retrieval and management.',
             color: 'preset-filled-success-200-800',
             access: 'authenticated_access'
@@ -85,7 +85,7 @@
                 class="card card-hover p-6 flex flex-col items-center text-center space-y-4 transition-transform hover:scale-105 bg-surface-100 dark:bg-surface-800 border border-surface-200 dark:border-surface-700 shadow-lg"
             >
                 <div class="p-6 rounded-full {mod.color} text-white text-4xl">
-                    <span class={mod.icon}></span>
+                    <mod.icon size="2rem" />
                 </div>
                 <h3 class="text-2xl font-bold">{mod.name}</h3>
                 <p class="opacity-80">{mod.description}</p>
diff --git a/src/routes/events/ae_comp__event_file_obj_tbl.svelte b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
index 6846fbf0..8b7cbf07 100644
--- a/src/routes/events/ae_comp__event_file_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
@@ -51,6 +51,7 @@
     // import { events_func } from '$lib/ae_events_functions';
     import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
     import AE_Comp_Hosted_Files_Download_Button from '$lib/ae_core/ae_comp__hosted_files_download_button.svelte';
+    import { Check, Download, FileImage, FileSpreadsheet, ListOrdered, LoaderCircle, Presentation, ToggleLeft, ToggleRight, TriangleAlert, User } from 'lucide-svelte';
 
     // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
 
@@ -309,7 +310,7 @@
                             title="Count {$lq__event_file_obj_li.length ??
                                 'None'}"
                         >
-                            <span class="fas fa-list-ol mx-4"></span>
+                            <ListOrdered size="1em" class="mx-4" />
                             {$lq__event_file_obj_li.length ?? 'None'}&times;
                         </span>
                     {/if}
@@ -337,7 +338,7 @@
                             console.log('CSV Data:', csv_data);
                         }}
                     >
-                        <span class="fas fa-file-csv mx-1"></span>
+                        <FileSpreadsheet size="1em" class="mx-1" />
                         Export Files CSV
                     </button>
                     <span id="download_csv_container"></span>
@@ -353,7 +354,7 @@
                                 : 'ae_btn_surface_outlined'}"
                             title="Show or hide the session-related column fields."
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             Showing Session Fields
                         </button>
                     {:else}
@@ -367,7 +368,7 @@
                                 : 'ae_btn_surface_outlined'}"
                             title="Show or hide the session-related column fields."
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             Show Session Fields
                         </button>
                     {/if}
@@ -382,7 +383,7 @@
                             class="btn btn-sm ae_btn_surface"
                             title="Hide the session code column from view. Currently showing the Session Code column."
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             Showing Session Code
                         </button>
                     {:else}
@@ -394,7 +395,7 @@
                             class="btn btn-sm ae_btn_surface_outlined"
                             title="Show the session code column. Currently hiding the Session Code column from view."
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             Show Session Code
                         </button>
                     {/if}
@@ -411,7 +412,7 @@
                                 : 'ae_btn_surface_outlined'}"
                             title="Show or hide the extra presentation-related column fields."
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             Showing Presentation Fields
                         </button>
                     {:else}
@@ -426,7 +427,7 @@
                                 : 'ae_btn_surface_outlined'}"
                             title="Show or hide the extra presentation-related column fields."
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             Show Presentation Fields
                         </button>
                     {/if}
@@ -494,17 +495,17 @@
                                                 title="Convert this PDF to a high-res webp image for use in the Launcher poster display."
                                                 onclick={() => handle_convert_pdf_to_image(event_file_obj)}
                                             >
-                                                <span class="fas fa-file-image mx-1"></span>
+                                                <FileImage size="1em" class="mx-1" />
                                                 Convert PDF → Image
                                             </button>
                                         {:else if convert_status_kv[event_file_obj.event_file_id] === 'converting'}
                                             <span class="btn btn-sm preset-tonal-surface opacity-60 cursor-wait">
-                                                <span class="fas fa-spinner fa-spin mx-1"></span>
+                                                <LoaderCircle size="1em" class="mx-1 animate-spin" />
                                                 Converting…
                                             </span>
                                         {:else if convert_status_kv[event_file_obj.event_file_id] === 'done'}
                                             <span class="btn btn-sm preset-tonal-success" title="Conversion complete. New webp hosted_file created: {convert_result_kv[event_file_obj.event_file_id]?.filename ?? ''}">
-                                                <span class="fas fa-check mx-1"></span>
+                                                <Check size="1em" class="mx-1" />
                                                 Done — {convert_result_kv[event_file_obj.event_file_id]?.filename ?? 'image created'}
                                             </span>
                                         {:else if convert_status_kv[event_file_obj.event_file_id] === 'error'}
@@ -516,7 +517,7 @@
                                                     convert_status_kv[event_file_obj.event_file_id] = 'idle';
                                                 }}
                                             >
-                                                <span class="fas fa-exclamation-triangle mx-1"></span>
+                                                <TriangleAlert size="1em" class="mx-1" />
                                                 Failed — Retry?
                                             </button>
                                         {/if}
@@ -541,8 +542,7 @@
                                         class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs underline"
                                         title={`Download this file:\n${ae_util.clean_filename(event_file_obj?.filename)}\n[API] SHA256: ${event_file_obj?.hash_sha256?.slice(0, 10) ?? 'N/A'}\nHosted ID: ${event_file_obj?.hosted_file_id} Event File ID: ${event_file_obj?.event_file_id}`}
                                     >
-                                        <span class="fas fa-download mx-1"
-                                        ></span>
+                                        <Download size="1em" class="mx-1" />
                                         <span class="hidden"> Download </span>
                                     </a>
 
@@ -580,8 +580,7 @@
                                         class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs underline"
                                         title={`Download renamed with session name to: ${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_session_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}`}
                                     >
-                                        <span class="fas fa-download mx-1"
-                                        ></span>
+                                        <Download size="1em" class="mx-1" />
                                         <span class="hidden"> Renamed </span>
                                     </a>
 
@@ -616,8 +615,7 @@
                                         class="btn btn-sm p-1 preset-tonal-secondary *:hover:inline lg:text-xs underline"
                                         title={`Download renamed with presentation name to: ${event_file_obj?.event_session_code}-${ae_util.clean_filename(event_file_obj?.event_presentation_name).substring(0, 20)}-${ae_util.clean_filename(event_file_obj?.event_presenter_full_name)}.${event_file_obj?.extension}`}
                                     >
-                                        <span class="fas fa-download mx-1"
-                                        ></span>
+                                        <Download size="1em" class="mx-1" />
                                         <span class="hidden"> Renamed </span>
                                     </a>
 
@@ -700,8 +698,7 @@
                                         '-- not set --'}
                                 </td>
                                 <td class="px-4 py-2 lg:text-xs">
-                                    <span class="fas fa-chalkboard-teacher"
-                                    ></span>
+                                    <Presentation size="1em" />
                                     <a
                                         href="/events/{event_file_obj?.event_id}/session/{event_file_obj?.event_session_id}"
                                         class="text-blue-500 underline hover:text-blue-800"
@@ -737,7 +734,7 @@
                             {/if}
                             <td class="px-4 py-2">
                                 {#if event_file_obj?.event_presenter_id}
-                                    <span class="fas fa-user"></span>
+                                    <User size="1em" />
                                     <a
                                         href="/events/{event_file_obj?.event_id}/presenter/{event_file_obj?.event_presenter_id}"
                                         class="text-blue-500 underline hover:text-blue-800"
diff --git a/src/routes/events/ae_comp__event_presentation_obj_li.svelte b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
index 904d2e35..d8ddaa39 100644
--- a/src/routes/events/ae_comp__event_presentation_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
@@ -42,6 +42,7 @@
     import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
     import Comp_event_presenter_obj_li from '../events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte';
     import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_all.svelte';
+    import { Barcode, CalendarDays, Eye, EyeOff, ListOrdered, Plus } from 'lucide-svelte';
 
     // export let link_to_type: string;
 
@@ -84,7 +85,7 @@
                 }}
                 class="btn btn-sm preset-tonal-warning hover:preset-filled-warning-500"
             >
-                <span class="fas fa-plus mx-1"></span>
+                <Plus size="1em" class="mx-1" />
                 Add Presentation
             </button>
         {/if}
@@ -102,7 +103,7 @@
                     title="Count {lq__event_presentation_obj_li.length ??
                         'None'}"
                 >
-                    <span class="fas fa-list-ol mx-4"></span>
+                    <ListOrdered size="1em" class="mx-4" />
                     {lq__event_presentation_obj_li.length ?? 'None'}&times;
                 </span>
             {/if}
@@ -154,7 +155,7 @@
                             }}
                             class="btn btn-sm preset-tonal-warning hover:preset-filled-warning-500"
                         >
-                            <span class="fas fa-plus mx-1"></span>
+                            <Plus size="1em" class="mx-1" />
                             Add Presenter
                         </button>
                     {/if}
@@ -209,7 +210,7 @@
                                 class="text-xs preset-tonal-warning px-2 py-0.5 rounded-md leading-none"
                                 title="Presentation code {event_presentation_obj?.code} and abstract code {event_presentation_obj?.abstract_code}"
                             >
-                                <span class="fas fa-barcode"></span>
+                                <Barcode size="1em" />
                                 {event_presentation_obj?.code ?? ''}
                                 {event_presentation_obj?.abstract_code ??
                                     ''}
@@ -218,7 +219,7 @@
                             <span
                                 class="text-sm text-semibold text-success-800-400"
                             >
-                                <span class="fas fa-barcode"></span>
+                                <Barcode size="1em" />
                                 Code:
                                 <span
                                     class=""
@@ -266,8 +267,7 @@
                         </button>
                         :</span
                     >
-                    <span class="fas fa-calendar-alt text-success-800-400"
-                    ></span>
+                    <CalendarDays size="1em" class="text-success-800-400" />
                     <Element_ae_obj_field_editor_v3
                         object_type={'event_presentation'}
                         object_id={event_presentation_obj?.event_presentation_id}
@@ -351,11 +351,10 @@
                                 class="btn btn-sm preset-tonal-surface hover:preset-filled-surface-500 text-xs"
                             >
                                 {#if $events_sess.pres_mgmt.show_content__presentation_description == event_presentation_obj.event_presentation_id}
-                                    <span class="fas fa-eye-slash mx-1"
-                                    ></span>
+                                    <EyeOff size="1em" class="mx-1" />
                                     <span>Hide Description</span>
                                 {:else}
-                                    <span class="fas fa-eye mx-1"></span>
+                                    <Eye size="1em" class="mx-1" />
                                     <span>Show</span>
                                 {/if}
                             </button>
diff --git a/src/routes/events/ae_comp__event_session_obj_tbl.svelte b/src/routes/events/ae_comp__event_session_obj_tbl.svelte
index 8a48f714..238e6dc1 100644
--- a/src/routes/events/ae_comp__event_session_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_tbl.svelte
@@ -21,6 +21,7 @@
 
     // import { liveQuery } from "dexie";
     import { ae_util } from '$lib/ae_utils/ae_utils';
+    import { ListOrdered } from 'lucide-svelte';
     // Imports - events specific
     // import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores';
     // import { db_events } from "$lib/db_events";
@@ -78,7 +79,7 @@
                         title="Count {$lq__event_session_obj_li.length ??
                             'None'}"
                     >
-                        <span class="fas fa-list-ol mx-4"></span>
+                        <ListOrdered size="1em" class="mx-4" />
                         {$lq__event_session_obj_li.length ?? 'None'}&times;
                     </span>
                 {/if}
diff --git a/src/routes/events/ae_comp__events_menu_opts.svelte b/src/routes/events/ae_comp__events_menu_opts.svelte
index c38aec53..3fac2d95 100644
--- a/src/routes/events/ae_comp__events_menu_opts.svelte
+++ b/src/routes/events/ae_comp__events_menu_opts.svelte
@@ -21,6 +21,7 @@
         events_trigger,
         events_trig_kv
     } from '$lib/stores/ae_events_stores';
+    import { Ban, Barcode, CheckCircle, ChevronDown, ChevronUp, Eye, EyeOff, List, MapPin, Pencil, Plane, QrCode, Save, Send, Sparkles, StickyNote, ToggleLeft, ToggleRight, UserRound, Wand2 } from 'lucide-svelte';
 </script>
 
 <!-- New standard events module menu 2025-06-20 -->
@@ -38,15 +39,15 @@
             class="btn btn-sm preset-tonal-info border border-info-500"
         >
             {#if $events_loc.pres_mgmt.hide__menu_opts}
-                <span class="fas fa-chevron-up m-1"></span>
+                <ChevronUp size="1em" class="m-1" />
             {:else}
-                <span class="fas fa-chevron-down m-1"></span>
+                <ChevronDown size="1em" class="m-1" />
             {/if}
             Æ Pres Mgmt Menu Options
             {#if $events_loc.pres_mgmt.hide__menu_opts}
-                <span class="fas fa-chevron-up m-1"></span>
+                <ChevronUp size="1em" class="m-1" />
             {:else}
-                <span class="fas fa-chevron-down m-1"></span>
+                <ChevronDown size="1em" class="m-1" />
             {/if}
         </button>
     </h2>
@@ -196,12 +197,12 @@
                         ></span>
                         {#if $events_loc.pres_mgmt.qry_hidden == 'all'}
                             <span class="grow">
-                                <span class="fas fa-eye-slash m-1"></span>
+                                <EyeOff size="1em" class="m-1" />
                                 Hide Hidden Sessions
                             </span>
                         {:else}
                             <span class="grow">
-                                <span class="fas fa-eye m-1"></span>
+                                <Eye size="1em" class="m-1" />
                                 Show Hidden Sessions?
                             </span>
                         {/if}
@@ -233,13 +234,12 @@
                             ></span>
                             {#if $events_loc.pres_mgmt.qry_enabled == 'all'}
                                 <span class="grow">
-                                    <span class="fas fa-ban m-1"></span>
+                                    <Ban size="1em" class="m-1" />
                                     Hide Disabled Sessions
                                 </span>
                             {:else}
                                 <span class="grow">
-                                    <span class="fas fa-check-circle m-1"
-                                    ></span>
+                                    <CheckCircle size="1em" class="m-1" />
                                     Show Disabled Sessions?
                                 </span>
                             {/if}
@@ -263,15 +263,15 @@
                 title="Save the search text for this session search?"
             >
                 {#if $events_loc.pres_mgmt.save_search_text}
-                    <span class="fas fa-toggle-on m-1"></span>
+                    <ToggleRight size="1em" class="m-1" />
                     <span class="grow">
-                        <span class="fas fa-save m-1"></span>
+                        <Save size="1em" class="m-1" />
                         Do Not Save Search?
                     </span>
                 {:else}
-                    <span class="fas fa-toggle-off m-1"></span>
+                    <ToggleLeft size="1em" class="m-1" />
                     <span class="grow">
-                        <span class="fas fa-save m-1"></span>
+                        <Save size="1em" class="m-1" />
                         Save Search Text?
                     </span>
                 {/if}
@@ -286,9 +286,9 @@
                         }}
                         class="btn btn-sm ae_btn_surface justify-between w-full text-center"
                     >
-                        <span class="fas fa-toggle-on m-1"></span>
+                        <ToggleRight size="1em" class="m-1" />
                         <span class="grow">
-                            <span class="fas fa-sticky-note m-1"></span>
+                            <StickyNote size="1em" class="m-1" />
                             Hide Session Message
                         </span>
                     </button>
@@ -300,9 +300,9 @@
                         }}
                         class="btn btn-sm ae_btn_surface_outlined justify-between w-full text-center"
                     >
-                        <span class="fas fa-toggle-off m-1"></span>
+                        <ToggleLeft size="1em" class="m-1" />
                         <span class="grow">
-                            <span class="fas fa-sticky-note m-1"></span>
+                            <StickyNote size="1em" class="m-1" />
                             Show Session Message?
                         </span>
                     </button>
@@ -319,9 +319,9 @@
                         }}
                         class="btn btn-sm ae_btn_surface justify-between w-full text-center"
                     >
-                        <span class="fas fa-toggle-on m-1"></span>
+                        <ToggleRight size="1em" class="m-1" />
                         <span class="grow">
-                            <span class="fas fa-barcode m-1"></span>
+                            <Barcode size="1em" class="m-1" />
                             Hide Session Code
                         </span>
                     </button>
@@ -333,9 +333,9 @@
                         }}
                         class="btn btn-sm ae_btn_surface_outlined justify-between w-full text-center"
                     >
-                        <span class="fas fa-toggle-off m-1"></span>
+                        <ToggleLeft size="1em" class="m-1" />
                         <span class="grow">
-                            <span class="fas fa-barcode m-1"></span>
+                            <Barcode size="1em" class="m-1" />
                             Show Session Code?
                         </span>
                     </button>
@@ -354,7 +354,7 @@
                             }}
                             class="btn btn-sm w-full ae_btn_surface"
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             Showing Copy Access Link
                         </button>
                     {:else}
@@ -365,7 +365,7 @@
                             }}
                             class="btn btn-sm w-full ae_btn_surface_outlined"
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             Show Copy Access Link?
                         </button>
                     {/if}
@@ -378,7 +378,7 @@
                             }}
                             class="btn btn-sm w-full ae_btn_surface"
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             Showing Email Access Link
                         </button>
                     {:else}
@@ -389,7 +389,7 @@
                             }}
                             class="btn btn-sm w-full ae_btn_surface_outlined"
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             Show Email Access Link?
                         </button>
                     {/if}
@@ -407,9 +407,9 @@
                             class="btn btn-sm ae_btn_surface justify-between w-full text-center"
                             title="Showing Session QR Code"
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             <span class="grow">
-                                <span class="fas fa-qrcode m-1"></span>
+                                <QrCode size="1em" class="m-1" />
                                 Hide Session QR
                             </span>
                         </button>
@@ -422,9 +422,9 @@
                             class="btn btn-sm ae_btn_surface_outlined justify-between w-full text-center"
                             title="Show Session QR Code"
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             <span class="grow">
-                                <span class="fas fa-qrcode m-1"></span>
+                                <QrCode size="1em" class="m-1" />
                                 Show Session QR Code?
                             </span>
                         </button>
@@ -439,9 +439,9 @@
                             class="btn btn-sm ae_btn_surface justify-between w-full text-center"
                             title="Showing Presenter QR Code"
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             <span class="grow">
-                                <span class="fas fa-qrcode m-1"></span>
+                                <QrCode size="1em" class="m-1" />
                                 Hide Presenter QR
                             </span>
                         </button>
@@ -454,9 +454,9 @@
                             class="btn btn-sm ae_btn_surface_outlined justify-between w-full text-center"
                             title="Show Presenter QR Code"
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             <span class="grow">
-                                <span class="fas fa-qrcode m-1"></span>
+                                <QrCode size="1em" class="m-1" />
                                 Show Presenter QR Code?
                             </span>
                         </button>
@@ -482,7 +482,7 @@
                             : 'fa-toggle-on'} m-1"
                     ></span>
                     <span class="grow">
-                        <span class="fas fa-plane m-1"></span>
+                        <Plane size="1em" class="m-1" />
                         {$events_loc.pres_mgmt.hide__launcher_link
                             ? 'Show Launcher Links'
                             : 'Hide Launcher Links?'}
@@ -505,7 +505,7 @@
                             : 'fa-toggle-on'} m-1"
                     ></span>
                     <span class="grow">
-                        <span class="fas fa-paper-plane m-1"></span>
+                        <Send size="1em" class="m-1" />
                         {$events_loc.pres_mgmt.hide__launcher_link_legacy
                             ? 'Show Legacy Launcher Links'
                             : 'Hide Legacy Launcher Links?'}
@@ -527,7 +527,7 @@
                             : 'fa-toggle-on'} m-1"
                     ></span>
                     <span class="grow">
-                        <span class="fas fa-map-marker-alt m-1"></span>
+                        <MapPin size="1em" class="m-1" />
                         {$events_loc.pres_mgmt.hide__location_link
                             ? 'Show Location Links'
                             : 'Hide Location Links?'}
@@ -596,9 +596,9 @@
                             }}
                             class="btn btn-sm ae_btn_surface justify-between w-full text-center"
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             <span class="grow">
-                                <span class="fas fa-list m-1"></span>
+                                <List size="1em" class="m-1" />
                                 Hide Linked Files (testing)
                             </span>
                         </button>
@@ -611,9 +611,9 @@
                             }}
                             class="btn btn-sm ae_btn_surface_outlined justify-between w-full text-center"
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             <span class="grow">
-                                <span class="fas fa-list m-1"></span>
+                                <List size="1em" class="m-1" />
                                 Show Linked Files? (testing)
                             </span>
                         </button>
@@ -628,9 +628,9 @@
                             }}
                             class="btn btn-sm ae_btn_surface justify-between w-full text-center"
                         >
-                            <span class="fas fa-toggle-on m-1"></span>
+                            <ToggleRight size="1em" class="m-1" />
                             <span class="grow">
-                                <span class="fas fa-list m-1"></span>
+                                <List size="1em" class="m-1" />
                                 Hide Linked Presentations (testing)
                             </span>
                         </button>
@@ -643,9 +643,9 @@
                             }}
                             class="btn btn-sm ae_btn_surface_outlined justify-between w-full text-center"
                         >
-                            <span class="fas fa-toggle-off m-1"></span>
+                            <ToggleLeft size="1em" class="m-1" />
                             <span class="grow">
-                                <span class="fas fa-list m-1"></span>
+                                <List size="1em" class="m-1" />
                                 Show Linked Presentations? (testing)
                             </span>
                         </button>
@@ -667,9 +667,9 @@
                         class="btn btn-sm ae_btn_warning justify-between w-full text-center"
                         title="Turn off edit mode"
                     >
-                        <span class="fas fa-toggle-on m-1"></span>
+                        <ToggleRight size="1em" class="m-1" />
                         <span class="grow">
-                            <span class="fas fa-edit m-1"></span>
+                            <Pencil size="1em" class="m-1" />
                             Edit Mode Off
                         </span>
                     </button>
@@ -682,9 +682,9 @@
                         class="btn btn-sm ae_btn_warning_outlined justify-between w-full text-center"
                         title="Turn on edit mode"
                     >
-                        <span class="fas fa-toggle-off m-1"></span>
+                        <ToggleLeft size="1em" class="m-1" />
                         <span class="grow">
-                            <span class="fas fa-user-ninja m-1"></span>
+                            <UserRound size="1em" class="m-1" />
                             Edit Mode?
                         </span>
                     </button>
@@ -699,9 +699,9 @@
                         class="btn btn-sm ae_btn_warning justify-between w-full text-center"
                         title="Turn off advanced mode"
                     >
-                        <span class="fas fa-toggle-on m-1"></span>
+                        <ToggleRight size="1em" class="m-1" />
                         <span class="grow">
-                            <span class="fas fa-magic m-1"></span>
+                            <Sparkles size="1em" class="m-1" />
                             Advanced Mode Off
                         </span>
                     </button>
@@ -714,9 +714,9 @@
                         class="btn btn-sm ae_btn_warning_outlined justify-between w-full text-center"
                         title="Turn on advanced mode"
                     >
-                        <span class="fas fa-toggle-off m-1"></span>
+                        <ToggleLeft size="1em" class="m-1" />
                         <span class="grow">
-                            <span class="fas fa-hat-wizard m-1"></span>
+                            <Wand2 size="1em" class="m-1" />
                             Advanced Mode?
                         </span>
                     </button>
diff --git a/src/routes/hosted_files/+page.svelte b/src/routes/hosted_files/+page.svelte
index 30e07720..a8bcfe3a 100644
--- a/src/routes/hosted_files/+page.svelte
+++ b/src/routes/hosted_files/+page.svelte
@@ -9,6 +9,7 @@
     import type { key_val } from '$lib/stores/ae_stores';
 
     import Element_manage_hosted_file_li_wrap from '$lib/elements/element_manage_hosted_file_li_all.svelte';
+    import { Video } from 'lucide-svelte';
 
     let { data } = $props();
 
@@ -110,7 +111,7 @@
 <p>Clip, scale, re-encode videos files (mp4).</p>
 
 <a href="hosted_files/video_util" class="btn preset-filled-primary-500">
-    <span class="fas fa-video mx-1"></span>
+    <Video size="1em" class="mx-1" />
     Video Utilities
 </a>
 
diff --git a/src/routes/hosted_files/video_util/+page.svelte b/src/routes/hosted_files/video_util/+page.svelte
index f47e69af..e3141dd3 100644
--- a/src/routes/hosted_files/video_util/+page.svelte
+++ b/src/routes/hosted_files/video_util/+page.svelte
@@ -15,6 +15,7 @@
     import Comp_hosted_files_clip_video_li from '$lib/ae_core/ae_comp__hosted_files_clip_video_li.svelte';
 
     import Element_manage_hosted_file_li_wrap from '$lib/elements/element_manage_hosted_file_li_all.svelte';
+    import { ArrowLeftRight, Trash2, Upload } from 'lucide-svelte';
 
     let { data } = $props();
 
@@ -161,7 +162,7 @@
             }
         }}
     >
-        <span class="fas fa-exchange-alt m-1"></span>
+        <ArrowLeftRight size="1em" class="m-1" />
         Upload/Select
     </button>
 </h2>
@@ -180,7 +181,7 @@
         {#snippet label()}
             <span>
                 <div class="flex items-center gap-2 mb-1">
-                    <span class="fas fa-upload text-primary-500"></span>
+                    <Upload size="1em" class="text-primary-500" />
                     <strong class="preset-tonal-success px-3 py-1 rounded-full">Upload video files</strong>
                 </div>
                 <span class="text-sm opacity-70 italic">
@@ -216,7 +217,7 @@
         }}
         class="btn btn-sm preset-tonal-warning border border-warning-500 hover:preset-filled-warning-500 float-right"
     >
-        <span class="fas fa-broom m-1"></span>
+        <Trash2 size="1em" class="m-1" />
         Clear Upload History
     </button>
 </h2>
@@ -247,7 +248,7 @@
         }}
         class="btn btn-sm preset-tonal-warning border border-warning-500 hover:preset-filled-warning-500 float-right"
     >
-        <span class="fas fa-broom m-1"></span>
+        <Trash2 size="1em" class="m-1" />
         Clear Clip History
     </button>
 </h2>
diff --git a/src/routes/hosted_files/video_util/hold_video_util.svelte b/src/routes/hosted_files/video_util/hold_video_util.svelte
index 1c08e2a1..1b81156b 100644
--- a/src/routes/hosted_files/video_util/hold_video_util.svelte
+++ b/src/routes/hosted_files/video_util/hold_video_util.svelte
@@ -9,6 +9,7 @@
     import Comp_hosted_files_clip_video_li from '$lib/ae_core/ae_comp__hosted_files_clip_video_li.svelte';
 
     import Element_manage_hosted_file_li_wrap from '$lib/elements/element_manage_hosted_file_li_all.svelte';
+    import { ArrowLeftRight, Trash2, Upload } from 'lucide-svelte';
 
     let log_lvl = 1;
 
@@ -66,7 +67,7 @@
                     }
                 }}
             >
-                <span class="fas fa-exchange-alt m-1"></span>
+                <ArrowLeftRight size="1em" class="m-1" />
                 Upload/Select
             </button>
         </h2>
@@ -85,7 +86,7 @@
                 {#snippet label()}
                     <span>
                         <div>
-                            <span class="fas fa-upload"></span>
+                            <Upload size="1em" />
                             <strong class="bg-green-100 p-1">Upload video files</strong>
                         </div>
                         <span class="text-sm text-gray-600 dark:text-gray-400 italic">
@@ -119,7 +120,7 @@
                 }}
                 class="btn btn-sm preset-tonal-warning border border-warning-500 hover:preset-filled-warning-500 float-right"
             >
-                <span class="fas fa-broom m-1"></span>
+                <Trash2 size="1em" class="m-1" />
                 Clear Upload History
             </button>
         </h2>
@@ -148,7 +149,7 @@
                 }}
                 class="btn btn-sm preset-tonal-warning border border-warning-500 hover:preset-filled-warning-500 float-right"
             >
-                <span class="fas fa-broom m-1"></span>
+                <Trash2 size="1em" class="m-1" />
                 Clear Clip History
             </button>
         </h2>