diff --git a/crates/diagnostics/src/items.rs b/crates/diagnostics/src/items.rs
index e2961ff3bd..498ea6616c 100644
--- a/crates/diagnostics/src/items.rs
+++ b/crates/diagnostics/src/items.rs
@@ -101,7 +101,7 @@ impl View for DiagnosticIndicator {
                 let mut summary_row = Flex::row();
                 if self.summary.error_count > 0 {
                     summary_row.add_children([
-                        Svg::new("icons/error-solid-14.svg")
+                        Svg::new("icons/Icon16CircleXMark.svg")
                             .with_color(style.icon_color_error)
                             .constrained()
                             .with_width(style.icon_width)
@@ -117,7 +117,7 @@ impl View for DiagnosticIndicator {
 
                 if self.summary.warning_count > 0 {
                     summary_row.add_children([
-                        Svg::new("icons/warning-solid-14.svg")
+                        Svg::new("icons/Icon16TriangleExclamation.svg")
                             .with_color(style.icon_color_warning)
                             .constrained()
                             .with_width(style.icon_width)
@@ -138,7 +138,7 @@ impl View for DiagnosticIndicator {
 
                 if self.summary.error_count == 0 && self.summary.warning_count == 0 {
                     summary_row.add_child(
-                        Svg::new("icons/no-error-solid-14.svg")
+                        Svg::new("icons/Icon16CircleCheck.svg")
                             .with_color(style.icon_color_ok)
                             .constrained()
                             .with_width(style.icon_width)
diff --git a/crates/workspace/src/toolbar.rs b/crates/workspace/src/toolbar.rs
index 636df9a039..de4a0083ac 100644
--- a/crates/workspace/src/toolbar.rs
+++ b/crates/workspace/src/toolbar.rs
@@ -118,7 +118,7 @@ impl View for Toolbar {
             .with_child(
                 Flex::row()
                     .with_child(nav_button(
-                        "icons/arrow-left.svg",
+                        "icons/Icon16ArrowLeft.svg",
                         button_style,
                         tooltip_style.clone(),
                         enable_go_backward,
@@ -131,7 +131,7 @@ impl View for Toolbar {
                         cx,
                     ))
                     .with_child(nav_button(
-                        "icons/arrow-right.svg",
+                        "icons/Icon16ArrowRight.svg",
                         button_style,
                         tooltip_style.clone(),
                         enable_go_forward,
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index d27a5b7c5b..e3304fe6e9 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -244,7 +244,7 @@ pub fn initialize_workspace(
 
     workspace.left_sidebar().update(cx, |sidebar, cx| {
         sidebar.add_item(
-            "icons/folder-tree-solid-14.svg",
+            "icons/Icon16FolderTree.svg",
             "Project Panel".to_string(),
             project_panel.into(),
             cx,
@@ -252,7 +252,7 @@ pub fn initialize_workspace(
     });
     workspace.right_sidebar().update(cx, |sidebar, cx| {
         sidebar.add_item(
-            "icons/contacts-solid-14.svg",
+            "icons/Icon16UserGroup.svg",
             "Contacts Panel".to_string(),
             contact_panel.into(),
             cx,