diff --git a/assets/icons/at-sign.svg b/assets/icons/at_sign.svg
similarity index 85%
rename from assets/icons/at-sign.svg
rename to assets/icons/at_sign.svg
index 5adac38f62..4cf8cd468f 100644
--- a/assets/icons/at-sign.svg
+++ b/assets/icons/at_sign.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-at-sign"><circle cx="12" cy="12" r="4"/><path d="M16 8v5a3 3 0 0 0 6 0v-1a10 10 0 1 0-4 8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-at-sign"><circle cx="12" cy="12" r="4"/><path d="M16 8v5a3 3 0 0 0 6 0v-1a10 10 0 1 0-4 8"/></svg>
diff --git a/assets/icons/bell-off.svg b/assets/icons/bell_off.svg
similarity index 100%
rename from assets/icons/bell-off.svg
rename to assets/icons/bell_off.svg
diff --git a/assets/icons/bell-ring.svg b/assets/icons/bell_ring.svg
similarity index 100%
rename from assets/icons/bell-ring.svg
rename to assets/icons/bell_ring.svg
diff --git a/assets/icons/magic-wand.svg b/assets/icons/magic_wand.svg
similarity index 100%
rename from assets/icons/magic-wand.svg
rename to assets/icons/magic_wand.svg
diff --git a/assets/icons/mail-open.svg b/assets/icons/mail_open.svg
similarity index 100%
rename from assets/icons/mail-open.svg
rename to assets/icons/mail_open.svg
diff --git a/assets/icons/mic-mute.svg b/assets/icons/mic_mute.svg
similarity index 100%
rename from assets/icons/mic-mute.svg
rename to assets/icons/mic_mute.svg
diff --git a/assets/icons/page-down.svg b/assets/icons/page_down.svg
similarity index 100%
rename from assets/icons/page-down.svg
rename to assets/icons/page_down.svg
diff --git a/assets/icons/page-up.svg b/assets/icons/page_up.svg
similarity index 100%
rename from assets/icons/page-up.svg
rename to assets/icons/page_up.svg
diff --git a/assets/icons/select-all.svg b/assets/icons/select_all.svg
similarity index 100%
rename from assets/icons/select-all.svg
rename to assets/icons/select_all.svg
diff --git a/assets/icons/speaker-loud.svg b/assets/icons/speaker_loud.svg
similarity index 100%
rename from assets/icons/speaker-loud.svg
rename to assets/icons/speaker_loud.svg
diff --git a/assets/icons/speaker-off.svg b/assets/icons/speaker_off.svg
similarity index 100%
rename from assets/icons/speaker-off.svg
rename to assets/icons/speaker_off.svg
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index cef8faf601..3a05ee901a 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -647,10 +647,10 @@ impl CollabTitlebarItem {
         let tooltip;
         let is_deafened = room.read(cx).is_deafened().unwrap_or(false);
         if is_deafened {
-            icon = "icons/speaker-off.svg";
+            icon = "icons/speaker_off.svg";
             tooltip = "Unmute speakers";
         } else {
-            icon = "icons/speaker-loud.svg";
+            icon = "icons/speaker_loud.svg";
             tooltip = "Mute speakers";
         }
 
diff --git a/crates/ui2/src/components/icon.rs b/crates/ui2/src/components/icon.rs
index b252715aad..7354467fcf 100644
--- a/crates/ui2/src/components/icon.rs
+++ b/crates/ui2/src/components/icon.rs
@@ -119,13 +119,13 @@ impl Icon {
             Icon::ArrowRight => "icons/arrow_right.svg",
             Icon::ArrowUp => "icons/arrow_up.svg",
             Icon::ArrowUpRight => "icons/arrow_up_right.svg",
-            Icon::AtSign => "icons/at-sign.svg",
-            Icon::AudioOff => "icons/speaker-off.svg",
+            Icon::AtSign => "icons/at_sign.svg",
+            Icon::AudioOff => "icons/speaker_off.svg",
             Icon::AudioOn => "icons/speaker-loud.svg",
             Icon::Backspace => "icons/backspace.svg",
             Icon::Bell => "icons/bell.svg",
-            Icon::BellOff => "icons/bell-off.svg",
-            Icon::BellRing => "icons/bell-ring.svg",
+            Icon::BellOff => "icons/bell_off.svg",
+            Icon::BellRing => "icons/bell_ring.svg",
             Icon::Bolt => "icons/bolt.svg",
             Icon::CaseSensitive => "icons/case_insensitive.svg",
             Icon::Check => "icons/check.svg",
@@ -167,18 +167,18 @@ impl Icon {
             Icon::Hash => "icons/hash.svg",
             Icon::InlayHint => "icons/inlay_hint.svg",
             Icon::Link => "icons/link.svg",
-            Icon::MagicWand => "icons/magic-wand.svg",
+            Icon::MagicWand => "icons/magic_wand.svg",
             Icon::MagnifyingGlass => "icons/magnifying_glass.svg",
-            Icon::MailOpen => "icons/mail-open.svg",
+            Icon::MailOpen => "icons/mail_open.svg",
             Icon::Maximize => "icons/maximize.svg",
             Icon::Menu => "icons/menu.svg",
             Icon::MessageBubbles => "icons/conversations.svg",
             Icon::Mic => "icons/mic.svg",
-            Icon::MicMute => "icons/mic-mute.svg",
+            Icon::MicMute => "icons/mic_mute.svg",
             Icon::Minimize => "icons/minimize.svg",
             Icon::Option => "icons/option.svg",
-            Icon::PageDown => "icons/page-down.svg",
-            Icon::PageUp => "icons/page-up.svg",
+            Icon::PageDown => "icons/page_down.svg",
+            Icon::PageUp => "icons/page_up.svg",
             Icon::Plus => "icons/plus.svg",
             Icon::Public => "icons/public.svg",
             Icon::Quote => "icons/quote.svg",
@@ -187,7 +187,7 @@ impl Icon {
             Icon::ReplaceNext => "icons/replace_next.svg",
             Icon::Return => "icons/return.svg",
             Icon::Screen => "icons/desktop.svg",
-            Icon::SelectAll => "icons/select-all.svg",
+            Icon::SelectAll => "icons/select_all.svg",
             Icon::Shift => "icons/shift.svg",
             Icon::Snip => "icons/snip.svg",
             Icon::Space => "icons/space.svg",