85 files changed, 39 insertions, 40 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 031582bc63..06aa5731b4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -154,11 +154,11 @@ doc_classes/*                       @godotengine/documentation
 /scene/debugger/                    @godotengine/debugger
 /scene/gui/                         @godotengine/gui-nodes
 /scene/main/                        @godotengine/core
-/scene/resources/default_theme/     @godotengine/gui-nodes
 /scene/resources/font.*             @godotengine/gui-nodes
 /scene/resources/text_line.*        @godotengine/gui-nodes
 /scene/resources/text_paragraph.*   @godotengine/gui-nodes
 /scene/resources/visual_shader*.*   @godotengine/shaders
+/scene/theme/                       @godotengine/gui-nodes
 
 # Servers
 
diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp
index 74616bc0ce..bc8bcb1134 100644
--- a/editor/editor_fonts.cpp
+++ b/editor/editor_fonts.cpp
@@ -34,7 +34,6 @@
 #include "core/io/dir_access.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/font.h"
 
 Ref<FontFile> load_external_font(const String &p_path, TextServer::Hinting p_hinting, TextServer::FontAntialiasing p_aa, bool p_autohint, TextServer::SubpixelPositioning p_font_subpixel_positioning, bool p_msdf = false, TypedArray<Font> *r_fallbacks = nullptr) {
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
index 6087ea3abc..4f39e79252 100644
--- a/editor/editor_themes.cpp
+++ b/editor/editor_themes.cpp
@@ -245,7 +245,7 @@ static Ref<StyleBoxLine> make_line_stylebox(Color p_color, int p_thickness = 1,
 	return style;
 }
 
-// See also `generate_icon()` in `scene/resources/default_theme.cpp`.
+// See also `generate_icon()` in `scene/theme/default_theme.cpp`.
 static Ref<ImageTexture> editor_generate_icon(int p_index, float p_scale, float p_saturation, const HashMap<Color, Color> &p_convert_colors = HashMap<Color, Color>()) {
 	Ref<Image> img = memnew(Image);
 
diff --git a/editor/icons/editor_icons_builders.py b/editor/icons/editor_icons_builders.py
index ae25072a9e..359245b6d7 100644
--- a/editor/icons/editor_icons_builders.py
+++ b/editor/icons/editor_icons_builders.py
@@ -9,7 +9,7 @@ from io import StringIO
 from platform_methods import subprocess_main
 
 
-# See also `scene/resources/default_theme/default_theme_icons_builders.py`.
+# See also `scene/theme/icons/default_theme_icons_builders.py`.
 def make_editor_icons_action(target, source, env):
     dst = target[0]
     svg_icons = source
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 4d5d287fbe..5a29e5ff37 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -159,7 +159,6 @@
 #include "scene/resources/convex_polygon_shape_3d.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/cylinder_shape_3d.h"
-#include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/environment.h"
 #include "scene/resources/font.h"
 #include "scene/resources/gradient.h"
diff --git a/scene/resources/SCsub b/scene/resources/SCsub
index f4dc7a46fb..9e21c627f9 100644
--- a/scene/resources/SCsub
+++ b/scene/resources/SCsub
@@ -22,5 +22,3 @@ env.scene_sources += scene_obj
 
 # Needed to force rebuilding the scene files when the thirdparty code is updated.
 env.Depends(scene_obj, thirdparty_obj)
-
-SConscript("default_theme/SCsub")
diff --git a/scene/resources/default_theme/SCsub b/scene/resources/default_theme/SCsub
deleted file mode 100644
index 5bef7e5a6c..0000000000
--- a/scene/resources/default_theme/SCsub
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-
-Import("env")
-
-from platform_methods import run_in_subprocess
-import default_theme_builders
-import default_theme_icons_builders
-
-env.add_source_files(env.scene_sources, "*.cpp")
-
-env.Depends("#scene/resources/default_theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.woff2")
-env.CommandNoCache(
-    "#scene/resources/default_theme/default_font.gen.h",
-    "#thirdparty/fonts/OpenSans_SemiBold.woff2",
-    run_in_subprocess(default_theme_builders.make_fonts_header),
-)
-
-env["BUILDERS"]["MakeDefaultThemeIconsBuilder"] = Builder(
-    action=env.Run(
-        default_theme_icons_builders.make_default_theme_icons_action, "Generating default project theme icons header."
-    ),
-    suffix=".h",
-    src_suffix=".svg",
-)
-
-# Default theme icons
-icon_sources = Glob("*.svg")
-
-env.Alias(
-    "default_theme_icons",
-    [env.MakeDefaultThemeIconsBuilder("#scene/resources/default_theme/default_theme_icons.gen.h", icon_sources)],
-)
diff --git a/scene/theme/SCsub b/scene/theme/SCsub
index fc61250247..34f60b449d 100644
--- a/scene/theme/SCsub
+++ b/scene/theme/SCsub
@@ -2,4 +2,17 @@
 
 Import("env")
 
+from platform_methods import run_in_subprocess
+import default_theme_builders
+
+
 env.add_source_files(env.scene_sources, "*.cpp")
+
+SConscript("icons/SCsub")
+
+env.Depends("#scene/theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.woff2")
+env.CommandNoCache(
+    "#scene/theme/default_font.gen.h",
+    "#thirdparty/fonts/OpenSans_SemiBold.woff2",
+    run_in_subprocess(default_theme_builders.make_fonts_header),
+)
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/theme/default_theme.cpp
index eef46a6798..eef46a6798 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/theme/default_theme.cpp
diff --git a/scene/resources/default_theme/default_theme.h b/scene/theme/default_theme.h
index 55fc32a3d3..55fc32a3d3 100644
--- a/scene/resources/default_theme/default_theme.h
+++ b/scene/theme/default_theme.h
diff --git a/scene/resources/default_theme/default_theme_builders.py b/scene/theme/default_theme_builders.py
index 0455d6d246..0455d6d246 100644
--- a/scene/resources/default_theme/default_theme_builders.py
+++ b/scene/theme/default_theme_builders.py
diff --git a/scene/theme/icons/SCsub b/scene/theme/icons/SCsub
new file mode 100644
index 0000000000..fa9f3cb1ce
--- /dev/null
+++ b/scene/theme/icons/SCsub
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+Import("env")
+
+import default_theme_icons_builders
+
+
+env["BUILDERS"]["MakeDefaultThemeIconsBuilder"] = Builder(
+    action=env.Run(
+        default_theme_icons_builders.make_default_theme_icons_action, "Generating default project theme icons header."
+    ),
+    suffix=".h",
+    src_suffix=".svg",
+)
+
+# Default theme icons
+icon_sources = Glob("*.svg")
+
+env.Alias(
+    "default_theme_icons",
+    [env.MakeDefaultThemeIconsBuilder("#scene/theme/default_theme_icons.gen.h", icon_sources)],
+)
diff --git a/scene/resources/default_theme/add.svg b/scene/theme/icons/add.svg
index 818f8353ec..818f8353ec 100644
--- a/scene/resources/default_theme/add.svg
+++ b/scene/theme/icons/add.svg
diff --git a/scene/resources/default_theme/arrow_down.svg b/scene/theme/icons/arrow_down.svg
index 4dfb4a1559..4dfb4a1559 100644
--- a/scene/resources/default_theme/arrow_down.svg
+++ b/scene/theme/icons/arrow_down.svg
diff --git a/scene/resources/default_theme/arrow_left.svg b/scene/theme/icons/arrow_left.svg
index 6fb49d505f..6fb49d505f 100644
--- a/scene/resources/default_theme/arrow_left.svg
+++ b/scene/theme/icons/arrow_left.svg
diff --git a/scene/resources/default_theme/arrow_right.svg b/scene/theme/icons/arrow_right.svg
index 9af063d900..9af063d900 100644
--- a/scene/resources/default_theme/arrow_right.svg
+++ b/scene/theme/icons/arrow_right.svg
diff --git a/scene/resources/default_theme/bookmark.svg b/scene/theme/icons/bookmark.svg
index 15a2e50a3a..15a2e50a3a 100644
--- a/scene/resources/default_theme/bookmark.svg
+++ b/scene/theme/icons/bookmark.svg
diff --git a/scene/resources/default_theme/breakpoint.svg b/scene/theme/icons/breakpoint.svg
index 475e83572c..475e83572c 100644
--- a/scene/resources/default_theme/breakpoint.svg
+++ b/scene/theme/icons/breakpoint.svg
diff --git a/scene/resources/default_theme/checked.svg b/scene/theme/icons/checked.svg
index 49549e4fa4..49549e4fa4 100644
--- a/scene/resources/default_theme/checked.svg
+++ b/scene/theme/icons/checked.svg
diff --git a/scene/resources/default_theme/checked_disabled.svg b/scene/theme/icons/checked_disabled.svg
index 3a3b20793e..3a3b20793e 100644
--- a/scene/resources/default_theme/checked_disabled.svg
+++ b/scene/theme/icons/checked_disabled.svg
diff --git a/scene/resources/default_theme/close.svg b/scene/theme/icons/close.svg
index 6618aa2e14..6618aa2e14 100644
--- a/scene/resources/default_theme/close.svg
+++ b/scene/theme/icons/close.svg
diff --git a/scene/resources/default_theme/close_hl.svg b/scene/theme/icons/close_hl.svg
index 3d74ba54c3..3d74ba54c3 100644
--- a/scene/resources/default_theme/close_hl.svg
+++ b/scene/theme/icons/close_hl.svg
diff --git a/scene/resources/default_theme/color_picker_bar_arrow.svg b/scene/theme/icons/color_picker_bar_arrow.svg
index cb00f648f5..cb00f648f5 100644
--- a/scene/resources/default_theme/color_picker_bar_arrow.svg
+++ b/scene/theme/icons/color_picker_bar_arrow.svg
diff --git a/scene/resources/default_theme/color_picker_cursor.svg b/scene/theme/icons/color_picker_cursor.svg
index 8a7e56b559..8a7e56b559 100644
--- a/scene/resources/default_theme/color_picker_cursor.svg
+++ b/scene/theme/icons/color_picker_cursor.svg
diff --git a/scene/resources/default_theme/color_picker_overbright.svg b/scene/theme/icons/color_picker_overbright.svg
index 86ade4485d..86ade4485d 100644
--- a/scene/resources/default_theme/color_picker_overbright.svg
+++ b/scene/theme/icons/color_picker_overbright.svg
diff --git a/scene/resources/default_theme/color_picker_pipette.svg b/scene/theme/icons/color_picker_pipette.svg
index d167f58e6f..d167f58e6f 100644
--- a/scene/resources/default_theme/color_picker_pipette.svg
+++ b/scene/theme/icons/color_picker_pipette.svg
diff --git a/scene/resources/default_theme/default_theme_icons_builders.py b/scene/theme/icons/default_theme_icons_builders.py
index c4d132294c..c4d132294c 100644
--- a/scene/resources/default_theme/default_theme_icons_builders.py
+++ b/scene/theme/icons/default_theme_icons_builders.py
diff --git a/scene/resources/default_theme/error_icon.svg b/scene/theme/icons/error_icon.svg
index fcfa5d5da2..fcfa5d5da2 100644
--- a/scene/resources/default_theme/error_icon.svg
+++ b/scene/theme/icons/error_icon.svg
diff --git a/scene/resources/default_theme/file.svg b/scene/theme/icons/file.svg
index 6687b53a74..6687b53a74 100644
--- a/scene/resources/default_theme/file.svg
+++ b/scene/theme/icons/file.svg
diff --git a/scene/resources/default_theme/folder.svg b/scene/theme/icons/folder.svg
index bbb47d979d..bbb47d979d 100644
--- a/scene/resources/default_theme/folder.svg
+++ b/scene/theme/icons/folder.svg
diff --git a/scene/resources/default_theme/folder_up.svg b/scene/theme/icons/folder_up.svg
index 54645c1c4b..54645c1c4b 100644
--- a/scene/resources/default_theme/folder_up.svg
+++ b/scene/theme/icons/folder_up.svg
diff --git a/scene/resources/default_theme/graph_port.svg b/scene/theme/icons/graph_port.svg
index 309a21b106..309a21b106 100644
--- a/scene/resources/default_theme/graph_port.svg
+++ b/scene/theme/icons/graph_port.svg
diff --git a/scene/resources/default_theme/grid_layout.svg b/scene/theme/icons/grid_layout.svg
index cd901cd7b1..cd901cd7b1 100644
--- a/scene/resources/default_theme/grid_layout.svg
+++ b/scene/theme/icons/grid_layout.svg
diff --git a/scene/resources/default_theme/grid_minimap.svg b/scene/theme/icons/grid_minimap.svg
index 0c9fca73d2..0c9fca73d2 100644
--- a/scene/resources/default_theme/grid_minimap.svg
+++ b/scene/theme/icons/grid_minimap.svg
diff --git a/scene/resources/default_theme/grid_snap.svg b/scene/theme/icons/grid_snap.svg
index 82b0eae465..82b0eae465 100644
--- a/scene/resources/default_theme/grid_snap.svg
+++ b/scene/theme/icons/grid_snap.svg
diff --git a/scene/resources/default_theme/grid_toggle.svg b/scene/theme/icons/grid_toggle.svg
index b0721db518..b0721db518 100644
--- a/scene/resources/default_theme/grid_toggle.svg
+++ b/scene/theme/icons/grid_toggle.svg
diff --git a/scene/resources/default_theme/hslider_tick.svg b/scene/theme/icons/hslider_tick.svg
index 7110748cbc..7110748cbc 100644
--- a/scene/resources/default_theme/hslider_tick.svg
+++ b/scene/theme/icons/hslider_tick.svg
diff --git a/scene/resources/default_theme/hsplitter.svg b/scene/theme/icons/hsplitter.svg
index 89e2ef4172..89e2ef4172 100644
--- a/scene/resources/default_theme/hsplitter.svg
+++ b/scene/theme/icons/hsplitter.svg
diff --git a/scene/resources/default_theme/indeterminate.svg b/scene/theme/icons/indeterminate.svg
index 2a742e1475..2a742e1475 100644
--- a/scene/resources/default_theme/indeterminate.svg
+++ b/scene/theme/icons/indeterminate.svg
diff --git a/scene/resources/default_theme/line_edit_clear.svg b/scene/theme/icons/line_edit_clear.svg
index 6618aa2e14..6618aa2e14 100644
--- a/scene/resources/default_theme/line_edit_clear.svg
+++ b/scene/theme/icons/line_edit_clear.svg
diff --git a/scene/resources/default_theme/mini_checkerboard.svg b/scene/theme/icons/mini_checkerboard.svg
index 40e6aa1dd0..40e6aa1dd0 100644
--- a/scene/resources/default_theme/mini_checkerboard.svg
+++ b/scene/theme/icons/mini_checkerboard.svg
diff --git a/scene/resources/default_theme/option_button_arrow.svg b/scene/theme/icons/option_button_arrow.svg
index 6a551e7663..6a551e7663 100644
--- a/scene/resources/default_theme/option_button_arrow.svg
+++ b/scene/theme/icons/option_button_arrow.svg
diff --git a/scene/resources/default_theme/picker_shape_circle.svg b/scene/theme/icons/picker_shape_circle.svg
index 1f45259fc5..1f45259fc5 100644
--- a/scene/resources/default_theme/picker_shape_circle.svg
+++ b/scene/theme/icons/picker_shape_circle.svg
diff --git a/scene/resources/default_theme/picker_shape_rectangle.svg b/scene/theme/icons/picker_shape_rectangle.svg
index 4eb335758a..4eb335758a 100644
--- a/scene/resources/default_theme/picker_shape_rectangle.svg
+++ b/scene/theme/icons/picker_shape_rectangle.svg
diff --git a/scene/resources/default_theme/picker_shape_rectangle_wheel.svg b/scene/theme/icons/picker_shape_rectangle_wheel.svg
index 3b70538f1e..3b70538f1e 100644
--- a/scene/resources/default_theme/picker_shape_rectangle_wheel.svg
+++ b/scene/theme/icons/picker_shape_rectangle_wheel.svg
diff --git a/scene/resources/default_theme/popup_menu_arrow_left.svg b/scene/theme/icons/popup_menu_arrow_left.svg
index 642fecf3c7..642fecf3c7 100644
--- a/scene/resources/default_theme/popup_menu_arrow_left.svg
+++ b/scene/theme/icons/popup_menu_arrow_left.svg
diff --git a/scene/resources/default_theme/popup_menu_arrow_right.svg b/scene/theme/icons/popup_menu_arrow_right.svg
index b295df0764..b295df0764 100644
--- a/scene/resources/default_theme/popup_menu_arrow_right.svg
+++ b/scene/theme/icons/popup_menu_arrow_right.svg
diff --git a/scene/resources/default_theme/radio_checked.svg b/scene/theme/icons/radio_checked.svg
index 2d39431bff..2d39431bff 100644
--- a/scene/resources/default_theme/radio_checked.svg
+++ b/scene/theme/icons/radio_checked.svg
diff --git a/scene/resources/default_theme/radio_checked_disabled.svg b/scene/theme/icons/radio_checked_disabled.svg
index 9bcac0fd0f..9bcac0fd0f 100644
--- a/scene/resources/default_theme/radio_checked_disabled.svg
+++ b/scene/theme/icons/radio_checked_disabled.svg
diff --git a/scene/resources/default_theme/radio_unchecked.svg b/scene/theme/icons/radio_unchecked.svg
index abcceabd40..abcceabd40 100644
--- a/scene/resources/default_theme/radio_unchecked.svg
+++ b/scene/theme/icons/radio_unchecked.svg
diff --git a/scene/resources/default_theme/radio_unchecked_disabled.svg b/scene/theme/icons/radio_unchecked_disabled.svg
index 5a1856b5b1..5a1856b5b1 100644
--- a/scene/resources/default_theme/radio_unchecked_disabled.svg
+++ b/scene/theme/icons/radio_unchecked_disabled.svg
diff --git a/scene/resources/default_theme/reload.svg b/scene/theme/icons/reload.svg
index 52f22a943d..52f22a943d 100644
--- a/scene/resources/default_theme/reload.svg
+++ b/scene/theme/icons/reload.svg
diff --git a/scene/resources/default_theme/resizer_nw.svg b/scene/theme/icons/resizer_nw.svg
index c207147dd4..c207147dd4 100644
--- a/scene/resources/default_theme/resizer_nw.svg
+++ b/scene/theme/icons/resizer_nw.svg
diff --git a/scene/resources/default_theme/resizer_se.svg b/scene/theme/icons/resizer_se.svg
index a0383ac4df..a0383ac4df 100644
--- a/scene/resources/default_theme/resizer_se.svg
+++ b/scene/theme/icons/resizer_se.svg
diff --git a/scene/resources/default_theme/scroll_button_left.svg b/scene/theme/icons/scroll_button_left.svg
index 1cf907e044..1cf907e044 100644
--- a/scene/resources/default_theme/scroll_button_left.svg
+++ b/scene/theme/icons/scroll_button_left.svg
diff --git a/scene/resources/default_theme/scroll_button_left_hl.svg b/scene/theme/icons/scroll_button_left_hl.svg
index 2ca045ca24..2ca045ca24 100644
--- a/scene/resources/default_theme/scroll_button_left_hl.svg
+++ b/scene/theme/icons/scroll_button_left_hl.svg
diff --git a/scene/resources/default_theme/scroll_button_right.svg b/scene/theme/icons/scroll_button_right.svg
index 0d17f95ec0..0d17f95ec0 100644
--- a/scene/resources/default_theme/scroll_button_right.svg
+++ b/scene/theme/icons/scroll_button_right.svg
diff --git a/scene/resources/default_theme/scroll_button_right_hl.svg b/scene/theme/icons/scroll_button_right_hl.svg
index 1d29169c37..1d29169c37 100644
--- a/scene/resources/default_theme/scroll_button_right_hl.svg
+++ b/scene/theme/icons/scroll_button_right_hl.svg
diff --git a/scene/resources/default_theme/slider_grabber.svg b/scene/theme/icons/slider_grabber.svg
index 420f5d779b..420f5d779b 100644
--- a/scene/resources/default_theme/slider_grabber.svg
+++ b/scene/theme/icons/slider_grabber.svg
diff --git a/scene/resources/default_theme/slider_grabber_disabled.svg b/scene/theme/icons/slider_grabber_disabled.svg
index 74b1e2214d..74b1e2214d 100644
--- a/scene/resources/default_theme/slider_grabber_disabled.svg
+++ b/scene/theme/icons/slider_grabber_disabled.svg
diff --git a/scene/resources/default_theme/slider_grabber_hl.svg b/scene/theme/icons/slider_grabber_hl.svg
index 126c75f5f7..126c75f5f7 100644
--- a/scene/resources/default_theme/slider_grabber_hl.svg
+++ b/scene/theme/icons/slider_grabber_hl.svg
diff --git a/scene/resources/default_theme/tabs_drop_mark.svg b/scene/theme/icons/tabs_drop_mark.svg
index b1415bec45..b1415bec45 100644
--- a/scene/resources/default_theme/tabs_drop_mark.svg
+++ b/scene/theme/icons/tabs_drop_mark.svg
diff --git a/scene/resources/default_theme/tabs_menu.svg b/scene/theme/icons/tabs_menu.svg
index f132bf8fa2..f132bf8fa2 100644
--- a/scene/resources/default_theme/tabs_menu.svg
+++ b/scene/theme/icons/tabs_menu.svg
diff --git a/scene/resources/default_theme/tabs_menu_hl.svg b/scene/theme/icons/tabs_menu_hl.svg
index fce133f2d9..fce133f2d9 100644
--- a/scene/resources/default_theme/tabs_menu_hl.svg
+++ b/scene/theme/icons/tabs_menu_hl.svg
diff --git a/scene/resources/default_theme/text_edit_ellipsis.svg b/scene/theme/icons/text_edit_ellipsis.svg
index 320d740cee..320d740cee 100644
--- a/scene/resources/default_theme/text_edit_ellipsis.svg
+++ b/scene/theme/icons/text_edit_ellipsis.svg
diff --git a/scene/resources/default_theme/text_edit_space.svg b/scene/theme/icons/text_edit_space.svg
index 5c549918ed..5c549918ed 100644
--- a/scene/resources/default_theme/text_edit_space.svg
+++ b/scene/theme/icons/text_edit_space.svg
diff --git a/scene/resources/default_theme/text_edit_tab.svg b/scene/theme/icons/text_edit_tab.svg
index 3412e283f4..3412e283f4 100644
--- a/scene/resources/default_theme/text_edit_tab.svg
+++ b/scene/theme/icons/text_edit_tab.svg
diff --git a/scene/resources/default_theme/toggle_off.svg b/scene/theme/icons/toggle_off.svg
index aa2805d2cb..aa2805d2cb 100644
--- a/scene/resources/default_theme/toggle_off.svg
+++ b/scene/theme/icons/toggle_off.svg
diff --git a/scene/resources/default_theme/toggle_off_disabled.svg b/scene/theme/icons/toggle_off_disabled.svg
index e82eab7b31..e82eab7b31 100644
--- a/scene/resources/default_theme/toggle_off_disabled.svg
+++ b/scene/theme/icons/toggle_off_disabled.svg
diff --git a/scene/resources/default_theme/toggle_off_disabled_mirrored.svg b/scene/theme/icons/toggle_off_disabled_mirrored.svg
index 6a1ab0433d..6a1ab0433d 100644
--- a/scene/resources/default_theme/toggle_off_disabled_mirrored.svg
+++ b/scene/theme/icons/toggle_off_disabled_mirrored.svg
diff --git a/scene/resources/default_theme/toggle_off_mirrored.svg b/scene/theme/icons/toggle_off_mirrored.svg
index ec568b5c96..ec568b5c96 100644
--- a/scene/resources/default_theme/toggle_off_mirrored.svg
+++ b/scene/theme/icons/toggle_off_mirrored.svg
diff --git a/scene/resources/default_theme/toggle_on.svg b/scene/theme/icons/toggle_on.svg
index 8306d73973..8306d73973 100644
--- a/scene/resources/default_theme/toggle_on.svg
+++ b/scene/theme/icons/toggle_on.svg
diff --git a/scene/resources/default_theme/toggle_on_disabled.svg b/scene/theme/icons/toggle_on_disabled.svg
index 09bd172f66..09bd172f66 100644
--- a/scene/resources/default_theme/toggle_on_disabled.svg
+++ b/scene/theme/icons/toggle_on_disabled.svg
diff --git a/scene/resources/default_theme/toggle_on_disabled_mirrored.svg b/scene/theme/icons/toggle_on_disabled_mirrored.svg
index 2f1e0de7a9..2f1e0de7a9 100644
--- a/scene/resources/default_theme/toggle_on_disabled_mirrored.svg
+++ b/scene/theme/icons/toggle_on_disabled_mirrored.svg
diff --git a/scene/resources/default_theme/toggle_on_mirrored.svg b/scene/theme/icons/toggle_on_mirrored.svg
index 2236d1e23e..2236d1e23e 100644
--- a/scene/resources/default_theme/toggle_on_mirrored.svg
+++ b/scene/theme/icons/toggle_on_mirrored.svg
diff --git a/scene/resources/default_theme/unchecked.svg b/scene/theme/icons/unchecked.svg
index 1a2afa4e3b..1a2afa4e3b 100644
--- a/scene/resources/default_theme/unchecked.svg
+++ b/scene/theme/icons/unchecked.svg
diff --git a/scene/resources/default_theme/unchecked_disabled.svg b/scene/theme/icons/unchecked_disabled.svg
index a319f790e9..a319f790e9 100644
--- a/scene/resources/default_theme/unchecked_disabled.svg
+++ b/scene/theme/icons/unchecked_disabled.svg
diff --git a/scene/resources/default_theme/updown.svg b/scene/theme/icons/updown.svg
index 2258f3b5d1..2258f3b5d1 100644
--- a/scene/resources/default_theme/updown.svg
+++ b/scene/theme/icons/updown.svg
diff --git a/scene/resources/default_theme/visibility_visible.svg b/scene/theme/icons/visibility_visible.svg
index 33e8718941..33e8718941 100644
--- a/scene/resources/default_theme/visibility_visible.svg
+++ b/scene/theme/icons/visibility_visible.svg
diff --git a/scene/resources/default_theme/vslider_tick.svg b/scene/theme/icons/vslider_tick.svg
index a96a8e48bb..a96a8e48bb 100644
--- a/scene/resources/default_theme/vslider_tick.svg
+++ b/scene/theme/icons/vslider_tick.svg
diff --git a/scene/resources/default_theme/vsplitter.svg b/scene/theme/icons/vsplitter.svg
index 37b0aa470e..37b0aa470e 100644
--- a/scene/resources/default_theme/vsplitter.svg
+++ b/scene/theme/icons/vsplitter.svg
diff --git a/scene/resources/default_theme/zoom_less.svg b/scene/theme/icons/zoom_less.svg
index 29bd1708ca..29bd1708ca 100644
--- a/scene/resources/default_theme/zoom_less.svg
+++ b/scene/theme/icons/zoom_less.svg
diff --git a/scene/resources/default_theme/zoom_more.svg b/scene/theme/icons/zoom_more.svg
index 7a844b1418..7a844b1418 100644
--- a/scene/resources/default_theme/zoom_more.svg
+++ b/scene/theme/icons/zoom_more.svg
diff --git a/scene/resources/default_theme/zoom_reset.svg b/scene/theme/icons/zoom_reset.svg
index c12d9c3bf2..c12d9c3bf2 100644
--- a/scene/resources/default_theme/zoom_reset.svg
+++ b/scene/theme/icons/zoom_reset.svg
diff --git a/scene/theme/theme_db.cpp b/scene/theme/theme_db.cpp
index 9b85a62c6e..39a4f078b5 100644
--- a/scene/theme/theme_db.cpp
+++ b/scene/theme/theme_db.cpp
@@ -32,11 +32,11 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/font.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 #include "scene/resources/theme.h"
+#include "scene/theme/default_theme.h"
 #include "servers/text_server.h"
 
 // Default engine theme creation and configuration.