diff --git a/editor/editor_asset_installer.cpp b/editor/editor_asset_installer.cpp
index 3404e6501d5..b2d21c3447c 100644
--- a/editor/editor_asset_installer.cpp
+++ b/editor/editor_asset_installer.cpp
@@ -412,7 +412,7 @@ void EditorAssetInstaller::_notification(int p_what) {
 				extension_icon_map["tres"] = get_editor_theme_icon(SNAME("Resource"));
 				extension_icon_map["atlastex"] = get_editor_theme_icon(SNAME("AtlasTexture"));
 				// By default, OBJ files are imported as Mesh resources rather than PackedScenes.
-				extension_icon_map["obj"] = get_editor_theme_icon(SNAME("Mesh"));
+				extension_icon_map["obj"] = get_editor_theme_icon(SNAME("MeshItem"));
 
 				extension_icon_map["txt"] = get_editor_theme_icon(SNAME("TextFile"));
 				extension_icon_map["md"] = get_editor_theme_icon(SNAME("TextFile"));
diff --git a/editor/icons/FontItem.svg b/editor/icons/FontItem.svg
new file mode 100644
index 00000000000..afdb9123e87
--- /dev/null
+++ b/editor/icons/FontItem.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M1 1h14v4h-1a2 2 0 0 0-2-2H9v9a2 2 0 0 0 2 2v1H5v-1a2 2 0 0 0 2-2V3H4a2 2 0 0 0-2 2H1z" fill="#e0e0e0"/></svg>
diff --git a/editor/icons/MeshItem.svg b/editor/icons/MeshItem.svg
new file mode 100644
index 00000000000..d475aec908f
--- /dev/null
+++ b/editor/icons/MeshItem.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z" fill="#e0e0e0"/></svg>
diff --git a/editor/import/scene_import_settings.cpp b/editor/import/scene_import_settings.cpp
index 3882b8d2dbe..c4e1261a9c2 100644
--- a/editor/import/scene_import_settings.cpp
+++ b/editor/import/scene_import_settings.cpp
@@ -225,7 +225,7 @@ void SceneImportSettings::_fill_mesh(Tree *p_tree, const Ref<Mesh> &p_mesh, Tree
 
 	MeshData &mesh_data = mesh_map[import_id];
 
-	Ref<Texture2D> icon = get_editor_theme_icon(SNAME("Mesh"));
+	Ref<Texture2D> icon = get_editor_theme_icon(SNAME("MeshItem"));
 
 	TreeItem *item = p_tree->create_item(p_parent);
 	item->set_text(0, p_mesh->get_name());
@@ -1285,7 +1285,7 @@ void SceneImportSettings::_save_dir_callback(const String &p_path) {
 				String name = md.mesh_node->get_text(0);
 
 				item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
-				item->set_icon(0, get_editor_theme_icon(SNAME("Mesh")));
+				item->set_icon(0, get_editor_theme_icon(SNAME("MeshItem")));
 				item->set_text(0, name);
 
 				if (md.has_import_id) {
diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp
index f52a0913e2f..3ac1c0d559d 100644
--- a/editor/plugins/theme_editor_plugin.cpp
+++ b/editor/plugins/theme_editor_plugin.cpp
@@ -164,7 +164,7 @@ void ThemeItemImportTree::_update_items_tree() {
 					break;
 
 				case Theme::DATA_TYPE_FONT:
-					data_type_node->set_icon(0, get_editor_theme_icon(SNAME("Font")));
+					data_type_node->set_icon(0, get_editor_theme_icon(SNAME("FontItem")));
 					data_type_node->set_text(0, TTR("Fonts"));
 
 					item_list = &tree_font_items;
@@ -876,7 +876,7 @@ void ThemeItemImportTree::_notification(int p_what) {
 			select_all_constants_button->set_icon(get_editor_theme_icon(SNAME("ThemeSelectAll")));
 			select_full_constants_button->set_icon(get_editor_theme_icon(SNAME("ThemeSelectFull")));
 
-			select_fonts_icon->set_texture(get_editor_theme_icon(SNAME("Font")));
+			select_fonts_icon->set_texture(get_editor_theme_icon(SNAME("FontItem")));
 			deselect_all_fonts_button->set_icon(get_editor_theme_icon(SNAME("ThemeDeselectAll")));
 			select_all_fonts_button->set_icon(get_editor_theme_icon(SNAME("ThemeSelectAll")));
 			select_full_fonts_button->set_icon(get_editor_theme_icon(SNAME("ThemeSelectFull")));
@@ -1387,7 +1387,7 @@ void ThemeItemEditorDialog::_update_edit_item_tree(String p_item_type) {
 		if (names.size() > 0) {
 			TreeItem *font_root = edit_items_tree->create_item(root);
 			font_root->set_metadata(0, Theme::DATA_TYPE_FONT);
-			font_root->set_icon(0, get_editor_theme_icon(SNAME("Font")));
+			font_root->set_icon(0, get_editor_theme_icon(SNAME("FontItem")));
 			font_root->set_text(0, TTR("Fonts"));
 			font_root->add_button(0, get_editor_theme_icon(SNAME("Clear")), ITEMS_TREE_REMOVE_DATA_TYPE, false, TTR("Remove All Font Items"));
 
@@ -1875,7 +1875,7 @@ void ThemeItemEditorDialog::_notification(int p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			edit_items_add_color->set_icon(get_editor_theme_icon(SNAME("Color")));
 			edit_items_add_constant->set_icon(get_editor_theme_icon(SNAME("MemberConstant")));
-			edit_items_add_font->set_icon(get_editor_theme_icon(SNAME("Font")));
+			edit_items_add_font->set_icon(get_editor_theme_icon(SNAME("FontItem")));
 			edit_items_add_font_size->set_icon(get_editor_theme_icon(SNAME("FontSize")));
 			edit_items_add_icon->set_icon(get_editor_theme_icon(SNAME("ImageTexture")));
 			edit_items_add_stylebox->set_icon(get_editor_theme_icon(SNAME("StyleBoxFlat")));
@@ -3318,7 +3318,7 @@ void ThemeTypeEditor::_notification(int p_what) {
 
 			data_type_tabs->set_tab_icon(0, get_editor_theme_icon(SNAME("Color")));
 			data_type_tabs->set_tab_icon(1, get_editor_theme_icon(SNAME("MemberConstant")));
-			data_type_tabs->set_tab_icon(2, get_editor_theme_icon(SNAME("Font")));
+			data_type_tabs->set_tab_icon(2, get_editor_theme_icon(SNAME("FontItem")));
 			data_type_tabs->set_tab_icon(3, get_editor_theme_icon(SNAME("FontSize")));
 			data_type_tabs->set_tab_icon(4, get_editor_theme_icon(SNAME("ImageTexture")));
 			data_type_tabs->set_tab_icon(5, get_editor_theme_icon(SNAME("StyleBoxFlat")));