diff --git a/core/object/script_language.h b/core/object/script_language.h
index 8158d633ae1..af45cd30398 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -288,7 +288,7 @@ public:
 	virtual ScriptNameCasing preferred_file_name_casing() const { return SCRIPT_NAME_CASING_SNAKE_CASE; }
 
 	// Keep enums in sync with:
-	// scene/gui/code_edit.h - CodeEdit::CodeCompletionKind
+	// scene/gui/advanced/code_edit.h - CodeEdit::CodeCompletionKind
 	enum CodeCompletionKind {
 		CODE_COMPLETION_KIND_CLASS,
 		CODE_COMPLETION_KIND_FUNCTION,
@@ -303,7 +303,7 @@ public:
 		CODE_COMPLETION_KIND_MAX
 	};
 
-	// scene/gui/code_edit.h - CodeEdit::CodeCompletionLocation
+	// scene/gui/advanced/code_edit.h - CodeEdit::CodeCompletionLocation
 	enum CodeCompletionLocation {
 		LOCATION_LOCAL = 0,
 		LOCATION_PARENT_MASK = 1 << 8,
diff --git a/editor/action_map_editor.cpp b/editor/action_map_editor.cpp
index b830c71c615..9b8e2883e19 100644
--- a/editor/action_map_editor.cpp
+++ b/editor/action_map_editor.cpp
@@ -35,9 +35,9 @@
 #include "editor/event_listener_line_edit.h"
 #include "editor/input_event_configuration_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/tree.h"
 
 static bool _is_action_name_valid(const String &p_name) {
 	const char32_t *cstr = p_name.get_data();
diff --git a/editor/add_metadata_dialog.h b/editor/add_metadata_dialog.h
index 30c198e480f..0397f423246 100644
--- a/editor/add_metadata_dialog.h
+++ b/editor/add_metadata_dialog.h
@@ -32,9 +32,9 @@
 #define ADD_METADATA_DIALOG_H
 
 #include "editor/gui/editor_validation_panel.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
 
 class AddMetadataDialog : public ConfirmationDialog {
 	GDCLASS(AddMetadataDialog, ConfirmationDialog);
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index dbb23d6f17a..aff64844b4b 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -48,15 +48,15 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/animation/tween.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/color_picker.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/grid_container.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h
index 5d998aed66f..181d1835391 100644
--- a/editor/animation_track_editor.h
+++ b/editor/animation_track_editor.h
@@ -35,10 +35,10 @@
 #include "editor/editor_properties.h"
 #include "editor/property_selector.h"
 #include "scene/3d/node_3d.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/control.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/tree.h"
 #include "scene/resources/animation.h"
 
 class AnimationMarkerEdit;
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index 50f21533c4c..98a60e10707 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -39,9 +39,10 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/separator.h"
+#include "scene/gui/texture_button.h"
 #include "scene/resources/font.h"
 
 void GotoLinePopup::popup_find_line(CodeTextEditor *p_text_editor) {
diff --git a/editor/code_editor.h b/editor/code_editor.h
index d60d6b4d3b0..4c395ed5200 100644
--- a/editor/code_editor.h
+++ b/editor/code_editor.h
@@ -31,11 +31,11 @@
 #ifndef CODE_EDITOR_H
 #define CODE_EDITOR_H
 
+#include "scene/gui/advanced/code_edit.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/code_edit.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup.h"
 #include "scene/main/timer.h"
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index dca43411e10..0e45d0d2510 100644
--- a/editor/connections_dialog.cpp
+++ b/editor/connections_dialog.cpp
@@ -44,14 +44,14 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/scene_tree_dock.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/popup_menu.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/spin_box.h"
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {
 	if (p_node != p_root && p_node->get_owner() != p_root) {
diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h
index 78f1b76e235..e8f73d97bbe 100644
--- a/editor/connections_dialog.h
+++ b/editor/connections_dialog.h
@@ -31,9 +31,9 @@
 #ifndef CONNECTIONS_DIALOG_H
 #define CONNECTIONS_DIALOG_H
 
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
 
 class Button;
 class CheckBox;
diff --git a/editor/create_dialog.h b/editor/create_dialog.h
index 39e9802e7c1..427c9a57c6c 100644
--- a/editor/create_dialog.h
+++ b/editor/create_dialog.h
@@ -32,11 +32,11 @@
 #define CREATE_DIALOG_H
 
 #include "editor/editor_help.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/tree.h"
 
 class CreateDialog : public ConfirmationDialog {
 	GDCLASS(CreateDialog, ConfirmationDialog);
diff --git a/editor/debugger/editor_debugger_node.cpp b/editor/debugger/editor_debugger_node.cpp
index 75fed9e0fa6..00b0caad898 100644
--- a/editor/debugger/editor_debugger_node.cpp
+++ b/editor/debugger/editor_debugger_node.cpp
@@ -45,7 +45,7 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/scene_tree_dock.h"
 #include "editor/themes/editor_theme_manager.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/tab_container.h"
 #include "scene/resources/packed_scene.h"
 
diff --git a/editor/debugger/editor_debugger_tree.h b/editor/debugger/editor_debugger_tree.h
index 46893d6dc3b..d76d75d717a 100644
--- a/editor/debugger/editor_debugger_tree.h
+++ b/editor/debugger/editor_debugger_tree.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_DEBUGGER_TREE_H
 #define EDITOR_DEBUGGER_TREE_H
 
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/tree.h"
 
 class SceneDebuggerTree;
 class EditorFileDialog;
diff --git a/editor/debugger/editor_performance_profiler.h b/editor/debugger/editor_performance_profiler.h
index 635110e897d..aa4929a95fe 100644
--- a/editor/debugger/editor_performance_profiler.h
+++ b/editor/debugger/editor_performance_profiler.h
@@ -33,10 +33,10 @@
 
 #include "core/templates/hash_map.h"
 #include "main/performance.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tree.h"
 
 class EditorPerformanceProfiler : public HSplitContainer {
 	GDCLASS(EditorPerformanceProfiler, HSplitContainer);
diff --git a/editor/debugger/editor_profiler.h b/editor/debugger/editor_profiler.h
index c9a18e3f26a..0f862e1a9d0 100644
--- a/editor/debugger/editor_profiler.h
+++ b/editor/debugger/editor_profiler.h
@@ -31,15 +31,15 @@
 #ifndef EDITOR_PROFILER_H
 #define EDITOR_PROFILER_H
 
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 class ImageTexture;
 
diff --git a/editor/debugger/editor_visual_profiler.h b/editor/debugger/editor_visual_profiler.h
index 5ef45fcc086..f7df5c55c37 100644
--- a/editor/debugger/editor_visual_profiler.h
+++ b/editor/debugger/editor_visual_profiler.h
@@ -31,15 +31,15 @@
 #ifndef EDITOR_VISUAL_PROFILER_H
 #define EDITOR_VISUAL_PROFILER_H
 
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 class ImageTexture;
 
diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp
index c4242f7dff6..b79d02a6884 100644
--- a/editor/debugger/script_editor_debugger.cpp
+++ b/editor/debugger/script_editor_debugger.cpp
@@ -56,15 +56,15 @@
 #include "main/performance.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/debugger/scene_debugger.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
-#include "scene/gui/tree.h"
 #include "servers/debugger/servers_debugger.h"
 #include "servers/display_server.h"
 
diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h
index e7c5a060560..442eee1f982 100644
--- a/editor/dependency_editor.h
+++ b/editor/dependency_editor.h
@@ -31,10 +31,10 @@
 #ifndef DEPENDENCY_EDITOR_H
 #define DEPENDENCY_EDITOR_H
 
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/tree.h"
 
 class EditorFileDialog;
 class EditorFileSystemDirectory;
diff --git a/editor/directory_create_dialog.h b/editor/directory_create_dialog.h
index 2292a6e5c9e..902b58311fe 100644
--- a/editor/directory_create_dialog.h
+++ b/editor/directory_create_dialog.h
@@ -31,7 +31,7 @@
 #ifndef DIRECTORY_CREATE_DIALOG_H
 #define DIRECTORY_CREATE_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class EditorValidationPanel;
 class Label;
diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp
index 6b592ba7a8a..9a87815b3ee 100644
--- a/editor/editor_about.cpp
+++ b/editor/editor_about.cpp
@@ -36,9 +36,9 @@
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_version_button.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/resources/style_box.h"
 
diff --git a/editor/editor_about.h b/editor/editor_about.h
index 0a3fb6264e1..f394dd874b7 100644
--- a/editor/editor_about.h
+++ b/editor/editor_about.h
@@ -31,12 +31,12 @@
 #ifndef EDITOR_ABOUT_H
 #define EDITOR_ABOUT_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/rich_text_label.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 /**
  * NOTE: Do not assume the EditorNode singleton to be available in this class' methods.
diff --git a/editor/editor_asset_installer.cpp b/editor/editor_asset_installer.cpp
index 5035900fe87..d0dc1f8e71c 100644
--- a/editor/editor_asset_installer.cpp
+++ b/editor/editor_asset_installer.cpp
@@ -40,11 +40,11 @@
 #include "editor/gui/editor_toaster.h"
 #include "editor/progress_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/label.h"
 #include "scene/gui/link_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 
 void EditorAssetInstaller::_item_checked_cbk() {
 	if (updating_source || !source_tree->get_edited()) {
diff --git a/editor/editor_asset_installer.h b/editor/editor_asset_installer.h
index 41f092f3044..4ddeea8aa07 100644
--- a/editor/editor_asset_installer.h
+++ b/editor/editor_asset_installer.h
@@ -31,8 +31,8 @@
 #ifndef EDITOR_ASSET_INSTALLER_H
 #define EDITOR_ASSET_INSTALLER_H
 
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 
 class CheckBox;
 class EditorFileDialog;
diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h
index 5a9cd0c692d..0e43c3084d7 100644
--- a/editor/editor_audio_buses.h
+++ b/editor/editor_audio_buses.h
@@ -32,19 +32,19 @@
 #define EDITOR_AUDIO_BUSES_H
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/texture_progress_bar.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 class EditorAudioBuses;
 class EditorFileDialog;
diff --git a/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h
index 2ab969eb595..ad1d8311718 100644
--- a/editor/editor_autoload_settings.h
+++ b/editor/editor_autoload_settings.h
@@ -31,9 +31,9 @@
 #ifndef EDITOR_AUTOLOAD_SETTINGS_H
 #define EDITOR_AUTOLOAD_SETTINGS_H
 
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/tree.h"
 
 class EditorFileDialog;
 
diff --git a/editor/editor_build_profile.h b/editor/editor_build_profile.h
index 945f7ba3d4d..e45f193b7c4 100644
--- a/editor/editor_build_profile.h
+++ b/editor/editor_build_profile.h
@@ -33,8 +33,8 @@
 
 #include "core/object/ref_counted.h"
 #include "editor/editor_help.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 
 class EditorBuildProfile : public RefCounted {
 	GDCLASS(EditorBuildProfile, RefCounted);
diff --git a/editor/editor_command_palette.cpp b/editor/editor_command_palette.cpp
index a83ceb5f860..24489a7e94c 100644
--- a/editor/editor_command_palette.cpp
+++ b/editor/editor_command_palette.cpp
@@ -35,9 +35,9 @@
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_toaster.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/control.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/tree.h"
 
 EditorCommandPalette *EditorCommandPalette::singleton = nullptr;
 
diff --git a/editor/editor_command_palette.h b/editor/editor_command_palette.h
index 0b79d3e8c84..3f4fd1e9810 100644
--- a/editor/editor_command_palette.h
+++ b/editor/editor_command_palette.h
@@ -32,8 +32,8 @@
 #define EDITOR_COMMAND_PALETTE_H
 
 #include "core/input/shortcut.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 
 class EditorCommandPalette : public ConfirmationDialog {
 	GDCLASS(EditorCommandPalette, ConfirmationDialog);
diff --git a/editor/editor_dock_manager.cpp b/editor/editor_dock_manager.cpp
index 32269f91a10..b487fbaecef 100644
--- a/editor/editor_dock_manager.cpp
+++ b/editor/editor_dock_manager.cpp
@@ -30,10 +30,10 @@
 
 #include "editor_dock_manager.h"
 
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/main/window.h"
 
diff --git a/editor/editor_dock_manager.h b/editor/editor_dock_manager.h
index d750d6b24e9..a3ac75d3867 100644
--- a/editor/editor_dock_manager.h
+++ b/editor/editor_dock_manager.h
@@ -31,8 +31,8 @@
 #ifndef EDITOR_DOCK_MANAGER_H
 #define EDITOR_DOCK_MANAGER_H
 
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/split_container.h"
 
 class Button;
 class ConfigFile;
diff --git a/editor/editor_feature_profile.h b/editor/editor_feature_profile.h
index 7a2f132506f..fd852f71150 100644
--- a/editor/editor_feature_profile.h
+++ b/editor/editor_feature_profile.h
@@ -33,10 +33,10 @@
 
 #include "core/object/ref_counted.h"
 #include "editor/editor_help.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 
 class EditorFileDialog;
 
diff --git a/editor/editor_help.h b/editor/editor_help.h
index e1561215aad..e1f76a869f1 100644
--- a/editor/editor_help.h
+++ b/editor/editor_help.h
@@ -34,11 +34,12 @@
 #include "core/os/thread.h"
 #include "editor/doc_tools.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/rich_text_label.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/text_edit.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/rich_text_label.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/text_edit.h"
+#include "scene/gui/texture_button.h"
 #include "scene/main/timer.h"
 
 #include "modules/modules_enabled.gen.h" // For gdscript, mono.
diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h
index c4492c4b974..2eca0d410e8 100644
--- a/editor/editor_help_search.h
+++ b/editor/editor_help_search.h
@@ -32,9 +32,9 @@
 #define EDITOR_HELP_SEARCH_H
 
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/tree.h"
 
 class EditorHelpSearch : public ConfirmationDialog {
 	GDCLASS(EditorHelpSearch, ConfirmationDialog);
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 58b02ed2b8a..367dc6791a1 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -48,9 +48,9 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"
diff --git a/editor/editor_layouts_dialog.h b/editor/editor_layouts_dialog.h
index e3557fbe71a..d23871da7f3 100644
--- a/editor/editor_layouts_dialog.h
+++ b/editor/editor_layouts_dialog.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_LAYOUTS_DIALOG_H
 #define EDITOR_LAYOUTS_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class LineEdit;
 class ItemList;
diff --git a/editor/editor_locale_dialog.cpp b/editor/editor_locale_dialog.cpp
index c36792c9e31..294db8b1260 100644
--- a/editor/editor_locale_dialog.cpp
+++ b/editor/editor_locale_dialog.cpp
@@ -34,10 +34,10 @@
 #include "core/string/translation_server.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/tree.h"
 
 void EditorLocaleDialog::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("locale_selected", PropertyInfo(Variant::STRING, "locale")));
diff --git a/editor/editor_locale_dialog.h b/editor/editor_locale_dialog.h
index bc75e1df595..ea11b352c49 100644
--- a/editor/editor_locale_dialog.h
+++ b/editor/editor_locale_dialog.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_LOCALE_DIALOG_H
 #define EDITOR_LOCALE_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class Button;
 class HBoxContainer;
diff --git a/editor/editor_log.h b/editor/editor_log.h
index d5c2babd849..7711e8a575d 100644
--- a/editor/editor_log.h
+++ b/editor/editor_log.h
@@ -32,10 +32,10 @@
 #define EDITOR_LOG_H
 
 #include "core/os/thread.h"
+#include "scene/gui/advanced/rich_text_label.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/rich_text_label.h"
 
 class UndoRedo;
 
diff --git a/editor/editor_native_shader_source_visualizer.cpp b/editor/editor_native_shader_source_visualizer.cpp
index 44f2385baee..74273ab53c5 100644
--- a/editor/editor_native_shader_source_visualizer.cpp
+++ b/editor/editor_native_shader_source_visualizer.cpp
@@ -33,8 +33,8 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/code_edit.h"
-#include "scene/gui/text_edit.h"
+#include "scene/gui/advanced/code_edit.h"
+#include "scene/gui/advanced/text_edit.h"
 #include "servers/rendering/shader_language.h"
 
 void EditorNativeShaderSourceVisualizer::_load_theme_settings() {
diff --git a/editor/editor_native_shader_source_visualizer.h b/editor/editor_native_shader_source_visualizer.h
index 8ae942da7c9..76186c27167 100644
--- a/editor/editor_native_shader_source_visualizer.h
+++ b/editor/editor_native_shader_source_visualizer.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_NATIVE_SHADER_SOURCE_VISUALIZER_H
 #define EDITOR_NATIVE_SHADER_SOURCE_VISUALIZER_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/tab_container.h"
 #include "scene/resources/syntax_highlighter.h"
 
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 6b725240f9e..a99658a1d02 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -51,15 +51,15 @@
 #include "scene/2d/node_2d.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/animation/animation_tree.h"
-#include "scene/gui/color_picker.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/menu_bar.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/file_dialog.h"
+#include "scene/gui/advanced/menu_bar.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/rich_text_label.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/rich_text_label.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/main/window.h"
 #include "scene/property_utils.h"
diff --git a/editor/editor_node.h b/editor/editor_node.h
index de3af997473..9abbb15c958 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -32,6 +32,7 @@
 #define EDITOR_NODE_H
 
 #include "core/object/script_language.h"
+#include "core/string/ustring.h"
 #include "core/templates/safe_refcount.h"
 #include "editor/editor_data.h"
 #include "editor/editor_folding.h"
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 52780d7c588..8340b8d8286 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -50,7 +50,7 @@
 #include "scene/2d/gpu_particles_2d.h"
 #include "scene/3d/fog_volume.h"
 #include "scene/3d/gpu_particles_3d.h"
-#include "scene/gui/color_picker.h"
+#include "scene/gui/advanced/color_picker.h"
 #include "scene/gui/grid_container.h"
 #include "scene/main/window.h"
 #include "scene/resources/font.h"
diff --git a/editor/editor_run_native.h b/editor/editor_run_native.h
index b7638f235ed..cadf39d1530 100644
--- a/editor/editor_run_native.h
+++ b/editor/editor_run_native.h
@@ -31,10 +31,10 @@
 #ifndef EDITOR_RUN_NATIVE_H
 #define EDITOR_RUN_NATIVE_H
 
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/rich_text_label.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/rich_text_label.h"
 
 class EditorRunNative : public HBoxContainer {
 	GDCLASS(EditorRunNative, HBoxContainer);
diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp
index 94fda334922..5b410d02dbe 100644
--- a/editor/editor_sectioned_inspector.cpp
+++ b/editor/editor_sectioned_inspector.cpp
@@ -34,8 +34,8 @@
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/tree.h"
 
 static bool _property_path_matches(const String &p_property_path, const String &p_filter, EditorPropertyNameProcessor::Style p_style) {
 	if (p_property_path.containsn(p_filter)) {
diff --git a/editor/editor_sectioned_inspector.h b/editor/editor_sectioned_inspector.h
index 75f1569d36b..b0c99efe978 100644
--- a/editor/editor_sectioned_inspector.h
+++ b/editor/editor_sectioned_inspector.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_SECTIONED_INSPECTOR_H
 #define EDITOR_SECTIONED_INSPECTOR_H
 
-#include "scene/gui/split_container.h"
+#include "scene/gui/advanced/split_container.h"
 
 class CheckButton;
 class EditorInspector;
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index a246249cfe3..b877966e615 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -50,7 +50,7 @@
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_translation.h"
 #include "editor/engine_update_label.h"
-#include "scene/gui/color_picker.h"
+#include "scene/gui/advanced/color_picker.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
diff --git a/editor/editor_settings_dialog.cpp b/editor/editor_settings_dialog.cpp
index 607c922c691..5f980adc6f6 100644
--- a/editor/editor_settings_dialog.cpp
+++ b/editor/editor_settings_dialog.cpp
@@ -46,11 +46,11 @@
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 void EditorSettingsDialog::ok_pressed() {
 	if (!EditorSettings::get_singleton()) {
diff --git a/editor/editor_settings_dialog.h b/editor/editor_settings_dialog.h
index 4e6b312414e..0315b8b8ee6 100644
--- a/editor/editor_settings_dialog.h
+++ b/editor/editor_settings_dialog.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_SETTINGS_DIALOG_H
 #define EDITOR_SETTINGS_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class CheckButton;
 class EventListenerLineEdit;
diff --git a/editor/export/editor_export_platform.h b/editor/export/editor_export_platform.h
index 37cfaac5cb4..c8113e89674 100644
--- a/editor/export/editor_export_platform.h
+++ b/editor/export/editor_export_platform.h
@@ -38,7 +38,7 @@ struct EditorProgress;
 #include "core/io/zip_io.h"
 #include "core/os/shared_object.h"
 #include "editor_export_preset.h"
-#include "scene/gui/rich_text_label.h"
+#include "scene/gui/advanced/rich_text_label.h"
 #include "scene/main/node.h"
 #include "scene/resources/image_texture.h"
 
diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp
index 4b86431678e..fb5360dbb77 100644
--- a/editor/export/export_template_manager.cpp
+++ b/editor/export/export_template_manager.cpp
@@ -42,10 +42,10 @@
 #include "editor/export/editor_export_preset.h"
 #include "editor/progress_dialog.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/file_dialog.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/tree.h"
 #include "scene/main/http_request.h"
 
 enum DownloadsAvailability {
diff --git a/editor/export/export_template_manager.h b/editor/export/export_template_manager.h
index ccfe568d321..1bff1f39867 100644
--- a/editor/export/export_template_manager.h
+++ b/editor/export/export_template_manager.h
@@ -31,7 +31,7 @@
 #ifndef EXPORT_TEMPLATE_MANAGER_H
 #define EXPORT_TEMPLATE_MANAGER_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class EditorExportPreset;
 class ExportTemplateVersion;
diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp
index 5b93a1a17ec..aef849751fc 100644
--- a/editor/export/project_export.cpp
+++ b/editor/export/project_export.cpp
@@ -41,17 +41,17 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/import/resource_importer_texture_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/popup_menu.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/link_button.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 void ProjectExportTextureFormatError::_on_fix_texture_format_pressed() {
 	ProjectSettings::get_singleton()->set_setting(setting_identifier, true);
diff --git a/editor/export/project_export.h b/editor/export/project_export.h
index 68676bfc844..01674b7a626 100644
--- a/editor/export/project_export.h
+++ b/editor/export/project_export.h
@@ -32,7 +32,7 @@
 #define PROJECT_EXPORT_H
 
 #include "editor/export/editor_export_preset.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class CheckBox;
 class CheckButton;
diff --git a/editor/fbx_importer_manager.h b/editor/fbx_importer_manager.h
index 55061c041aa..e49bf853813 100644
--- a/editor/fbx_importer_manager.h
+++ b/editor/fbx_importer_manager.h
@@ -32,7 +32,7 @@
 #define FBX_IMPORTER_MANAGER_H
 
 #include "editor/gui/editor_file_dialog.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/line_edit.h"
 
 class FBXImporterManager : public ConfirmationDialog {
diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h
index 0ed0de3d59e..120cc0eb5e8 100644
--- a/editor/filesystem_dock.h
+++ b/editor/filesystem_dock.h
@@ -36,12 +36,12 @@
 #include "editor/file_info.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/script_create_dialog.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tree.h"
 
 class CreateDialog;
 class EditorDirDialog;
diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp
index cc3f3f2259d..6d3aaffb76f 100644
--- a/editor/find_in_files.cpp
+++ b/editor/find_in_files.cpp
@@ -36,15 +36,15 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/file_dialog.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/file_dialog.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/progress_bar.h"
-#include "scene/gui/tree.h"
 
 const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found";
 
diff --git a/editor/find_in_files.h b/editor/find_in_files.h
index c3760ed5208..3aefed8c58e 100644
--- a/editor/find_in_files.h
+++ b/editor/find_in_files.h
@@ -32,7 +32,7 @@
 #define FIND_IN_FILES_H
 
 #include "core/templates/hash_map.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 // Performs the actual search
 class FindInFiles : public Node {
diff --git a/editor/group_settings_editor.h b/editor/group_settings_editor.h
index 5be0013e96e..53c345364ac 100644
--- a/editor/group_settings_editor.h
+++ b/editor/group_settings_editor.h
@@ -31,7 +31,7 @@
 #ifndef GROUP_SETTINGS_EDITOR_H
 #define GROUP_SETTINGS_EDITOR_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class CheckBox;
 class EditorFileSystemDirectory;
diff --git a/editor/groups_editor.h b/editor/groups_editor.h
index 8a0ca067de3..8aaa2b9d519 100644
--- a/editor/groups_editor.h
+++ b/editor/groups_editor.h
@@ -31,7 +31,7 @@
 #ifndef GROUPS_EDITOR_H
 #define GROUPS_EDITOR_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class Button;
 class CheckBox;
diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp
index e984f196fbb..8391f102e04 100644
--- a/editor/gui/editor_bottom_panel.cpp
+++ b/editor/gui/editor_bottom_panel.cpp
@@ -37,10 +37,10 @@
 #include "editor/gui/editor_toaster.h"
 #include "editor/gui/editor_version_button.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/scroll_container.h"
-#include "scene/gui/split_container.h"
 
 void EditorBottomPanel::_notification(int p_what) {
 	switch (p_what) {
diff --git a/editor/gui/editor_dir_dialog.cpp b/editor/gui/editor_dir_dialog.cpp
index 481c8ed016b..59f11af353b 100644
--- a/editor/gui/editor_dir_dialog.cpp
+++ b/editor/gui/editor_dir_dialog.cpp
@@ -34,8 +34,8 @@
 #include "editor/editor_file_system.h"
 #include "editor/filesystem_dock.h"
 #include "editor/themes/editor_theme_manager.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/tree.h"
 #include "servers/display_server.h"
 
 void EditorDirDialog::_update_dir(const Color &p_default_folder_color, const Dictionary &p_assigned_folder_colors, const HashMap<String, Color> &p_folder_colors, bool p_is_dark_theme, TreeItem *p_item, EditorFileSystemDirectory *p_dir, const String &p_select_path) {
diff --git a/editor/gui/editor_dir_dialog.h b/editor/gui/editor_dir_dialog.h
index 491eb617493..3d02afaa95a 100644
--- a/editor/gui/editor_dir_dialog.h
+++ b/editor/gui/editor_dir_dialog.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_DIR_DIALOG_H
 #define EDITOR_DIR_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class DirectoryCreateDialog;
 class EditorFileSystemDirectory;
diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp
index 03fe1f7f988..3a96fe54853 100644
--- a/editor/gui/editor_file_dialog.cpp
+++ b/editor/gui/editor_file_dialog.cpp
@@ -40,14 +40,14 @@
 #include "editor/editor_settings.h"
 #include "editor/filesystem_dock.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
 #include "servers/display_server.h"
 
diff --git a/editor/gui/editor_file_dialog.h b/editor/gui/editor_file_dialog.h
index d1b37687df8..936fc6dddcd 100644
--- a/editor/gui/editor_file_dialog.h
+++ b/editor/gui/editor_file_dialog.h
@@ -33,7 +33,7 @@
 
 #include "core/io/dir_access.h"
 #include "editor/file_info.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/property_list_helper.h"
 
 class DependencyRemoveDialog;
diff --git a/editor/gui/editor_object_selector.h b/editor/gui/editor_object_selector.h
index 60d6df488b7..8a26262fcb4 100644
--- a/editor/gui/editor_object_selector.h
+++ b/editor/gui/editor_object_selector.h
@@ -31,10 +31,10 @@
 #ifndef EDITOR_OBJECT_SELECTOR_H
 #define EDITOR_OBJECT_SELECTOR_H
 
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/texture_rect.h"
 
 class EditorSelectionHistory;
diff --git a/editor/gui/editor_quick_open_dialog.cpp b/editor/gui/editor_quick_open_dialog.cpp
index 40b2242f460..33278a4361b 100644
--- a/editor/gui/editor_quick_open_dialog.cpp
+++ b/editor/gui/editor_quick_open_dialog.cpp
@@ -40,6 +40,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/filesystem_dock.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/flow_container.h"
@@ -47,7 +48,6 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 void HighlightedLabel::draw_substr_rects(const Vector2i &p_substr, Vector2 p_offset, int p_line_limit, int line_spacing) {
 	for (int i = get_lines_skipped(); i < p_line_limit; i++) {
diff --git a/editor/gui/editor_quick_open_dialog.h b/editor/gui/editor_quick_open_dialog.h
index a5f396d734b..44d89bb264c 100644
--- a/editor/gui/editor_quick_open_dialog.h
+++ b/editor/gui/editor_quick_open_dialog.h
@@ -32,7 +32,7 @@
 #define EDITOR_QUICK_OPEN_DIALOG_H
 
 #include "core/templates/oa_hash_map.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/margin_container.h"
 
 class Button;
diff --git a/editor/gui/editor_run_bar.cpp b/editor/gui/editor_run_bar.cpp
index 288ea96b609..4414d13cf31 100644
--- a/editor/gui/editor_run_bar.cpp
+++ b/editor/gui/editor_run_bar.cpp
@@ -42,9 +42,9 @@
 #include "editor/gui/editor_quick_open_dialog.h"
 #include "editor/gui/editor_toaster.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/panel_container.h"
 
 #ifndef _3D_DISABLED
diff --git a/editor/gui/editor_scene_tabs.cpp b/editor/gui/editor_scene_tabs.cpp
index 77d020f7ab3..fc956c1b865 100644
--- a/editor/gui/editor_scene_tabs.cpp
+++ b/editor/gui/editor_scene_tabs.cpp
@@ -40,11 +40,11 @@
 #include "editor/inspector_dock.h"
 #include "editor/plugins/editor_context_menu_plugin.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/tab_bar.h"
 #include "scene/gui/texture_rect.h"
 
diff --git a/editor/gui/scene_tree_editor.h b/editor/gui/scene_tree_editor.h
index d29c4df0cdb..2a376110074 100644
--- a/editor/gui/scene_tree_editor.h
+++ b/editor/gui/scene_tree_editor.h
@@ -31,10 +31,10 @@
 #ifndef SCENE_TREE_EDITOR_H
 #define SCENE_TREE_EDITOR_H
 
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
 
 class EditorSelection;
 class TextureRect;
diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp
index 71b010a9702..a331b1a9f6e 100644
--- a/editor/import/3d/scene_import_settings.cpp
+++ b/editor/import/3d/scene_import_settings.cpp
@@ -41,7 +41,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/animation/animation_player.h"
-#include "scene/gui/subviewport_container.h"
+#include "scene/gui/advanced/subviewport_container.h"
 #include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/surface_tool.h"
 
diff --git a/editor/import/3d/scene_import_settings.h b/editor/import/3d/scene_import_settings.h
index 73cdb130505..bb5fef814b2 100644
--- a/editor/import/3d/scene_import_settings.h
+++ b/editor/import/3d/scene_import_settings.h
@@ -36,14 +36,14 @@
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
-#include "scene/gui/tree.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/3d/sky_material.h"
 
diff --git a/editor/import/audio_stream_import_settings.h b/editor/import/audio_stream_import_settings.h
index 931faf45aff..84a384a3a05 100644
--- a/editor/import/audio_stream_import_settings.h
+++ b/editor/import/audio_stream_import_settings.h
@@ -33,9 +33,9 @@
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/audio/audio_stream_player.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/color_rect.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/spin_box.h"
 #include "scene/resources/texture.h"
 
 class CheckBox;
diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp
index 6fd80d8403f..39b080a06fe 100644
--- a/editor/import/dynamic_font_import_settings.cpp
+++ b/editor/import/dynamic_font_import_settings.cpp
@@ -39,7 +39,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/split_container.h"
+#include "scene/gui/advanced/split_container.h"
 
 /*************************************************************************/
 /* Settings data                                                         */
diff --git a/editor/import/dynamic_font_import_settings.h b/editor/import/dynamic_font_import_settings.h
index eeb860ba68d..5cbc66d2a4e 100644
--- a/editor/import/dynamic_font_import_settings.h
+++ b/editor/import/dynamic_font_import_settings.h
@@ -33,10 +33,10 @@
 
 #include "core/io/resource_importer.h"
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/text_edit.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/tab_container.h"
-#include "scene/gui/text_edit.h"
-#include "scene/gui/tree.h"
 #include "scene/resources/font.h"
 
 class DynamicFontImportSettingsDialog;
diff --git a/editor/import_defaults_editor.h b/editor/import_defaults_editor.h
index ccc74f39a5c..559ff853d78 100644
--- a/editor/import_defaults_editor.h
+++ b/editor/import_defaults_editor.h
@@ -31,9 +31,9 @@
 #ifndef IMPORT_DEFAULTS_EDITOR_H
 #define IMPORT_DEFAULTS_EDITOR_H
 
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/option_button.h"
 
 class ImportDefaultsEditorSettings;
 class EditorInspector;
diff --git a/editor/import_dock.h b/editor/import_dock.h
index 6a6c54f1ceb..9ed4cd3269f 100644
--- a/editor/import_dock.h
+++ b/editor/import_dock.h
@@ -35,11 +35,11 @@
 #include "core/io/resource_importer.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_inspector.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/popup_menu.h"
 
 class ImportDockParameters;
 class ImportDock : public VBoxContainer {
diff --git a/editor/input_event_configuration_dialog.cpp b/editor/input_event_configuration_dialog.cpp
index 8d9617bc90f..691f23c3fbf 100644
--- a/editor/input_event_configuration_dialog.cpp
+++ b/editor/input_event_configuration_dialog.cpp
@@ -33,11 +33,11 @@
 #include "editor/editor_string_names.h"
 #include "editor/event_listener_line_edit.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/tree.h"
 
 void InputEventConfigurationDialog::_set_event(const Ref<InputEvent> &p_event, const Ref<InputEvent> &p_original_event, bool p_update_input_list_selection) {
 	if (p_event.is_valid()) {
diff --git a/editor/input_event_configuration_dialog.h b/editor/input_event_configuration_dialog.h
index b27f25a5b78..704f504184b 100644
--- a/editor/input_event_configuration_dialog.h
+++ b/editor/input_event_configuration_dialog.h
@@ -31,7 +31,7 @@
 #ifndef INPUT_EVENT_CONFIGURATION_DIALOG_H
 #define INPUT_EVENT_CONFIGURATION_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class OptionButton;
 class Tree;
diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h
index 924f7abdd2f..fb61b84edc9 100644
--- a/editor/inspector_dock.h
+++ b/editor/inspector_dock.h
@@ -34,12 +34,12 @@
 #include "editor/create_dialog.h"
 #include "editor/editor_data.h"
 #include "editor/editor_inspector.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/tree.h"
 
 class EditorFileDialog;
 class EditorObjectSelector;
diff --git a/editor/localization_editor.h b/editor/localization_editor.h
index eb6e5b93c7d..6d6b8e61443 100644
--- a/editor/localization_editor.h
+++ b/editor/localization_editor.h
@@ -32,8 +32,8 @@
 #define LOCALIZATION_EDITOR_H
 
 #include "editor/editor_locale_dialog.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/tree.h"
 
 class EditorFileDialog;
 class FileSystemDock;
diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp
index 553670cb670..2f722cc32b0 100644
--- a/editor/plugins/abstract_polygon_2d_editor.cpp
+++ b/editor/plugins/abstract_polygon_2d_editor.cpp
@@ -38,8 +38,8 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 
 bool AbstractPolygon2DEditor::Vertex::operator==(const AbstractPolygon2DEditor::Vertex &p_vertex) const {
 	return polygon == p_vertex.polygon && vertex == p_vertex.vertex;
diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp
index 4f185b9d09c..8eadad9e2b7 100644
--- a/editor/plugins/animation_blend_space_1d_editor.cpp
+++ b/editor/plugins/animation_blend_space_1d_editor.cpp
@@ -38,13 +38,13 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
 
 StringName AnimationNodeBlendSpace1DEditor::get_blend_position_path() const {
 	StringName path = AnimationTreeEditor::get_singleton()->get_base_path() + "blend_position";
diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h
index 9409fb611d2..e0b852a88aa 100644
--- a/editor/plugins/animation_blend_space_1d_editor.h
+++ b/editor/plugins/animation_blend_space_1d_editor.h
@@ -34,7 +34,7 @@
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_blend_space_1d.h"
-#include "scene/gui/graph_edit.h"
+#include "scene/gui/advanced/graph_edit.h"
 
 class Button;
 class CheckBox;
diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp
index ac87f4bb26d..771ee63aa13 100644
--- a/editor/plugins/animation_blend_space_2d_editor.cpp
+++ b/editor/plugins/animation_blend_space_2d_editor.cpp
@@ -41,16 +41,16 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
 #include "scene/main/window.h"
 
 bool AnimationNodeBlendSpace2DEditor::can_edit(const Ref<AnimationNode> &p_node) {
diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/plugins/animation_blend_space_2d_editor.h
index acc718d1de5..78bee07c6b6 100644
--- a/editor/plugins/animation_blend_space_2d_editor.h
+++ b/editor/plugins/animation_blend_space_2d_editor.h
@@ -34,7 +34,7 @@
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_blend_space_2d.h"
-#include "scene/gui/graph_edit.h"
+#include "scene/gui/advanced/graph_edit.h"
 
 class Button;
 class CheckBox;
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp
index d39ce5f96cb..16c972809dd 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -41,10 +41,10 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/skeleton_3d.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/view_panner.h"
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h
index 1d1b3651475..73a31372d82 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.h
+++ b/editor/plugins/animation_blend_tree_editor_plugin.h
@@ -35,11 +35,11 @@
 #include "editor/editor_inspector.h"
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "scene/animation/animation_blend_tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/graph_edit.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/graph_edit.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/tree.h"
 
 class AcceptDialog;
 class CheckBox;
diff --git a/editor/plugins/animation_library_editor.h b/editor/plugins/animation_library_editor.h
index 82bd2d13fc4..ab79f279f4e 100644
--- a/editor/plugins/animation_library_editor.h
+++ b/editor/plugins/animation_library_editor.h
@@ -35,8 +35,8 @@
 #include "core/templates/vector.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_mixer.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 
 class AnimationMixer;
 class EditorFileDialog;
diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h
index 5295934dfcb..b3ff1fcdfac 100644
--- a/editor/plugins/animation_player_editor_plugin.h
+++ b/editor/plugins/animation_player_editor_plugin.h
@@ -35,11 +35,11 @@
 #include "editor/plugins/animation_library_editor.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_player.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/texture_button.h"
-#include "scene/gui/tree.h"
 
 class AnimationPlayerEditorPlugin;
 class ImageTexture;
diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp
index f5159818f34..9d5e232a897 100644
--- a/editor/plugins/animation_state_machine_editor.cpp
+++ b/editor/plugins/animation_state_machine_editor.cpp
@@ -39,10 +39,10 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
-#include "scene/gui/option_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/tree.h"
 #include "scene/main/viewport.h"
 #include "scene/main/window.h"
 #include "scene/resources/style_box_flat.h"
diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h
index f6dd5850daf..cd1ce249edb 100644
--- a/editor/plugins/animation_state_machine_editor.h
+++ b/editor/plugins/animation_state_machine_editor.h
@@ -33,9 +33,9 @@
 
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "scene/animation/animation_node_state_machine.h"
-#include "scene/gui/graph_edit.h"
+#include "scene/gui/advanced/graph_edit.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/tree.h"
 
 class ConfirmationDialog;
 class EditorFileDialog;
diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h
index 3466ad602eb..e8bebee075c 100644
--- a/editor/plugins/animation_tree_editor_plugin.h
+++ b/editor/plugins/animation_tree_editor_plugin.h
@@ -33,7 +33,7 @@
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_tree.h"
-#include "scene/gui/graph_edit.h"
+#include "scene/gui/advanced/graph_edit.h"
 
 class Button;
 class EditorFileDialog;
diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp
index f3692ad40df..1c0d7037c18 100644
--- a/editor/plugins/asset_library_editor_plugin.cpp
+++ b/editor/plugins/asset_library_editor_plugin.cpp
@@ -42,7 +42,7 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/project_settings_editor.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/image_texture.h"
 
diff --git a/editor/plugins/asset_library_editor_plugin.h b/editor/plugins/asset_library_editor_plugin.h
index 73b39029fe9..9cb3bc77e87 100644
--- a/editor/plugins/asset_library_editor_plugin.h
+++ b/editor/plugins/asset_library_editor_plugin.h
@@ -33,15 +33,15 @@
 
 #include "editor/editor_asset_installer.h"
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/rich_text_label.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/link_button.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/progress_bar.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/texture_button.h"
 #include "scene/gui/texture_rect.h"
diff --git a/editor/plugins/bone_map_editor_plugin.h b/editor/plugins/bone_map_editor_plugin.h
index a4a938e18df..c99f859ec35 100644
--- a/editor/plugins/bone_map_editor_plugin.h
+++ b/editor/plugins/bone_map_editor_plugin.h
@@ -36,9 +36,10 @@
 #include "editor/plugins/editor_plugin.h"
 
 #include "scene/3d/skeleton_3d.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/color_rect.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/texture_button.h"
 #include "scene/resources/bone_map.h"
 #include "scene/resources/texture.h"
 
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 7381f2ab83a..20451fb5387 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -53,12 +53,12 @@
 #include "scene/2d/skeleton_2d.h"
 #include "scene/2d/sprite_2d.h"
 #include "scene/2d/touch_screen_button.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/subviewport_container.h"
 #include "scene/gui/base_button.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/subviewport_container.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
diff --git a/editor/plugins/control_editor_plugin.h b/editor/plugins/control_editor_plugin.h
index b0a4de876ed..4f5507c6bd3 100644
--- a/editor/plugins/control_editor_plugin.h
+++ b/editor/plugins/control_editor_plugin.h
@@ -33,13 +33,13 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/separator.h"
diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp
index aaf7c427f0f..96e8e820b7b 100644
--- a/editor/plugins/curve_editor_plugin.cpp
+++ b/editor/plugins/curve_editor_plugin.cpp
@@ -41,9 +41,9 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/flow_container.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/image_texture.h"
 
diff --git a/editor/plugins/editor_context_menu_plugin.cpp b/editor/plugins/editor_context_menu_plugin.cpp
index 7af5029c7b3..32d0929419f 100644
--- a/editor/plugins/editor_context_menu_plugin.cpp
+++ b/editor/plugins/editor_context_menu_plugin.cpp
@@ -32,7 +32,7 @@
 
 #include "core/input/shortcut.h"
 #include "editor/editor_string_names.h"
-#include "scene/gui/popup_menu.h"
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/resources/texture.h"
 
 void EditorContextMenuPlugin::get_options(const Vector<String> &p_paths) {
diff --git a/editor/plugins/editor_plugin.cpp b/editor/plugins/editor_plugin.cpp
index 677196368cd..72aff37eb82 100644
--- a/editor/plugins/editor_plugin.cpp
+++ b/editor/plugins/editor_plugin.cpp
@@ -54,7 +54,7 @@
 #include "editor/project_settings_editor.h"
 #include "editor/scene_tree_dock.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/gui/popup_menu.h"
+#include "scene/gui/advanced/popup_menu.h"
 
 void EditorPlugin::add_custom_type(const String &p_type, const String &p_base, const Ref<Script> &p_script, const Ref<Texture2D> &p_icon) {
 	EditorNode::get_editor_data().add_custom_type(p_type, p_base, p_script, p_icon);
diff --git a/editor/plugins/editor_plugin_settings.cpp b/editor/plugins/editor_plugin_settings.cpp
index a80eb2a2a14..c9eeff5419d 100644
--- a/editor/plugins/editor_plugin_settings.cpp
+++ b/editor/plugins/editor_plugin_settings.cpp
@@ -37,10 +37,10 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 
 void EditorPluginSettings::_notification(int p_what) {
 	switch (p_what) {
diff --git a/editor/plugins/game_view_plugin.cpp b/editor/plugins/game_view_plugin.cpp
index 30c558e0bd5..285099596f3 100644
--- a/editor/plugins/game_view_plugin.cpp
+++ b/editor/plugins/game_view_plugin.cpp
@@ -47,9 +47,9 @@
 #include "editor/plugins/embedded_process.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/window_wrapper.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/separator.h"
 
diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp
index 291ffc24d2b..ce315bcf64e 100644
--- a/editor/plugins/gradient_editor_plugin.cpp
+++ b/editor/plugins/gradient_editor_plugin.cpp
@@ -39,7 +39,7 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/color_picker.h"
+#include "scene/gui/advanced/color_picker.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/separator.h"
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp
index b17e9927ab8..2456144cf9b 100644
--- a/editor/plugins/material_editor_plugin.cpp
+++ b/editor/plugins/material_editor_plugin.cpp
@@ -39,11 +39,11 @@
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
+#include "scene/gui/advanced/subviewport_container.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/color_rect.h"
 #include "scene/gui/label.h"
-#include "scene/gui/subviewport_container.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/3d/fog_material.h"
 #include "scene/resources/3d/sky_material.h"
diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h
index 03db497888a..e173dc26f61 100644
--- a/editor/plugins/mesh_editor_plugin.h
+++ b/editor/plugins/mesh_editor_plugin.h
@@ -36,7 +36,7 @@
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/gui/subviewport_container.h"
+#include "scene/gui/advanced/subviewport_container.h"
 #include "scene/resources/camera_attributes.h"
 
 class SubViewport;
diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
index 58e9e16834b..893dae95b57 100644
--- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
@@ -39,11 +39,11 @@
 #include "scene/3d/navigation_region_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/aspect_ratio_container.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/spin_box.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.h b/editor/plugins/mesh_instance_3d_editor_plugin.h
index 2744c98a320..b81ac08fad6 100644
--- a/editor/plugins/mesh_instance_3d_editor_plugin.h
+++ b/editor/plugins/mesh_instance_3d_editor_plugin.h
@@ -33,7 +33,7 @@
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/gui/option_button.h"
+#include "scene/gui/advanced/option_button.h"
 
 class AcceptDialog;
 class AspectRatioContainer;
diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp
index e3a66180908..353d8691614 100644
--- a/editor/plugins/mesh_library_editor_plugin.cpp
+++ b/editor/plugins/mesh_library_editor_plugin.cpp
@@ -41,7 +41,7 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/navigation_region_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/resources/packed_scene.h"
 
 void MeshLibraryEditor::edit(const Ref<MeshLibrary> &p_mesh_library) {
diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp
index efc65baecf6..09b8fe66687 100644
--- a/editor/plugins/multimesh_editor_plugin.cpp
+++ b/editor/plugins/multimesh_editor_plugin.cpp
@@ -35,9 +35,9 @@
 #include "editor/gui/scene_tree_editor.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 
 void MultiMeshEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h
index af83d5fbc86..d4e6abef822 100644
--- a/editor/plugins/multimesh_editor_plugin.h
+++ b/editor/plugins/multimesh_editor_plugin.h
@@ -33,8 +33,8 @@
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/multimesh_instance_3d.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
 
 class AcceptDialog;
 class ConfirmationDialog;
diff --git a/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp b/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp
index f82e320da82..db0634d748a 100644
--- a/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp
+++ b/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp
@@ -37,8 +37,8 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/navigation_obstacle_3d.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "servers/navigation_server_3d.h"
 
 bool NavigationObstacle3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
diff --git a/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp
index 5368e1ab235..01fca91df81 100644
--- a/editor/plugins/navigation_polygon_editor_plugin.cpp
+++ b/editor/plugins/navigation_polygon_editor_plugin.cpp
@@ -34,7 +34,7 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "scene/2d/navigation_region_2d.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 Ref<NavigationPolygon> NavigationPolygonEditor::_ensure_navpoly() const {
 	Ref<NavigationPolygon> navpoly = node->get_navigation_polygon();
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index 058adbdb197..1fc53b5701b 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -91,12 +91,12 @@
 #include "scene/3d/sprite_3d.h"
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/3d/world_environment.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/subviewport_container.h"
 #include "scene/gui/center_container.h"
-#include "scene/gui/color_picker.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/subviewport_container.h"
 #include "scene/resources/3d/sky_material.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/surface_tool.h"
diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h
index 27c709fb064..1a480124c14 100644
--- a/editor/plugins/node_3d_editor_plugin.h
+++ b/editor/plugins/node_3d_editor_plugin.h
@@ -35,9 +35,9 @@
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/node_3d_editor_gizmos.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/spin_box.h"
 #include "scene/resources/immediate_mesh.h"
 
 class AcceptDialog;
diff --git a/editor/plugins/parallax_background_editor_plugin.cpp b/editor/plugins/parallax_background_editor_plugin.cpp
index e802f425963..53d29ddefaa 100644
--- a/editor/plugins/parallax_background_editor_plugin.cpp
+++ b/editor/plugins/parallax_background_editor_plugin.cpp
@@ -37,8 +37,8 @@
 #include "scene/2d/parallax_2d.h"
 #include "scene/2d/parallax_background.h"
 #include "scene/2d/parallax_layer.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/menu_button.h"
 
 void ParallaxBackgroundEditorPlugin::edit(Object *p_object) {
 	parallax_background = Object::cast_to<ParallaxBackground>(p_object);
diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp
index 036fc7d9904..1b16ec32edc 100644
--- a/editor/plugins/particles_editor_plugin.cpp
+++ b/editor/plugins/particles_editor_plugin.cpp
@@ -42,9 +42,9 @@
 #include "scene/3d/cpu_particles_3d.h"
 #include "scene/3d/gpu_particles_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/spin_box.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/particle_process_material.h"
 
diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp
index 31bc80a7f16..5e9d9def263 100644
--- a/editor/plugins/path_2d_editor_plugin.cpp
+++ b/editor/plugins/path_2d_editor_plugin.cpp
@@ -36,8 +36,8 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
 
 void Path2DEditor::_notification(int p_what) {
 	switch (p_what) {
diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp
index 81e93cc460d..9c45a6c50c1 100644
--- a/editor/plugins/path_3d_editor_plugin.cpp
+++ b/editor/plugins/path_3d_editor_plugin.cpp
@@ -38,8 +38,8 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "node_3d_editor_plugin.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/resources/curve.h"
 
 String Path3DGizmo::get_handle_name(int p_id, bool p_secondary) const {
diff --git a/editor/plugins/plugin_config_dialog.h b/editor/plugins/plugin_config_dialog.h
index c95b8f567b8..d5a4412f1e4 100644
--- a/editor/plugins/plugin_config_dialog.h
+++ b/editor/plugins/plugin_config_dialog.h
@@ -31,11 +31,11 @@
 #ifndef PLUGIN_CONFIG_DIALOG_H
 #define PLUGIN_CONFIG_DIALOG_H
 
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/text_edit.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/text_edit.h"
 
 class ConfigFile;
 class EditorValidationPanel;
diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp
index 4ecbab1549d..1fde09d1833 100644
--- a/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -41,16 +41,16 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/skeleton_2d.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/view_panner.h"
 
 Node2D *Polygon2DEditor::_get_node() const {
diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h
index 25e9be222cd..b4a1fd095bc 100644
--- a/editor/plugins/resource_preloader_editor_plugin.h
+++ b/editor/plugins/resource_preloader_editor_plugin.h
@@ -32,9 +32,9 @@
 #define RESOURCE_PRELOADER_EDITOR_PLUGIN_H
 
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/tree.h"
 #include "scene/main/resource_preloader.h"
 
 class EditorFileDialog;
diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp
index 9016c65008f..bead700a7f6 100644
--- a/editor/plugins/root_motion_editor_plugin.cpp
+++ b/editor/plugins/root_motion_editor_plugin.cpp
@@ -34,9 +34,9 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/animation/animation_mixer.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
 
 void EditorPropertyRootMotion::_confirmed() {
 	TreeItem *ti = filters->get_selected();
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index 02e0529a7cf..25f1a42e560 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -33,7 +33,7 @@
 
 #include "core/object/script_language.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/panel_container.h"
 #include "scene/resources/syntax_highlighter.h"
 #include "scene/resources/text_file.h"
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 70a2960f086..5ed2e987a0f 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -43,9 +43,9 @@
 #include "editor/gui/editor_toaster.h"
 #include "editor/plugins/editor_context_menu_plugin.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/rich_text_label.h"
-#include "scene/gui/split_container.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/rich_text_label.h"
+#include "scene/gui/advanced/split_container.h"
 
 void ConnectionInfoDialog::ok_pressed() {
 }
diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h
index 6bf3f9f1ded..31251f225e4 100644
--- a/editor/plugins/script_text_editor.h
+++ b/editor/plugins/script_text_editor.h
@@ -34,9 +34,9 @@
 #include "script_editor_plugin.h"
 
 #include "editor/code_editor.h"
-#include "scene/gui/color_picker.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 
 class RichTextLabel;
 
diff --git a/editor/plugins/shader_file_editor_plugin.cpp b/editor/plugins/shader_file_editor_plugin.cpp
index d955f84b170..4666ff7e13d 100644
--- a/editor/plugins/shader_file_editor_plugin.cpp
+++ b/editor/plugins/shader_file_editor_plugin.cpp
@@ -35,8 +35,8 @@
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_bottom_panel.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/split_container.h"
 #include "servers/display_server.h"
 
 /*** SHADER SCRIPT EDITOR ****/
diff --git a/editor/plugins/shader_file_editor_plugin.h b/editor/plugins/shader_file_editor_plugin.h
index 426cdfafea0..73bf42dbeef 100644
--- a/editor/plugins/shader_file_editor_plugin.h
+++ b/editor/plugins/shader_file_editor_plugin.h
@@ -32,9 +32,9 @@
 #define SHADER_FILE_EDITOR_PLUGIN_H
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/advanced/rich_text_label.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "servers/rendering/rendering_device_binds.h"
 
 class ItemList;
diff --git a/editor/plugins/skeleton_2d_editor_plugin.cpp b/editor/plugins/skeleton_2d_editor_plugin.cpp
index 6cc098e5f8e..03def6cf5b0 100644
--- a/editor/plugins/skeleton_2d_editor_plugin.cpp
+++ b/editor/plugins/skeleton_2d_editor_plugin.cpp
@@ -34,8 +34,8 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
 
 void Skeleton2DEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
diff --git a/editor/plugins/sprite_2d_editor_plugin.cpp b/editor/plugins/sprite_2d_editor_plugin.cpp
index 4c9ace75a01..b6966e89a69 100644
--- a/editor/plugins/sprite_2d_editor_plugin.cpp
+++ b/editor/plugins/sprite_2d_editor_plugin.cpp
@@ -42,10 +42,11 @@
 #include "scene/2d/mesh_instance_2d.h"
 #include "scene/2d/physics/collision_polygon_2d.h"
 #include "scene/2d/polygon_2d.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/view_panner.h"
+#include "scene/resources/bit_map.h"
 #include "thirdparty/clipper2/include/clipper2/clipper.h"
 
 #define PRECISION 1
diff --git a/editor/plugins/sprite_2d_editor_plugin.h b/editor/plugins/sprite_2d_editor_plugin.h
index 2b86b20a58a..7ffe1176e9a 100644
--- a/editor/plugins/sprite_2d_editor_plugin.h
+++ b/editor/plugins/sprite_2d_editor_plugin.h
@@ -33,7 +33,7 @@
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/2d/sprite_2d.h"
-#include "scene/gui/spin_box.h"
+#include "scene/gui/advanced/spin_box.h"
 
 class AcceptDialog;
 class ConfirmationDialog;
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
index b0b9727c05a..6b3d143ecd8 100644
--- a/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -45,10 +45,10 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/animated_sprite_2d.h"
 #include "scene/3d/sprite_3d.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/atlas_texture.h"
diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h
index 6e58a355a0a..5868d4c52c3 100644
--- a/editor/plugins/sprite_frames_editor_plugin.h
+++ b/editor/plugins/sprite_frames_editor_plugin.h
@@ -32,15 +32,15 @@
 #define SPRITE_FRAMES_EDITOR_PLUGIN_H
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/scroll_container.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/sprite_frames.h"
 
diff --git a/editor/plugins/text_editor.cpp b/editor/plugins/text_editor.cpp
index 5ba1b201e5b..8835ca78ad1 100644
--- a/editor/plugins/text_editor.cpp
+++ b/editor/plugins/text_editor.cpp
@@ -33,8 +33,8 @@
 #include "core/io/json.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/split_container.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/split_container.h"
 
 void TextEditor::add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
 	ERR_FAIL_COND(p_highlighter.is_null());
diff --git a/editor/plugins/text_shader_editor.cpp b/editor/plugins/text_shader_editor.cpp
index 693cf2436ef..de4d5510d22 100644
--- a/editor/plugins/text_shader_editor.cpp
+++ b/editor/plugins/text_shader_editor.cpp
@@ -38,7 +38,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
-#include "scene/gui/split_container.h"
+#include "scene/gui/advanced/split_container.h"
 #include "servers/rendering/shader_preprocessor.h"
 #include "servers/rendering/shader_types.h"
 
diff --git a/editor/plugins/text_shader_editor.h b/editor/plugins/text_shader_editor.h
index 21d57c5ee6e..6e4e21937dc 100644
--- a/editor/plugins/text_shader_editor.h
+++ b/editor/plugins/text_shader_editor.h
@@ -33,8 +33,8 @@
 
 #include "editor/code_editor.h"
 #include "editor/plugins/shader/shader_editor.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/rich_text_label.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/rich_text_label.h"
 #include "servers/rendering/shader_warnings.h"
 
 class GDShaderSyntaxHighlighter : public CodeHighlighter {
diff --git a/editor/plugins/texture_3d_editor_plugin.h b/editor/plugins/texture_3d_editor_plugin.h
index 58424955ec4..e4acd28f01c 100644
--- a/editor/plugins/texture_3d_editor_plugin.h
+++ b/editor/plugins/texture_3d_editor_plugin.h
@@ -33,7 +33,7 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/spin_box.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
 
diff --git a/editor/plugins/texture_layered_editor_plugin.h b/editor/plugins/texture_layered_editor_plugin.h
index d226417525d..dfd3b1c2110 100644
--- a/editor/plugins/texture_layered_editor_plugin.h
+++ b/editor/plugins/texture_layered_editor_plugin.h
@@ -33,7 +33,7 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/spin_box.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
 
diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp
index 30c3fd7923a..e91b0df4d9c 100644
--- a/editor/plugins/texture_region_editor_plugin.cpp
+++ b/editor/plugins/texture_region_editor_plugin.cpp
@@ -39,11 +39,11 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/sprite_2d.h"
 #include "scene/3d/sprite_3d.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/nine_patch_rect.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/view_panner.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/style_box_texture.h"
diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h
index ae1f8381c60..e88625dc523 100644
--- a/editor/plugins/texture_region_editor_plugin.h
+++ b/editor/plugins/texture_region_editor_plugin.h
@@ -33,7 +33,7 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class AtlasTexture;
 class NinePatchRect;
diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp
index ca0372929da..75a4d2a8802 100644
--- a/editor/plugins/theme_editor_plugin.cpp
+++ b/editor/plugins/theme_editor_plugin.cpp
@@ -42,15 +42,15 @@
 #include "editor/inspector_dock.h"
 #include "editor/progress_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/color_picker.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_bar.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h
index 12b4a5fa366..4ec5ae8c5e2 100644
--- a/editor/plugins/theme_editor_plugin.h
+++ b/editor/plugins/theme_editor_plugin.h
@@ -33,9 +33,9 @@
 
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/theme_editor_preview.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/tree.h"
 #include "scene/resources/theme.h"
 
 class Button;
diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp
index cfeb9992542..2d18a59c274 100644
--- a/editor/plugins/theme_editor_preview.cpp
+++ b/editor/plugins/theme_editor_preview.cpp
@@ -34,23 +34,23 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/text_edit.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/color_picker.h"
 #include "scene/gui/color_rect.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/tab_container.h"
-#include "scene/gui/text_edit.h"
-#include "scene/gui/tree.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/editor/plugins/tiles/atlas_merging_dialog.cpp b/editor/plugins/tiles/atlas_merging_dialog.cpp
index 000915731b2..69d9a3c03d2 100644
--- a/editor/plugins/tiles/atlas_merging_dialog.cpp
+++ b/editor/plugins/tiles/atlas_merging_dialog.cpp
@@ -33,8 +33,8 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/control.h"
-#include "scene/gui/split_container.h"
 #include "scene/resources/image_texture.h"
 
 void AtlasMergingDialog::_property_changed(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing) {
diff --git a/editor/plugins/tiles/atlas_merging_dialog.h b/editor/plugins/tiles/atlas_merging_dialog.h
index 5385489b6e4..20d5f1465cc 100644
--- a/editor/plugins/tiles/atlas_merging_dialog.h
+++ b/editor/plugins/tiles/atlas_merging_dialog.h
@@ -32,7 +32,7 @@
 #define ATLAS_MERGING_DIALOG_H
 
 #include "editor/editor_properties.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/2d/tile_set.h"
diff --git a/editor/plugins/tiles/tile_data_editors.cpp b/editor/plugins/tiles/tile_data_editors.cpp
index 00649a7829a..5eeff464e63 100644
--- a/editor/plugins/tiles/tile_data_editors.cpp
+++ b/editor/plugins/tiles/tile_data_editors.cpp
@@ -42,12 +42,12 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/themes/editor_scale.h"
 
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
 
 #include "servers/navigation_server_2d.h"
 
diff --git a/editor/plugins/tiles/tile_map_layer_editor.cpp b/editor/plugins/tiles/tile_map_layer_editor.cpp
index e243faca3a2..bf15f910589 100644
--- a/editor/plugins/tiles/tile_map_layer_editor.cpp
+++ b/editor/plugins/tiles/tile_map_layer_editor.cpp
@@ -40,7 +40,7 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/tile_map_layer.h"
-#include "scene/gui/split_container.h"
+#include "scene/gui/advanced/split_container.h"
 
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
diff --git a/editor/plugins/tiles/tile_map_layer_editor.h b/editor/plugins/tiles/tile_map_layer_editor.h
index 1eee26c0016..91765ac065c 100644
--- a/editor/plugins/tiles/tile_map_layer_editor.h
+++ b/editor/plugins/tiles/tile_map_layer_editor.h
@@ -35,17 +35,17 @@
 
 #include "core/os/thread.h"
 #include "scene/2d/tile_map.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tab_bar.h"
-#include "scene/gui/tree.h"
 
 class TileMapLayerEditor;
 
diff --git a/editor/plugins/tiles/tile_proxies_manager_dialog.cpp b/editor/plugins/tiles/tile_proxies_manager_dialog.cpp
index 91e3557387a..ec6ff07d4ac 100644
--- a/editor/plugins/tiles/tile_proxies_manager_dialog.cpp
+++ b/editor/plugins/tiles/tile_proxies_manager_dialog.cpp
@@ -33,7 +33,7 @@
 #include "editor/editor_properties_vector.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "scene/gui/popup_menu.h"
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/separator.h"
 
 void TileProxiesManagerDialog::_right_clicked(int p_item, Vector2 p_local_mouse_pos, MouseButton p_mouse_button_index, Object *p_item_list) {
diff --git a/editor/plugins/tiles/tile_proxies_manager_dialog.h b/editor/plugins/tiles/tile_proxies_manager_dialog.h
index fbbdb0d6a06..88ec5ddee3a 100644
--- a/editor/plugins/tiles/tile_proxies_manager_dialog.h
+++ b/editor/plugins/tiles/tile_proxies_manager_dialog.h
@@ -32,7 +32,7 @@
 #define TILE_PROXIES_MANAGER_DIALOG_H
 
 #include "editor/editor_properties.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/resources/2d/tile_set.h"
 
diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.h b/editor/plugins/tiles/tile_set_atlas_source_editor.h
index b729364d155..66aac4c7660 100644
--- a/editor/plugins/tiles/tile_set_atlas_source_editor.h
+++ b/editor/plugins/tiles/tile_set_atlas_source_editor.h
@@ -34,7 +34,7 @@
 #include "tile_atlas_view.h"
 #include "tile_data_editors.h"
 
-#include "scene/gui/split_container.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/resources/2d/tile_set.h"
 
 class Popup;
diff --git a/editor/plugins/tiles/tile_set_editor.cpp b/editor/plugins/tiles/tile_set_editor.cpp
index df89bf285bd..7531b35e1de 100644
--- a/editor/plugins/tiles/tile_set_editor.cpp
+++ b/editor/plugins/tiles/tile_set_editor.cpp
@@ -41,9 +41,9 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
 
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
-#include "scene/gui/dialogs.h"
 
 TileSetEditor *TileSetEditor::singleton = nullptr;
 
diff --git a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp
index db1ae1b667c..02bbe780dcb 100644
--- a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp
+++ b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp
@@ -39,10 +39,10 @@
 #include "editor/plugins/tiles/tile_set_editor.h"
 #include "editor/themes/editor_scale.h"
 
+#include "scene/gui/advanced/split_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
-#include "scene/gui/split_container.h"
 
 void TileSetScenesCollectionSourceEditor::TileSetScenesCollectionProxyObject::set_id(int p_id) {
 	ERR_FAIL_COND(p_id < 0);
diff --git a/editor/plugins/version_control_editor_plugin.h b/editor/plugins/version_control_editor_plugin.h
index 145366e2589..04574c3c53f 100644
--- a/editor/plugins/version_control_editor_plugin.h
+++ b/editor/plugins/version_control_editor_plugin.h
@@ -33,12 +33,12 @@
 
 #include "editor/editor_vcs_interface.h"
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/advanced/file_dialog.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/rich_text_label.h"
+#include "scene/gui/advanced/text_edit.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/rich_text_label.h"
-#include "scene/gui/text_edit.h"
-#include "scene/gui/tree.h"
 
 class VersionControlEditorPlugin : public EditorPlugin {
 	GDCLASS(VersionControlEditorPlugin, EditorPlugin)
diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp
index b8af4603e80..3b7c2196946 100644
--- a/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/editor/plugins/visual_shader_editor_plugin.cpp
@@ -48,20 +48,20 @@
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/animation/tween.h"
+#include "scene/gui/advanced/code_edit.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/graph_edit.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/rich_text_label.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/code_edit.h"
-#include "scene/gui/color_picker.h"
 #include "scene/gui/flow_container.h"
-#include "scene/gui/graph_edit.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
 #include "scene/resources/curve_texture.h"
diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h
index a74fe113373..e70fae52834 100644
--- a/editor/plugins/visual_shader_editor_plugin.h
+++ b/editor/plugins/visual_shader_editor_plugin.h
@@ -35,7 +35,7 @@
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/editor_resource_conversion_plugin.h"
 #include "editor/plugins/shader/shader_editor.h"
-#include "scene/gui/graph_edit.h"
+#include "scene/gui/advanced/graph_edit.h"
 #include "scene/resources/syntax_highlighter.h"
 #include "scene/resources/visual_shader.h"
 
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index c3bd3acf775..d29589c84cc 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -52,12 +52,12 @@
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "main/main.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/rich_text_label.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
diff --git a/editor/project_manager.h b/editor/project_manager.h
index 73a77e3de7d..59716b41dce 100644
--- a/editor/project_manager.h
+++ b/editor/project_manager.h
@@ -31,7 +31,7 @@
 #ifndef PROJECT_MANAGER_H
 #define PROJECT_MANAGER_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/scroll_container.h"
 
 class CheckBox;
diff --git a/editor/project_manager/project_dialog.cpp b/editor/project_manager/project_dialog.cpp
index 09819215c8f..749e3d0c5f7 100644
--- a/editor/project_manager/project_dialog.cpp
+++ b/editor/project_manager/project_dialog.cpp
@@ -40,10 +40,10 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_icons.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
 
diff --git a/editor/project_manager/project_dialog.h b/editor/project_manager/project_dialog.h
index f0e07a05dc6..1bb4930fae0 100644
--- a/editor/project_manager/project_dialog.h
+++ b/editor/project_manager/project_dialog.h
@@ -31,7 +31,7 @@
 #ifndef PROJECT_DIALOG_H
 #define PROJECT_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class Button;
 class CheckBox;
diff --git a/editor/project_manager/project_list.cpp b/editor/project_manager/project_list.cpp
index b96e40b0b73..f66ef6e68f1 100644
--- a/editor/project_manager/project_list.cpp
+++ b/editor/project_manager/project_list.cpp
@@ -40,8 +40,8 @@
 #include "editor/project_manager.h"
 #include "editor/project_manager/project_tag.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/progress_bar.h"
diff --git a/editor/project_manager/quick_settings_dialog.cpp b/editor/project_manager/quick_settings_dialog.cpp
index a805f6c75e6..80ab64cb6a5 100644
--- a/editor/project_manager/quick_settings_dialog.cpp
+++ b/editor/project_manager/quick_settings_dialog.cpp
@@ -35,10 +35,10 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 
 void QuickSettingsDialog::_fetch_setting_values() {
diff --git a/editor/project_manager/quick_settings_dialog.h b/editor/project_manager/quick_settings_dialog.h
index 938a6de16dc..b9d77572a91 100644
--- a/editor/project_manager/quick_settings_dialog.h
+++ b/editor/project_manager/quick_settings_dialog.h
@@ -31,7 +31,7 @@
 #ifndef QUICK_SETTINGS_DIALOG_H
 #define QUICK_SETTINGS_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class Button;
 class Label;
diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp
index f0e9efe84de..db210265932 100644
--- a/editor/property_selector.cpp
+++ b/editor/property_selector.cpp
@@ -33,8 +33,8 @@
 #include "editor/editor_help.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/tree.h"
 
 void PropertySelector::_text_changed(const String &p_newtext) {
 	_update_search();
diff --git a/editor/property_selector.h b/editor/property_selector.h
index 48bc8a05484..bb79c01feb8 100644
--- a/editor/property_selector.h
+++ b/editor/property_selector.h
@@ -31,7 +31,7 @@
 #ifndef PROPERTY_SELECTOR_H
 #define PROPERTY_SELECTOR_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class EditorHelpBit;
 class LineEdit;
diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp
index b4bc8f652a5..c2eb87dd810 100644
--- a/editor/rename_dialog.cpp
+++ b/editor/rename_dialog.cpp
@@ -34,14 +34,14 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/plugins/script_editor_plugin.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/control.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/tab_container.h"
 
 #include "modules/regex/regex.h"
diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h
index e0a47877070..941c6f866fc 100644
--- a/editor/rename_dialog.h
+++ b/editor/rename_dialog.h
@@ -32,7 +32,7 @@
 #define RENAME_DIALOG_H
 
 #include "editor/gui/scene_tree_editor.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/line_edit.h"
 
 class Button;
diff --git a/editor/reparent_dialog.h b/editor/reparent_dialog.h
index 2ca26fcde38..5f3597b6955 100644
--- a/editor/reparent_dialog.h
+++ b/editor/reparent_dialog.h
@@ -31,7 +31,7 @@
 #ifndef REPARENT_DIALOG_H
 #define REPARENT_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class CheckBox;
 class SceneTreeEditor;
diff --git a/editor/run_instances_dialog.cpp b/editor/run_instances_dialog.cpp
index 2811ada5410..a1d8838aadf 100644
--- a/editor/run_instances_dialog.cpp
+++ b/editor/run_instances_dialog.cpp
@@ -33,13 +33,13 @@
 #include "core/config/project_settings.h"
 #include "editor/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/popup_menu.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/tree.h"
 #include "scene/main/timer.h"
 
 void RunInstancesDialog::_fetch_main_args() {
diff --git a/editor/run_instances_dialog.h b/editor/run_instances_dialog.h
index a7cca88bed3..372e99e0970 100644
--- a/editor/run_instances_dialog.h
+++ b/editor/run_instances_dialog.h
@@ -31,7 +31,7 @@
 #ifndef RUN_INSTANCES_DIALOG_H
 #define RUN_INSTANCES_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class CheckBox;
 class LineEdit;
diff --git a/editor/scene_create_dialog.cpp b/editor/scene_create_dialog.cpp
index c197950a2b1..87969959efd 100644
--- a/editor/scene_create_dialog.cpp
+++ b/editor/scene_create_dialog.cpp
@@ -38,11 +38,11 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/node_2d.h"
 #include "scene/3d/node_3d.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
 #include "scene/resources/packed_scene.h"
 
 void SceneCreateDialog::_notification(int p_what) {
diff --git a/editor/scene_create_dialog.h b/editor/scene_create_dialog.h
index c7a4a098504..470c1ddb023 100644
--- a/editor/scene_create_dialog.h
+++ b/editor/scene_create_dialog.h
@@ -31,7 +31,7 @@
 #ifndef SCENE_CREATE_DIALOG_H
 #define SCENE_CREATE_DIALOG_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class ButtonGroup;
 class CheckBox;
diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h
index c8f043b4201..907d6c1b24d 100644
--- a/editor/script_create_dialog.h
+++ b/editor/script_create_dialog.h
@@ -32,9 +32,9 @@
 #define SCRIPT_CREATE_DIALOG_H
 
 #include "core/object/script_language.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 
 class CreateDialog;
diff --git a/editor/shader_create_dialog.h b/editor/shader_create_dialog.h
index 5240842110c..ef71cc58db9 100644
--- a/editor/shader_create_dialog.h
+++ b/editor/shader_create_dialog.h
@@ -32,11 +32,11 @@
 #define SHADER_CREATE_DIALOG_H
 
 #include "editor/editor_settings.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 
 class EditorFileDialog;
diff --git a/editor/shader_globals_editor.h b/editor/shader_globals_editor.h
index 43adc6c14f0..35b01fe110e 100644
--- a/editor/shader_globals_editor.h
+++ b/editor/shader_globals_editor.h
@@ -32,9 +32,9 @@
 #define SHADER_GLOBALS_EDITOR_H
 
 #include "editor/editor_sectioned_inspector.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/tree.h"
 
 class ShaderGlobalsEditorInterface;
 
diff --git a/editor/surface_upgrade_tool.h b/editor/surface_upgrade_tool.h
index 130c49dcac6..13de6bff39e 100644
--- a/editor/surface_upgrade_tool.h
+++ b/editor/surface_upgrade_tool.h
@@ -31,7 +31,7 @@
 #ifndef SURFACE_UPGRADE_TOOL_H
 #define SURFACE_UPGRADE_TOOL_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class EditorFileSystemDirectory;
 
diff --git a/editor/themes/editor_theme_manager.cpp b/editor/themes/editor_theme_manager.cpp
index 1793418c2a2..2c1d49bb3aa 100644
--- a/editor/themes/editor_theme_manager.cpp
+++ b/editor/themes/editor_theme_manager.cpp
@@ -39,7 +39,7 @@
 #include "editor/themes/editor_icons.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme.h"
-#include "scene/gui/graph_edit.h"
+#include "scene/gui/advanced/graph_edit.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/resources/style_box_line.h"
diff --git a/editor/uid_upgrade_tool.h b/editor/uid_upgrade_tool.h
index 0807b9a3f4d..574c17eeff6 100644
--- a/editor/uid_upgrade_tool.h
+++ b/editor/uid_upgrade_tool.h
@@ -31,7 +31,7 @@
 #ifndef UID_UPGRADE_TOOL_H
 #define UID_UPGRADE_TOOL_H
 
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class EditorFileSystemDirectory;
 
diff --git a/editor/window_wrapper.h b/editor/window_wrapper.h
index 3fedf3979e2..662b44dd0cc 100644
--- a/editor/window_wrapper.h
+++ b/editor/window_wrapper.h
@@ -32,8 +32,8 @@
 #define WINDOW_WRAPPER_H
 
 #include "core/math/rect2.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/menu_button.h"
 
 class Window;
 class HBoxContainer;
diff --git a/modules/csg/editor/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp
index 9a5d8fa0b0a..c10b61d18ec 100644
--- a/modules/csg/editor/csg_gizmos.cpp
+++ b/modules/csg/editor/csg_gizmos.cpp
@@ -40,8 +40,8 @@
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
 
 void CSGShapeEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
diff --git a/modules/gdscript/editor/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp
index 88e634f425c..4dd169e3631 100644
--- a/modules/gdscript/editor/gdscript_highlighter.cpp
+++ b/modules/gdscript/editor/gdscript_highlighter.cpp
@@ -36,7 +36,7 @@
 #include "core/config/project_settings.h"
 #include "editor/editor_settings.h"
 #include "editor/themes/editor_theme_manager.h"
-#include "scene/gui/text_edit.h"
+#include "scene/gui/advanced/text_edit.h"
 
 Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_line) {
 	Dictionary color_map;
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp
index f4157ca7657..f3827ad27cd 100644
--- a/modules/gridmap/editor/grid_map_editor_plugin.cpp
+++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp
@@ -44,9 +44,9 @@
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/menu_button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/separator.h"
 #include "scene/main/window.h"
 
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.h b/modules/gridmap/editor/grid_map_editor_plugin.h
index 6bab87ba609..03c4b817a12 100644
--- a/modules/gridmap/editor/grid_map_editor_plugin.h
+++ b/modules/gridmap/editor/grid_map_editor_plugin.h
@@ -36,10 +36,10 @@
 #include "../grid_map.h"
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
 
 class ConfirmationDialog;
 class MenuButton;
diff --git a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
index a29646e4a3c..f96e07168be 100644
--- a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
+++ b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
@@ -35,11 +35,11 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tree.h"
 
 void AudioStreamInteractiveTransitionEditor::_notification(int p_what) {
 	if (p_what == NOTIFICATION_READY || p_what == NOTIFICATION_THEME_CHANGED) {
diff --git a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h
index 1155d70e7a8..59ff86b6471 100644
--- a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h
+++ b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h
@@ -33,7 +33,7 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
 
 class CheckBox;
 class HSplitContainer;
diff --git a/modules/multiplayer/editor/editor_network_profiler.h b/modules/multiplayer/editor/editor_network_profiler.h
index 46931c9fc97..8266d8d0404 100644
--- a/modules/multiplayer/editor/editor_network_profiler.h
+++ b/modules/multiplayer/editor/editor_network_profiler.h
@@ -34,11 +34,11 @@
 #include "../multiplayer_debugger.h"
 
 #include "scene/debugger/scene_debugger.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tree.h"
 
 class EditorNetworkProfiler : public VBoxContainer {
 	GDCLASS(EditorNetworkProfiler, VBoxContainer)
diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp
index e861acc83f6..84275860e4a 100644
--- a/modules/multiplayer/editor/replication_editor.cpp
+++ b/modules/multiplayer/editor/replication_editor.cpp
@@ -40,9 +40,9 @@
 #include "editor/property_selector.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/tree.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/tree.h"
 
 void ReplicationEditor::_pick_node_filter_text_changed(const String &p_newtext) {
 	TreeItem *root_item = pick_node->get_scene_tree()->get_scene_tree()->get_root();
diff --git a/modules/navigation/editor/navigation_mesh_editor_plugin.cpp b/modules/navigation/editor/navigation_mesh_editor_plugin.cpp
index f5800356ea3..2911f882ed6 100644
--- a/modules/navigation/editor/navigation_mesh_editor_plugin.cpp
+++ b/modules/navigation/editor/navigation_mesh_editor_plugin.cpp
@@ -35,9 +35,9 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "scene/3d/navigation_region_3d.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 
 void NavigationMeshEditor::_node_removed(Node *p_node) {
diff --git a/modules/openxr/editor/openxr_action_editor.h b/modules/openxr/editor/openxr_action_editor.h
index b672fe73401..f3e299b18d5 100644
--- a/modules/openxr/editor/openxr_action_editor.h
+++ b/modules/openxr/editor/openxr_action_editor.h
@@ -34,11 +34,11 @@
 #include "../action_map/openxr_action.h"
 
 #include "editor/editor_undo_redo_manager.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/text_edit.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/text_edit.h"
 
 class OpenXRActionEditor : public HBoxContainer {
 	GDCLASS(OpenXRActionEditor, HBoxContainer);
diff --git a/modules/openxr/editor/openxr_action_set_editor.h b/modules/openxr/editor/openxr_action_set_editor.h
index 21437aa6311..9bd66b6c291 100644
--- a/modules/openxr/editor/openxr_action_set_editor.h
+++ b/modules/openxr/editor/openxr_action_set_editor.h
@@ -35,11 +35,11 @@
 #include "../action_map/openxr_action_set.h"
 #include "openxr_action_editor.h"
 
+#include "scene/gui/advanced/text_edit.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/text_edit.h"
 
 class OpenXRActionSetEditor : public HBoxContainer {
 	GDCLASS(OpenXRActionSetEditor, HBoxContainer);
diff --git a/modules/openxr/editor/openxr_binding_modifiers_dialog.h b/modules/openxr/editor/openxr_binding_modifiers_dialog.h
index c60a3760b38..970929924b3 100644
--- a/modules/openxr/editor/openxr_binding_modifiers_dialog.h
+++ b/modules/openxr/editor/openxr_binding_modifiers_dialog.h
@@ -36,9 +36,9 @@
 #include "../editor/openxr_binding_modifier_editor.h"
 #include "editor/create_dialog.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/scroll_container.h"
 
diff --git a/modules/openxr/editor/openxr_select_action_dialog.h b/modules/openxr/editor/openxr_select_action_dialog.h
index cf7a7a19396..99618b85af0 100644
--- a/modules/openxr/editor/openxr_select_action_dialog.h
+++ b/modules/openxr/editor/openxr_select_action_dialog.h
@@ -33,14 +33,14 @@
 
 #include "../action_map/openxr_action_map.h"
 
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/text_edit.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/text_edit.h"
 
 class OpenXRSelectActionDialog : public ConfirmationDialog {
 	GDCLASS(OpenXRSelectActionDialog, ConfirmationDialog);
diff --git a/modules/openxr/editor/openxr_select_interaction_profile_dialog.h b/modules/openxr/editor/openxr_select_interaction_profile_dialog.h
index bfcdce1638f..aae3a73889e 100644
--- a/modules/openxr/editor/openxr_select_interaction_profile_dialog.h
+++ b/modules/openxr/editor/openxr_select_interaction_profile_dialog.h
@@ -31,8 +31,8 @@
 #ifndef OPENXR_SELECT_INTERACTION_PROFILE_DIALOG_H
 #define OPENXR_SELECT_INTERACTION_PROFILE_DIALOG_H
 
+#include "scene/gui/advanced/dialogs.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/gui/scroll_container.h"
 
diff --git a/modules/openxr/editor/openxr_select_runtime.h b/modules/openxr/editor/openxr_select_runtime.h
index f5b2f1da608..cb7bd9aa7ea 100644
--- a/modules/openxr/editor/openxr_select_runtime.h
+++ b/modules/openxr/editor/openxr_select_runtime.h
@@ -31,7 +31,7 @@
 #ifndef OPENXR_SELECT_RUNTIME_H
 #define OPENXR_SELECT_RUNTIME_H
 
-#include "scene/gui/option_button.h"
+#include "scene/gui/advanced/option_button.h"
 
 class OpenXRSelectRuntime : public OptionButton {
 	GDCLASS(OpenXRSelectRuntime, OptionButton);
diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp
index c620c5fd5c8..b2302409ecf 100644
--- a/scene/debugger/scene_debugger.cpp
+++ b/scene/debugger/scene_debugger.cpp
@@ -44,7 +44,7 @@
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/surface_tool.h"
 #endif // _3D_DISABLED
-#include "scene/gui/popup_menu.h"
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
diff --git a/scene/gui/SCsub b/scene/gui/SCsub
index 374dc2119dc..9d36dcefaec 100644
--- a/scene/gui/SCsub
+++ b/scene/gui/SCsub
@@ -4,3 +4,5 @@ from misc.utility.scons_hints import *
 Import("env")
 
 env.add_source_files(env.scene_sources, "*.cpp")
+if not env["disable_advanced_gui"]:
+    env.add_source_files(env.scene_sources, "advanced/*.cpp")
diff --git a/scene/gui/code_edit.compat.inc b/scene/gui/advanced/code_edit.compat.inc
similarity index 100%
rename from scene/gui/code_edit.compat.inc
rename to scene/gui/advanced/code_edit.compat.inc
diff --git a/scene/gui/code_edit.cpp b/scene/gui/advanced/code_edit.cpp
similarity index 100%
rename from scene/gui/code_edit.cpp
rename to scene/gui/advanced/code_edit.cpp
diff --git a/scene/gui/code_edit.h b/scene/gui/advanced/code_edit.h
similarity index 99%
rename from scene/gui/code_edit.h
rename to scene/gui/advanced/code_edit.h
index dbba5c23ded..5c38fa1a0c8 100644
--- a/scene/gui/code_edit.h
+++ b/scene/gui/advanced/code_edit.h
@@ -32,7 +32,7 @@
 #define CODE_EDIT_H
 
 #include "core/object/script_language.h"
-#include "scene/gui/text_edit.h"
+#include "scene/gui/advanced/text_edit.h"
 
 class CodeEdit : public TextEdit {
 	GDCLASS(CodeEdit, TextEdit)
diff --git a/scene/gui/color_mode.cpp b/scene/gui/advanced/color_mode.cpp
similarity index 100%
rename from scene/gui/color_mode.cpp
rename to scene/gui/advanced/color_mode.cpp
diff --git a/scene/gui/color_mode.h b/scene/gui/advanced/color_mode.h
similarity index 99%
rename from scene/gui/color_mode.h
rename to scene/gui/advanced/color_mode.h
index c035fe6f65a..e0faebcd966 100644
--- a/scene/gui/color_mode.h
+++ b/scene/gui/advanced/color_mode.h
@@ -31,7 +31,7 @@
 #ifndef COLOR_MODE_H
 #define COLOR_MODE_H
 
-#include "scene/gui/color_picker.h"
+#include "scene/gui/advanced/color_picker.h"
 
 class GradientTexture2D;
 
diff --git a/scene/gui/color_picker.cpp b/scene/gui/advanced/color_picker.cpp
similarity index 99%
rename from scene/gui/color_picker.cpp
rename to scene/gui/advanced/color_picker.cpp
index aab7c37bbb5..88a76a775d5 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/advanced/color_picker.cpp
@@ -30,19 +30,19 @@
 
 #include "color_picker.h"
 
+#include "color_mode.h"
 #include "core/io/image.h"
+#include "scene/gui/advanced/file_dialog.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/popup_menu.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/aspect_ratio_container.h"
-#include "scene/gui/color_mode.h"
-#include "scene/gui/file_dialog.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/color_palette.h"
diff --git a/scene/gui/color_picker.h b/scene/gui/advanced/color_picker.h
similarity index 100%
rename from scene/gui/color_picker.h
rename to scene/gui/advanced/color_picker.h
diff --git a/scene/gui/dialogs.compat.inc b/scene/gui/advanced/dialogs.compat.inc
similarity index 100%
rename from scene/gui/dialogs.compat.inc
rename to scene/gui/advanced/dialogs.compat.inc
diff --git a/scene/gui/dialogs.cpp b/scene/gui/advanced/dialogs.cpp
similarity index 100%
rename from scene/gui/dialogs.cpp
rename to scene/gui/advanced/dialogs.cpp
diff --git a/scene/gui/dialogs.h b/scene/gui/advanced/dialogs.h
similarity index 98%
rename from scene/gui/dialogs.h
rename to scene/gui/advanced/dialogs.h
index 404237bfd85..7e4ad8be2fe 100644
--- a/scene/gui/dialogs.h
+++ b/scene/gui/advanced/dialogs.h
@@ -31,15 +31,15 @@
 #ifndef DIALOGS_H
 #define DIALOGS_H
 
-#include "box_container.h"
+#include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/texture_button.h"
 #include "scene/main/window.h"
 
 class LineEdit;
+class TextureButton;
 
 class AcceptDialog : public Window {
 	GDCLASS(AcceptDialog, Window);
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/advanced/file_dialog.cpp
similarity index 99%
rename from scene/gui/file_dialog.cpp
rename to scene/gui/advanced/file_dialog.cpp
index bd89fb19c01..28620e5b1a1 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/advanced/file_dialog.cpp
@@ -32,10 +32,10 @@
 
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
+#include "scene/gui/advanced/option_button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
 #include "scene/theme/theme_db.h"
 
 FileDialog::GetIconFunc FileDialog::get_icon_func = nullptr;
diff --git a/scene/gui/file_dialog.h b/scene/gui/advanced/file_dialog.h
similarity index 98%
rename from scene/gui/file_dialog.h
rename to scene/gui/advanced/file_dialog.h
index af8e8950ae9..352274591a5 100644
--- a/scene/gui/file_dialog.h
+++ b/scene/gui/advanced/file_dialog.h
@@ -31,12 +31,12 @@
 #ifndef FILE_DIALOG_H
 #define FILE_DIALOG_H
 
-#include "box_container.h"
 #include "core/io/dir_access.h"
-#include "scene/gui/dialogs.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/tree.h"
+#include "scene/gui/box_container.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/tree.h"
 #include "scene/property_list_helper.h"
 
 class GridContainer;
diff --git a/scene/gui/graph_edit.compat.inc b/scene/gui/advanced/graph_edit.compat.inc
similarity index 100%
rename from scene/gui/graph_edit.compat.inc
rename to scene/gui/advanced/graph_edit.compat.inc
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/advanced/graph_edit.cpp
similarity index 99%
rename from scene/gui/graph_edit.cpp
rename to scene/gui/advanced/graph_edit.cpp
index d0bf8d7819e..1852808a5ed 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/advanced/graph_edit.cpp
@@ -36,13 +36,13 @@
 #include "core/math/math_funcs.h"
 #include "core/os/keyboard.h"
 #include "scene/2d/line_2d.h"
+#include "scene/gui/advanced/graph_edit_arranger.h"
+#include "scene/gui/advanced/spin_box.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/graph_edit_arranger.h"
 #include "scene/gui/label.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/view_panner.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/graph_edit.h b/scene/gui/advanced/graph_edit.h
similarity index 99%
rename from scene/gui/graph_edit.h
rename to scene/gui/advanced/graph_edit.h
index 0b8717b766b..d6f24229629 100644
--- a/scene/gui/graph_edit.h
+++ b/scene/gui/advanced/graph_edit.h
@@ -31,9 +31,9 @@
 #ifndef GRAPH_EDIT_H
 #define GRAPH_EDIT_H
 
+#include "scene/gui/advanced/graph_frame.h"
+#include "scene/gui/advanced/graph_node.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/graph_frame.h"
-#include "scene/gui/graph_node.h"
 
 class Button;
 class GraphEdit;
diff --git a/scene/gui/graph_edit_arranger.cpp b/scene/gui/advanced/graph_edit_arranger.cpp
similarity index 99%
rename from scene/gui/graph_edit_arranger.cpp
rename to scene/gui/advanced/graph_edit_arranger.cpp
index d50af7865a8..4946a34959e 100644
--- a/scene/gui/graph_edit_arranger.cpp
+++ b/scene/gui/advanced/graph_edit_arranger.cpp
@@ -30,7 +30,7 @@
 
 #include "graph_edit_arranger.h"
 
-#include "scene/gui/graph_edit.h"
+#include "scene/gui/advanced/graph_edit.h"
 
 void GraphEditArranger::arrange_nodes() {
 	ERR_FAIL_NULL(graph_edit);
diff --git a/scene/gui/graph_edit_arranger.h b/scene/gui/advanced/graph_edit_arranger.h
similarity index 100%
rename from scene/gui/graph_edit_arranger.h
rename to scene/gui/advanced/graph_edit_arranger.h
diff --git a/scene/gui/graph_element.cpp b/scene/gui/advanced/graph_element.cpp
similarity index 99%
rename from scene/gui/graph_element.cpp
rename to scene/gui/advanced/graph_element.cpp
index 7abefee974f..971e8d40bdd 100644
--- a/scene/gui/graph_element.cpp
+++ b/scene/gui/advanced/graph_element.cpp
@@ -30,7 +30,7 @@
 
 #include "graph_element.h"
 
-#include "scene/gui/graph_edit.h"
+#include "scene/gui/advanced/graph_edit.h"
 #include "scene/theme/theme_db.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/gui/graph_element.h b/scene/gui/advanced/graph_element.h
similarity index 100%
rename from scene/gui/graph_element.h
rename to scene/gui/advanced/graph_element.h
diff --git a/scene/gui/graph_frame.cpp b/scene/gui/advanced/graph_frame.cpp
similarity index 100%
rename from scene/gui/graph_frame.cpp
rename to scene/gui/advanced/graph_frame.cpp
diff --git a/scene/gui/graph_frame.h b/scene/gui/advanced/graph_frame.h
similarity index 98%
rename from scene/gui/graph_frame.h
rename to scene/gui/advanced/graph_frame.h
index 2af09cf8723..8b3fce41c1c 100644
--- a/scene/gui/graph_frame.h
+++ b/scene/gui/advanced/graph_frame.h
@@ -31,7 +31,7 @@
 #ifndef GRAPH_FRAME_H
 #define GRAPH_FRAME_H
 
-#include "scene/gui/graph_element.h"
+#include "scene/gui/advanced/graph_element.h"
 
 class HBoxContainer;
 
diff --git a/scene/gui/graph_node.cpp b/scene/gui/advanced/graph_node.cpp
similarity index 100%
rename from scene/gui/graph_node.cpp
rename to scene/gui/advanced/graph_node.cpp
diff --git a/scene/gui/graph_node.h b/scene/gui/advanced/graph_node.h
similarity index 99%
rename from scene/gui/graph_node.h
rename to scene/gui/advanced/graph_node.h
index 27af3192c8a..9b993a8be7e 100644
--- a/scene/gui/graph_node.h
+++ b/scene/gui/advanced/graph_node.h
@@ -31,7 +31,7 @@
 #ifndef GRAPH_NODE_H
 #define GRAPH_NODE_H
 
-#include "scene/gui/graph_element.h"
+#include "scene/gui/advanced/graph_element.h"
 
 class HBoxContainer;
 
diff --git a/scene/gui/menu_bar.cpp b/scene/gui/advanced/menu_bar.cpp
similarity index 100%
rename from scene/gui/menu_bar.cpp
rename to scene/gui/advanced/menu_bar.cpp
diff --git a/scene/gui/menu_bar.h b/scene/gui/advanced/menu_bar.h
similarity index 99%
rename from scene/gui/menu_bar.h
rename to scene/gui/advanced/menu_bar.h
index d9ec54a0b54..79dc160f8bc 100644
--- a/scene/gui/menu_bar.h
+++ b/scene/gui/advanced/menu_bar.h
@@ -31,7 +31,7 @@
 #ifndef MENU_BAR_H
 #define MENU_BAR_H
 
-#include "scene/gui/popup_menu.h"
+#include "scene/gui/advanced/popup_menu.h"
 
 class MenuBar : public Control {
 	GDCLASS(MenuBar, Control);
diff --git a/scene/gui/menu_button.cpp b/scene/gui/advanced/menu_button.cpp
similarity index 100%
rename from scene/gui/menu_button.cpp
rename to scene/gui/advanced/menu_button.cpp
diff --git a/scene/gui/menu_button.h b/scene/gui/advanced/menu_button.h
similarity index 98%
rename from scene/gui/menu_button.h
rename to scene/gui/advanced/menu_button.h
index f3ccbcf8d69..ebce27b7277 100644
--- a/scene/gui/menu_button.h
+++ b/scene/gui/advanced/menu_button.h
@@ -31,8 +31,8 @@
 #ifndef MENU_BUTTON_H
 #define MENU_BUTTON_H
 
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/button.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/property_list_helper.h"
 
 class MenuButton : public Button {
diff --git a/scene/gui/option_button.cpp b/scene/gui/advanced/option_button.cpp
similarity index 100%
rename from scene/gui/option_button.cpp
rename to scene/gui/advanced/option_button.cpp
diff --git a/scene/gui/option_button.h b/scene/gui/advanced/option_button.h
similarity index 99%
rename from scene/gui/option_button.h
rename to scene/gui/advanced/option_button.h
index f33d32fd872..a45ea4bb1d2 100644
--- a/scene/gui/option_button.h
+++ b/scene/gui/advanced/option_button.h
@@ -31,8 +31,8 @@
 #ifndef OPTION_BUTTON_H
 #define OPTION_BUTTON_H
 
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/button.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/property_list_helper.h"
 
 class OptionButton : public Button {
diff --git a/scene/gui/popup_menu.compat.inc b/scene/gui/advanced/popup_menu.compat.inc
similarity index 100%
rename from scene/gui/popup_menu.compat.inc
rename to scene/gui/advanced/popup_menu.compat.inc
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/advanced/popup_menu.cpp
similarity index 99%
rename from scene/gui/popup_menu.cpp
rename to scene/gui/advanced/popup_menu.cpp
index b6dc7575469..bb96376e2f1 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/advanced/popup_menu.cpp
@@ -35,7 +35,7 @@
 #include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "scene/gui/menu_bar.h"
+#include "scene/gui/advanced/menu_bar.h"
 #include "scene/gui/panel_container.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/popup_menu.h b/scene/gui/advanced/popup_menu.h
similarity index 100%
rename from scene/gui/popup_menu.h
rename to scene/gui/advanced/popup_menu.h
diff --git a/scene/gui/rich_text_effect.cpp b/scene/gui/advanced/rich_text_effect.cpp
similarity index 100%
rename from scene/gui/rich_text_effect.cpp
rename to scene/gui/advanced/rich_text_effect.cpp
diff --git a/scene/gui/rich_text_effect.h b/scene/gui/advanced/rich_text_effect.h
similarity index 100%
rename from scene/gui/rich_text_effect.h
rename to scene/gui/advanced/rich_text_effect.h
diff --git a/scene/gui/rich_text_label.compat.inc b/scene/gui/advanced/rich_text_label.compat.inc
similarity index 100%
rename from scene/gui/rich_text_label.compat.inc
rename to scene/gui/advanced/rich_text_label.compat.inc
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/advanced/rich_text_label.cpp
similarity index 99%
rename from scene/gui/rich_text_label.cpp
rename to scene/gui/advanced/rich_text_label.cpp
index a76a43b25ae..76a846b803d 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/advanced/rich_text_label.cpp
@@ -35,8 +35,8 @@
 #include "core/math/math_defs.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
+#include "scene/gui/advanced/rich_text_effect.h"
 #include "scene/gui/label.h"
-#include "scene/gui/rich_text_effect.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/theme/theme_db.h"
 #include "servers/display_server.h"
diff --git a/scene/gui/rich_text_label.h b/scene/gui/advanced/rich_text_label.h
similarity index 99%
rename from scene/gui/rich_text_label.h
rename to scene/gui/advanced/rich_text_label.h
index 6b46526049e..c616e71d96c 100644
--- a/scene/gui/rich_text_label.h
+++ b/scene/gui/advanced/rich_text_label.h
@@ -33,7 +33,7 @@
 
 #include "core/object/worker_thread_pool.h"
 #include "core/templates/rid_owner.h"
-#include "scene/gui/popup_menu.h"
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/scroll_bar.h"
 #include "scene/resources/text_paragraph.h"
 
diff --git a/scene/gui/spin_box.cpp b/scene/gui/advanced/spin_box.cpp
similarity index 100%
rename from scene/gui/spin_box.cpp
rename to scene/gui/advanced/spin_box.cpp
diff --git a/scene/gui/spin_box.h b/scene/gui/advanced/spin_box.h
similarity index 100%
rename from scene/gui/spin_box.h
rename to scene/gui/advanced/spin_box.h
diff --git a/scene/gui/split_container.cpp b/scene/gui/advanced/split_container.cpp
similarity index 100%
rename from scene/gui/split_container.cpp
rename to scene/gui/advanced/split_container.cpp
diff --git a/scene/gui/split_container.h b/scene/gui/advanced/split_container.h
similarity index 100%
rename from scene/gui/split_container.h
rename to scene/gui/advanced/split_container.h
diff --git a/scene/gui/subviewport_container.cpp b/scene/gui/advanced/subviewport_container.cpp
similarity index 100%
rename from scene/gui/subviewport_container.cpp
rename to scene/gui/advanced/subviewport_container.cpp
diff --git a/scene/gui/subviewport_container.h b/scene/gui/advanced/subviewport_container.h
similarity index 100%
rename from scene/gui/subviewport_container.h
rename to scene/gui/advanced/subviewport_container.h
diff --git a/scene/gui/text_edit.compat.inc b/scene/gui/advanced/text_edit.compat.inc
similarity index 100%
rename from scene/gui/text_edit.compat.inc
rename to scene/gui/advanced/text_edit.compat.inc
diff --git a/scene/gui/text_edit.cpp b/scene/gui/advanced/text_edit.cpp
similarity index 100%
rename from scene/gui/text_edit.cpp
rename to scene/gui/advanced/text_edit.cpp
diff --git a/scene/gui/text_edit.h b/scene/gui/advanced/text_edit.h
similarity index 99%
rename from scene/gui/text_edit.h
rename to scene/gui/advanced/text_edit.h
index 21c8781e264..663fd8c3f3d 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/advanced/text_edit.h
@@ -31,8 +31,8 @@
 #ifndef TEXT_EDIT_H
 #define TEXT_EDIT_H
 
+#include "popup_menu.h"
 #include "scene/gui/control.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/scroll_bar.h"
 #include "scene/main/timer.h"
 #include "scene/resources/syntax_highlighter.h"
diff --git a/scene/gui/tree.cpp b/scene/gui/advanced/tree.cpp
similarity index 99%
rename from scene/gui/tree.cpp
rename to scene/gui/advanced/tree.cpp
index cd6c51de4b2..6f467c2e0af 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/advanced/tree.cpp
@@ -35,8 +35,8 @@
 #include "core/math/math_funcs.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
+#include "scene/gui/advanced/text_edit.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/text_edit.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/tree.h b/scene/gui/advanced/tree.h
similarity index 99%
rename from scene/gui/tree.h
rename to scene/gui/advanced/tree.h
index 9d3324bd3db..f783c2fa6bd 100644
--- a/scene/gui/tree.h
+++ b/scene/gui/advanced/tree.h
@@ -31,9 +31,9 @@
 #ifndef TREE_H
 #define TREE_H
 
+#include "scene/gui/advanced/popup_menu.h"
 #include "scene/gui/control.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/scroll_bar.h"
 #include "scene/gui/slider.h"
 #include "scene/resources/text_paragraph.h"
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 969e2fd3a35..9f708afa1ca 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -397,12 +397,14 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 				set_caret_at_pixel_pos(b->get_position().x);
 			}
 
+#ifndef ADVANCED_GUI_DISABLED
 			if (context_menu_enabled) {
 				_update_context_menu();
 				menu->set_position(get_screen_position() + get_local_mouse_position());
 				menu->reset_size();
 				menu->popup();
 			}
+#endif // ADVANCED_GUI_DISABLED
 
 			if (editable && !editing) {
 				edit();
@@ -625,6 +627,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
+#ifndef ADVANCED_GUI_DISABLED
 	// Open context menu.
 	if (context_menu_enabled) {
 		if (k->is_action("ui_menu", true)) {
@@ -639,6 +642,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 			return;
 		}
 	}
+#endif // ADVANCED_GUI_DISABLED
 
 	if (is_shortcut_keys_enabled()) {
 		if (k->is_action("ui_copy", true)) {
@@ -1733,7 +1737,12 @@ void LineEdit::_validate_caret_can_draw() {
 		draw_caret = true;
 		caret_blink_timer = 0.0;
 	}
-	caret_can_draw = editing && (window_has_focus || (menu && menu->has_focus())) && (has_focus() || caret_force_displayed);
+#ifndef ADVANCED_GUI_DISABLED
+	bool menu_focused = menu && menu->has_focus();
+#else
+	bool menu_focused = false;
+#endif // ADVANCED_GUI_DISABLED
+	caret_can_draw = editing && (window_has_focus || menu_focused) && (has_focus() || caret_force_displayed);
 }
 
 void LineEdit::delete_char() {
@@ -1801,12 +1810,14 @@ void LineEdit::set_text_direction(Control::TextDirection p_text_direction) {
 		}
 		_shape();
 
+#ifndef ADVANCED_GUI_DISABLED
 		if (menu_dir) {
 			menu_dir->set_item_checked(menu_dir->get_item_index(MENU_DIR_INHERITED), text_direction == TEXT_DIRECTION_INHERITED);
 			menu_dir->set_item_checked(menu_dir->get_item_index(MENU_DIR_AUTO), text_direction == TEXT_DIRECTION_AUTO);
 			menu_dir->set_item_checked(menu_dir->get_item_index(MENU_DIR_LTR), text_direction == TEXT_DIRECTION_LTR);
 			menu_dir->set_item_checked(menu_dir->get_item_index(MENU_DIR_RTL), text_direction == TEXT_DIRECTION_RTL);
 		}
+#endif // ADVANCED_GUI_DISABLED
 		queue_redraw();
 	}
 }
@@ -1830,9 +1841,11 @@ String LineEdit::get_language() const {
 void LineEdit::set_draw_control_chars(bool p_draw_control_chars) {
 	if (draw_control_chars != p_draw_control_chars) {
 		draw_control_chars = p_draw_control_chars;
+#ifndef ADVANCED_GUI_DISABLED
 		if (menu && menu->get_item_index(MENU_DISPLAY_UCC) >= 0) {
 			menu->set_item_checked(menu->get_item_index(MENU_DISPLAY_UCC), draw_control_chars);
 		}
+#endif // ADVANCED_GUI_DISABLED
 		_shape();
 		queue_redraw();
 	}
@@ -2398,7 +2411,9 @@ void LineEdit::show_emoji_and_symbol_picker() {
 void LineEdit::set_emoji_menu_enabled(bool p_enabled) {
 	if (emoji_menu_enabled != p_enabled) {
 		emoji_menu_enabled = p_enabled;
+#ifndef ADVANCED_GUI_DISABLED
 		_update_context_menu();
+#endif // ADVANCED_GUI_DISABLED
 	}
 }
 
@@ -2407,15 +2422,21 @@ bool LineEdit::is_emoji_menu_enabled() const {
 }
 
 bool LineEdit::is_menu_visible() const {
+#ifndef ADVANCED_GUI_DISABLED
 	return menu && menu->is_visible();
+#else
+	return false;
+#endif // ADVANCED_GUI_DISABLED
 }
 
+#ifndef ADVANCED_GUI_DISABLED
 PopupMenu *LineEdit::get_menu() const {
 	if (!menu) {
 		const_cast<LineEdit *>(this)->_generate_context_menu();
 	}
 	return menu;
 }
+#endif // ADVANCED_GUI_DISABLED
 
 void LineEdit::_editor_settings_changed() {
 #ifdef TOOLS_ENABLED
@@ -2704,6 +2725,7 @@ Key LineEdit::_get_menu_action_accelerator(const String &p_action) {
 	}
 }
 
+#ifndef ADVANCED_GUI_DISABLED
 void LineEdit::_generate_context_menu() {
 	menu = memnew(PopupMenu);
 	add_child(menu, false, INTERNAL_MODE_FRONT);
@@ -2817,6 +2839,7 @@ void LineEdit::_update_context_menu() {
 #undef MENU_ITEM_DISABLED
 #undef MENU_ITEM_CHECKED
 }
+#endif // ADVANCED_GUI_DISABLED
 
 void LineEdit::_validate_property(PropertyInfo &p_property) const {
 	if (!caret_blink_enabled && p_property.name == "caret_blink_interval") {
diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h
index 6f6b49307c9..f2ef5257924 100644
--- a/scene/gui/line_edit.h
+++ b/scene/gui/line_edit.h
@@ -32,7 +32,9 @@
 #define LINE_EDIT_H
 
 #include "scene/gui/control.h"
-#include "scene/gui/popup_menu.h"
+#ifndef ADVANCED_GUI_DISABLED
+#include "scene/gui/advanced/popup_menu.h"
+#endif // ADVANCED_GUI_DISABLED
 
 class LineEdit : public Control {
 	GDCLASS(LineEdit, Control);
@@ -112,11 +114,16 @@ private:
 	bool deselect_on_focus_loss_enabled = true;
 	bool drag_and_drop_selection_enabled = true;
 
+#ifndef ADVANCED_GUI_DISABLED
 	bool context_menu_enabled = true;
 	bool emoji_menu_enabled = true;
 	PopupMenu *menu = nullptr;
 	PopupMenu *menu_dir = nullptr;
 	PopupMenu *menu_ctl = nullptr;
+#else
+	bool context_menu_enabled = false;
+	bool emoji_menu_enabled = false;
+#endif // ADVANCED_GUI_DISABLED
 
 	bool caret_mid_grapheme_enabled = false;
 
@@ -218,8 +225,10 @@ private:
 	void _create_undo_state();
 
 	Key _get_menu_action_accelerator(const String &p_action);
+#ifndef ADVANCED_GUI_DISABLED
 	void _generate_context_menu();
 	void _update_context_menu();
+#endif // ADVANCED_GUI_DISABLED
 
 	void _shape();
 	void _fit_to_width();
@@ -288,7 +297,9 @@ public:
 	void menu_option(int p_option);
 	void set_context_menu_enabled(bool p_enable);
 	bool is_context_menu_enabled();
+#ifndef ADVANCED_GUI_DISABLED
 	PopupMenu *get_menu() const;
+#endif // ADVANCED_GUI_DISABLED
 	bool is_menu_visible() const;
 
 	void show_emoji_and_symbol_picker();
diff --git a/scene/main/status_indicator.cpp b/scene/main/status_indicator.cpp
index f0ba5db1a08..92d6ef3eb50 100644
--- a/scene/main/status_indicator.cpp
+++ b/scene/main/status_indicator.cpp
@@ -30,7 +30,9 @@
 
 #include "status_indicator.h"
 
-#include "scene/gui/popup_menu.h"
+#ifndef ADVANCED_GUI_DISABLED
+#include "scene/gui/advanced/popup_menu.h"
+#endif // ADVANCED_GUI_DISABLED
 
 void StatusIndicator::_notification(int p_what) {
 	ERR_MAIN_THREAD_GUARD;
@@ -45,22 +47,26 @@ void StatusIndicator::_notification(int p_what) {
 			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_STATUS_INDICATOR)) {
 				if (visible && iid == DisplayServer::INVALID_INDICATOR_ID) {
 					iid = DisplayServer::get_singleton()->create_status_indicator(icon, tooltip, callable_mp(this, &StatusIndicator::_callback));
+#ifndef ADVANCED_GUI_DISABLED
 					PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 					if (pm) {
 						RID menu_rid = pm->bind_global_menu();
 						DisplayServer::get_singleton()->status_indicator_set_menu(iid, menu_rid);
 					}
+#endif // ADVANCED_GUI_DISABLED
 				}
 			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_STATUS_INDICATOR)) {
 				if (iid != DisplayServer::INVALID_INDICATOR_ID) {
+#ifndef ADVANCED_GUI_DISABLED
 					PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 					if (pm) {
 						pm->unbind_global_menu();
 						DisplayServer::get_singleton()->status_indicator_set_menu(iid, RID());
 					}
+#endif // ADVANCED_GUI_DISABLED
 					DisplayServer::get_singleton()->delete_status_indicator(iid);
 					iid = DisplayServer::INVALID_INDICATOR_ID;
 				}
@@ -119,6 +125,7 @@ String StatusIndicator::get_tooltip() const {
 }
 
 void StatusIndicator::set_menu(const NodePath &p_menu) {
+#ifndef ADVANCED_GUI_DISABLED
 	PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 	if (pm) {
 		pm->unbind_global_menu();
@@ -126,9 +133,11 @@ void StatusIndicator::set_menu(const NodePath &p_menu) {
 			DisplayServer::get_singleton()->status_indicator_set_menu(iid, RID());
 		}
 	}
+#endif // ADVANCED_GUI_DISABLED
 
 	menu = p_menu;
 
+#ifndef ADVANCED_GUI_DISABLED
 	pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 	if (pm) {
 		if (iid != DisplayServer::INVALID_INDICATOR_ID) {
@@ -136,6 +145,7 @@ void StatusIndicator::set_menu(const NodePath &p_menu) {
 			DisplayServer::get_singleton()->status_indicator_set_menu(iid, menu_rid);
 		}
 	}
+#endif // ADVANCED_GUI_DISABLED
 }
 
 NodePath StatusIndicator::get_menu() const {
@@ -162,18 +172,22 @@ void StatusIndicator::set_visible(bool p_visible) {
 	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_STATUS_INDICATOR)) {
 		if (visible && iid == DisplayServer::INVALID_INDICATOR_ID) {
 			iid = DisplayServer::get_singleton()->create_status_indicator(icon, tooltip, callable_mp(this, &StatusIndicator::_callback));
+#ifndef ADVANCED_GUI_DISABLED
 			PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 			if (pm) {
 				RID menu_rid = pm->bind_global_menu();
 				DisplayServer::get_singleton()->status_indicator_set_menu(iid, menu_rid);
 			}
+#endif // ADVANCED_GUI_DISABLED
 		}
 		if (!visible && iid != DisplayServer::INVALID_INDICATOR_ID) {
+#ifndef ADVANCED_GUI_DISABLED
 			PopupMenu *pm = Object::cast_to<PopupMenu>(get_node_or_null(menu));
 			if (pm) {
 				pm->unbind_global_menu();
 				DisplayServer::get_singleton()->status_indicator_set_menu(iid, RID());
 			}
+#endif // ADVANCED_GUI_DISABLED
 			DisplayServer::get_singleton()->delete_status_indicator(iid);
 			iid = DisplayServer::INVALID_INDICATOR_ID;
 		}
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index d0054baeff2..a8de6e5a989 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -43,11 +43,13 @@
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/3d/world_environment.h"
 #endif // _3D_DISABLED
+#ifndef ADVANCED_GUI_DISABLED
+#include "scene/gui/advanced/popup_menu.h"
+#include "scene/gui/advanced/subviewport_container.h"
+#endif // ADVANCED_GUI_DISABLED
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/subviewport_container.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
 #include "scene/resources/mesh.h"
@@ -725,8 +727,12 @@ void Viewport::_process_picking() {
 
 	PhysicsDirectSpaceState2D *ss2d = PhysicsServer2D::get_singleton()->space_get_direct_state(find_world_2d()->get_space());
 
+#ifndef ADVANCED_GUI_DISABLED
 	SubViewportContainer *parent_svc = Object::cast_to<SubViewportContainer>(get_parent());
 	bool parent_ignore_mouse = (parent_svc && parent_svc->get_mouse_filter() == Control::MOUSE_FILTER_IGNORE);
+#else
+	bool parent_ignore_mouse = false;
+#endif // ADVANCED_GUI_DISABLED
 	bool create_passive_hover_event = true;
 	if (gui.mouse_over || parent_ignore_mouse) {
 		// When the mouse is over a Control node, passive hovering would cause input events for Colliders, that are behind Control nodes.
@@ -1254,7 +1260,11 @@ Ref<World2D> Viewport::find_world_2d() const {
 void Viewport::_propagate_drag_notification(Node *p_node, int p_what) {
 	// Send notification to p_node and all children and descendant nodes of p_node, except to SubViewports which are not children of a SubViewportContainer.
 	p_node->notification(p_what);
+#ifndef ADVANCED_GUI_DISABLED
 	bool is_svc = Object::cast_to<SubViewportContainer>(p_node);
+#else
+	bool is_svc = false;
+#endif // ADVANCED_GUI_DISABLED
 	for (int i = 0; i < p_node->get_child_count(); i++) {
 		Node *c = p_node->get_child(i);
 		if (!is_svc && Object::cast_to<SubViewport>(c)) {
@@ -1455,11 +1465,13 @@ String Viewport::_gui_get_tooltip(Control *p_control, const Vector2 &p_pos, Cont
 	while (p_control) {
 		tooltip = p_control->get_tooltip(pos);
 
+#ifndef ADVANCED_GUI_DISABLED
 		// Temporary solution for PopupMenus.
 		PopupMenu *menu = Object::cast_to<PopupMenu>(this);
 		if (menu) {
 			tooltip = menu->get_tooltip(pos);
 		}
+#endif // ADVANCED_GUI_DISABLED
 
 		if (r_tooltip_owner) {
 			*r_tooltip_owner = p_control;
@@ -2060,7 +2072,12 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 			}
 		}
 
-		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE) && (gui.dragging || (!section_root->gui.global_dragging && !Object::cast_to<SubViewportContainer>(over)))) {
+#ifndef ADVANCED_GUI_DISABLED
+		bool is_svc = Object::cast_to<SubViewportContainer>(over);
+#else
+		bool is_svc = false;
+#endif // ADVANCED_GUI_DISABLED
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE) && (gui.dragging || (!section_root->gui.global_dragging && !is_svc))) {
 			// If dragging is active, then set the cursor shape only from the Viewport where dragging started.
 			// If dragging is inactive, then set the cursor shape only when not over a SubViewportContainer.
 			DisplayServer::get_singleton()->cursor_set_shape(ds_cursor_shape);
@@ -3077,7 +3094,9 @@ void Viewport::_update_mouse_over(Vector2 p_pos) {
 	// Look for Controls at mouse position.
 	Control *over = gui_find_control(p_pos);
 	get_section_root_viewport()->gui.target_control = over;
+#ifndef ADVANCED_GUI_DISABLED
 	bool notify_embedded_viewports = false;
+#endif // ADVANCED_GUI_DISABLED
 	if (over != gui.mouse_over || (!over && !gui.mouse_over_hierarchy.is_empty())) {
 		// Find the common ancestor of `gui.mouse_over` and `over`.
 		Control *common_ancestor = nullptr;
@@ -3136,10 +3155,12 @@ void Viewport::_update_mouse_over(Vector2 p_pos) {
 
 			gui.sending_mouse_enter_exit_notifications = false;
 
+#ifndef ADVANCED_GUI_DISABLED
 			notify_embedded_viewports = true;
+#endif // ADVANCED_GUI_DISABLED
 		}
 	}
-
+#ifndef ADVANCED_GUI_DISABLED
 	if (over) {
 		SubViewportContainer *c = Object::cast_to<SubViewportContainer>(over);
 		if (!c) {
@@ -3169,6 +3190,7 @@ void Viewport::_update_mouse_over(Vector2 p_pos) {
 			section_root->gui.target_control = over;
 		}
 	}
+#endif // ADVANCED_GUI_DISABLED
 }
 
 void Viewport::_mouse_leave_viewport() {
@@ -3192,6 +3214,7 @@ void Viewport::_drop_mouse_over(Control *p_until_control) {
 	}
 
 	_gui_cancel_tooltip();
+#ifndef ADVANCED_GUI_DISABLED
 	SubViewportContainer *c = Object::cast_to<SubViewportContainer>(gui.mouse_over);
 	if (c) {
 		for (int i = 0; i < c->get_child_count(); i++) {
@@ -3202,6 +3225,7 @@ void Viewport::_drop_mouse_over(Control *p_until_control) {
 			v->_mouse_leave_viewport();
 		}
 	}
+#endif // ADVANCED_GUI_DISABLED
 
 	gui.sending_mouse_enter_exit_notifications = true;
 	if (gui.mouse_over && gui.mouse_over->is_inside_tree()) {
@@ -5195,6 +5219,7 @@ void SubViewport::set_size_force(const Size2i &p_size) {
 }
 
 void SubViewport::_internal_set_size(const Size2i &p_size, bool p_force) {
+#ifndef ADVANCED_GUI_DISABLED
 	SubViewportContainer *c = Object::cast_to<SubViewportContainer>(get_parent());
 	if (!p_force && c && c->is_stretch_enabled()) {
 #ifdef DEBUG_ENABLED
@@ -5202,13 +5227,16 @@ void SubViewport::_internal_set_size(const Size2i &p_size, bool p_force) {
 #endif // DEBUG_ENABLED
 		return;
 	}
+#endif // ADVANCED_GUI_DISABLED
 
 	_set_size(p_size, _get_size_2d_override(), true);
 
+#ifndef ADVANCED_GUI_DISABLED
 	if (c) {
 		c->update_minimum_size();
 		c->queue_redraw();
 	}
+#endif // ADVANCED_GUI_DISABLED
 }
 
 Size2i SubViewport::get_size() const {
@@ -5271,13 +5299,16 @@ DisplayServer::WindowID SubViewport::get_window_id() const {
 Transform2D SubViewport::get_screen_transform_internal(bool p_absolute_position) const {
 	ERR_READ_THREAD_GUARD_V(Transform2D());
 	Transform2D container_transform;
+#ifndef ADVANCED_GUI_DISABLED
 	SubViewportContainer *c = Object::cast_to<SubViewportContainer>(get_parent());
 	if (c) {
 		if (c->is_stretch_enabled()) {
 			container_transform.scale(Vector2(c->get_stretch_shrink(), c->get_stretch_shrink()));
 		}
 		container_transform = c->get_viewport()->get_screen_transform_internal(p_absolute_position) * c->get_global_transform_with_canvas() * container_transform;
-	} else {
+	} else
+#endif // ADVANCED_GUI_DISABLED
+	{
 		WARN_PRINT_ONCE("SubViewport is not a child of a SubViewportContainer. get_screen_transform doesn't return the actual screen position.");
 	}
 	return container_transform * get_final_transform();
@@ -5288,27 +5319,38 @@ Transform2D SubViewport::get_popup_base_transform() const {
 	if (is_embedding_subwindows()) {
 		return Transform2D();
 	}
+#ifndef ADVANCED_GUI_DISABLED
 	SubViewportContainer *c = Object::cast_to<SubViewportContainer>(get_parent());
-	if (!c) {
+	if (!c)
+#endif // ADVANCED_GUI_DISABLED
+	{
 		return get_final_transform();
 	}
+#ifndef ADVANCED_GUI_DISABLED
 	Transform2D container_transform;
 	if (c->is_stretch_enabled()) {
 		container_transform.scale(Vector2(c->get_stretch_shrink(), c->get_stretch_shrink()));
 	}
 	return c->get_screen_transform() * container_transform * get_final_transform();
+#endif // ADVANCED_GUI_DISABLED
 }
 
 Viewport *SubViewport::get_section_root_viewport() const {
+#ifndef ADVANCED_GUI_DISABLED
 	if (Object::cast_to<SubViewportContainer>(get_parent()) && get_parent()->get_viewport()) {
 		return get_parent()->get_viewport()->get_section_root_viewport();
 	}
+#endif // ADVANCED_GUI_DISABLED
 	SubViewport *vp = const_cast<SubViewport *>(this);
 	return vp;
 }
 
 bool SubViewport::is_attached_in_viewport() const {
+#ifndef ADVANCED_GUI_DISABLED
 	return Object::cast_to<SubViewportContainer>(get_parent());
+#else
+	return false;
+#endif // ADVANCED_GUI_DISABLED
 }
 
 void SubViewport::_notification(int p_what) {
@@ -5317,10 +5359,12 @@ void SubViewport::_notification(int p_what) {
 		case NOTIFICATION_ENTER_TREE: {
 			RS::get_singleton()->viewport_set_active(get_viewport_rid(), true);
 
+#ifndef ADVANCED_GUI_DISABLED
 			SubViewportContainer *parent_svc = Object::cast_to<SubViewportContainer>(get_parent());
 			if (parent_svc) {
 				parent_svc->recalc_force_viewport_sizes();
 			}
+#endif // ADVANCED_GUI_DISABLED
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
@@ -5365,10 +5409,13 @@ void SubViewport::_bind_methods() {
 
 void SubViewport::_validate_property(PropertyInfo &p_property) const {
 	if (p_property.name == "size") {
+#ifndef ADVANCED_GUI_DISABLED
 		SubViewportContainer *parent_svc = Object::cast_to<SubViewportContainer>(get_parent());
 		if (parent_svc && parent_svc->is_stretch_enabled()) {
 			p_property.usage = PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY;
-		} else {
+		} else
+#endif // ADVANCED_GUI_DISABLED
+		{
 			p_property.usage = PROPERTY_USAGE_DEFAULT;
 		}
 	}
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index a665fa90b8b..e59e308af9c 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -44,53 +44,55 @@
 #include "scene/animation/tween.h"
 #include "scene/audio/audio_stream_player.h"
 #include "scene/debugger/scene_debugger.h"
+#ifndef ADVANCED_GUI_DISABLED
+#include "scene/gui/advanced/code_edit.h"
+#include "scene/gui/advanced/color_picker.h"
+#include "scene/gui/advanced/dialogs.h"
+#include "scene/gui/advanced/file_dialog.h"
+#include "scene/gui/advanced/graph_edit.h"
+#include "scene/gui/advanced/graph_frame.h"
+#include "scene/gui/advanced/graph_node.h"
+#include "scene/gui/advanced/menu_bar.h"
+#include "scene/gui/advanced/menu_button.h"
+#include "scene/gui/advanced/option_button.h"
+#include "scene/gui/advanced/popup_menu.h"
+#include "scene/gui/advanced/rich_text_effect.h"
+#include "scene/gui/advanced/rich_text_label.h"
+#include "scene/gui/advanced/spin_box.h"
+#include "scene/gui/advanced/split_container.h"
+#include "scene/gui/advanced/subviewport_container.h"
+#include "scene/gui/advanced/text_edit.h"
+#include "scene/gui/advanced/tree.h"
+#endif // ADVANCED_GUI_DISABLED
 #include "scene/gui/aspect_ratio_container.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
-#include "scene/gui/code_edit.h"
-#include "scene/gui/color_picker.h"
 #include "scene/gui/color_rect.h"
 #include "scene/gui/control.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
 #include "scene/gui/flow_container.h"
-#include "scene/gui/graph_edit.h"
-#include "scene/gui/graph_frame.h"
-#include "scene/gui/graph_node.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/link_button.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/menu_bar.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/nine_patch_rect.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/reference_rect.h"
-#include "scene/gui/rich_text_effect.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/scroll_bar.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/subviewport_container.h"
 #include "scene/gui/tab_bar.h"
 #include "scene/gui/tab_container.h"
-#include "scene/gui/text_edit.h"
 #include "scene/gui/texture_button.h"
 #include "scene/gui/texture_progress_bar.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
 #include "scene/gui/video_stream_player.h"
 #include "scene/main/canvas_item.h"
 #include "scene/main/canvas_layer.h"
@@ -1264,11 +1266,13 @@ void register_scene_types() {
 		GLOBAL_DEF_BASIC(vformat("%s/layer_%d", PNAME("layer_names/avoidance"), i + 1), "");
 	}
 
+#ifndef ADVANCED_GUI_DISABLED
 	if (RenderingServer::get_singleton()) {
 		// RenderingServer needs to exist for this to succeed.
 		ColorPicker::init_shaders();
 		GraphEdit::init_shaders();
 	}
+#endif // ADVANCED_GUI_DISABLED
 
 	SceneDebugger::initialize();
 
@@ -1318,8 +1322,10 @@ void unregister_scene_types() {
 
 	ParticleProcessMaterial::finish_shaders();
 	CanvasItemMaterial::finish_shaders();
+#ifndef ADVANCED_GUI_DISABLED
 	ColorPicker::finish_shaders();
 	GraphEdit::finish_shaders();
+#endif // ADVANCED_GUI_DISABLED
 	SceneStringNames::free();
 
 	OS::get_singleton()->benchmark_end_measure("Scene", "Unregister Types");
diff --git a/scene/resources/syntax_highlighter.cpp b/scene/resources/syntax_highlighter.cpp
index 5a835b64b3c..c844518b298 100644
--- a/scene/resources/syntax_highlighter.cpp
+++ b/scene/resources/syntax_highlighter.cpp
@@ -30,7 +30,7 @@
 
 #include "syntax_highlighter.h"
 
-#include "scene/gui/text_edit.h"
+#include "scene/gui/advanced/text_edit.h"
 
 Dictionary SyntaxHighlighter::get_line_syntax_highlighting(int p_line) {
 	if (highlighting_cache.has(p_line)) {
diff --git a/scu_builders.py b/scu_builders.py
index 8e1f91d7406..a46f320ce23 100644
--- a/scu_builders.py
+++ b/scu_builders.py
@@ -345,6 +345,8 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["scene/3d/physics/joints"])
     process_folder(["scene/animation"])
     process_folder(["scene/gui"])
+    process_folder(["scene/gui/advanced"])
+
     process_folder(["scene/main"])
     process_folder(["scene/theme"])
     process_folder(["scene/resources"])
diff --git a/tests/scene/test_code_edit.h b/tests/scene/test_code_edit.h
index 1c85d3e41c3..988ed39a58a 100644
--- a/tests/scene/test_code_edit.h
+++ b/tests/scene/test_code_edit.h
@@ -31,7 +31,7 @@
 #ifndef TEST_CODE_EDIT_H
 #define TEST_CODE_EDIT_H
 
-#include "scene/gui/code_edit.h"
+#include "scene/gui/advanced/code_edit.h"
 
 #include "tests/test_macros.h"
 
diff --git a/tests/scene/test_color_picker.h b/tests/scene/test_color_picker.h
index 0c657a0167a..7b6bc10e7f5 100644
--- a/tests/scene/test_color_picker.h
+++ b/tests/scene/test_color_picker.h
@@ -31,7 +31,7 @@
 #ifndef TEST_COLOR_PICKER_H
 #define TEST_COLOR_PICKER_H
 
-#include "scene/gui/color_picker.h"
+#include "scene/gui/advanced/color_picker.h"
 
 #include "tests/test_macros.h"
 
diff --git a/tests/scene/test_graph_node.h b/tests/scene/test_graph_node.h
index 7973ac14448..23f3430af19 100644
--- a/tests/scene/test_graph_node.h
+++ b/tests/scene/test_graph_node.h
@@ -31,7 +31,7 @@
 #ifndef TEST_GRAPH_NODE_H
 #define TEST_GRAPH_NODE_H
 
-#include "scene/gui/graph_node.h"
+#include "scene/gui/advanced/graph_node.h"
 #include "scene/main/window.h"
 
 #include "tests/test_macros.h"
diff --git a/tests/scene/test_option_button.h b/tests/scene/test_option_button.h
index 56c1c7d6112..6a4a2ec7d62 100644
--- a/tests/scene/test_option_button.h
+++ b/tests/scene/test_option_button.h
@@ -31,7 +31,7 @@
 #ifndef TEST_OPTION_BUTTON_H
 #define TEST_OPTION_BUTTON_H
 
-#include "scene/gui/option_button.h"
+#include "scene/gui/advanced/option_button.h"
 
 #include "tests/test_macros.h"
 
diff --git a/tests/scene/test_split_container.h b/tests/scene/test_split_container.h
index 183ab21691c..1f9642627b0 100644
--- a/tests/scene/test_split_container.h
+++ b/tests/scene/test_split_container.h
@@ -31,7 +31,7 @@
 #ifndef TEST_SPLIT_CONTAINER_H
 #define TEST_SPLIT_CONTAINER_H
 
-#include "scene/gui/split_container.h"
+#include "scene/gui/advanced/split_container.h"
 #include "scene/main/window.h"
 
 #include "tests/test_macros.h"
diff --git a/tests/scene/test_text_edit.h b/tests/scene/test_text_edit.h
index d7192def621..ae23bdb1a1e 100644
--- a/tests/scene/test_text_edit.h
+++ b/tests/scene/test_text_edit.h
@@ -31,7 +31,7 @@
 #ifndef TEST_TEXT_EDIT_H
 #define TEST_TEXT_EDIT_H
 
-#include "scene/gui/text_edit.h"
+#include "scene/gui/advanced/text_edit.h"
 
 #include "tests/test_macros.h"
 
diff --git a/tests/scene/test_tree.h b/tests/scene/test_tree.h
index a74158d328c..90170532920 100644
--- a/tests/scene/test_tree.h
+++ b/tests/scene/test_tree.h
@@ -31,7 +31,7 @@
 #ifndef TEST_TREE_H
 #define TEST_TREE_H
 
-#include "scene/gui/tree.h"
+#include "scene/gui/advanced/tree.h"
 
 #include "tests/test_macros.h"
 
diff --git a/tests/scene/test_viewport.h b/tests/scene/test_viewport.h
index dbf348ba962..510cff5df70 100644
--- a/tests/scene/test_viewport.h
+++ b/tests/scene/test_viewport.h
@@ -34,7 +34,9 @@
 #include "scene/2d/physics/area_2d.h"
 #include "scene/2d/physics/collision_shape_2d.h"
 #include "scene/gui/control.h"
-#include "scene/gui/subviewport_container.h"
+#ifndef ADVANCED_GUI_DISABLED
+#include "scene/gui/advanced/subviewport_container.h"
+#endif // ADVANCED_GUI_DISABLED
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
 #include "scene/resources/2d/rectangle_shape_2d.h"
@@ -1364,6 +1366,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 		}
 
 		SUBCASE("[Viewport][GuiInputEvent][DnD] Drag to a different Viewport.") {
+#ifndef ADVANCED_GUI_DISABLED
 			SubViewportContainer *svc = memnew(SubViewportContainer);
 			svc->set_size(Size2(100, 100));
 			svc->set_position(Point2(200, 50));
@@ -1385,6 +1388,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 			sv_b->set_size(Size2(20, 20));
 			sv->add_child(sv_b);
 			Point2i on_svb = Point2i(235, 85);
+#endif // ADVANCED_GUI_DISABLED
 
 			Window *ew = memnew(Window);
 			ew->set_position(Point2(50, 200));
@@ -1403,6 +1407,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 			ew->add_child(ew_b);
 			Point2i on_ewb = Point2i(85, 235);
 
+#ifndef ADVANCED_GUI_DISABLED
 			SUBCASE("[Viewport][GuiInputEvent][DnD] Drag to SubViewport") {
 				sv_b->valid_drop = false;
 				SEND_GUI_MOUSE_BUTTON_EVENT(on_a, MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
@@ -1430,6 +1435,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 				CHECK(node_d->valid_drop);
 				CHECK(!node_d->during_drag);
 			}
+#endif // ADVANCED_GUI_DISABLED
 
 			SUBCASE("[Viewport][GuiInputEvent][DnD] Drag to embedded Window") {
 				ew_b->valid_drop = false;
@@ -1462,10 +1468,12 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 			memdelete(ew_a);
 			memdelete(ew_b);
 			memdelete(ew);
+#ifndef ADVANCED_GUI_DISABLED
 			memdelete(sv_a);
 			memdelete(sv_b);
 			memdelete(sv);
 			memdelete(svc);
+#endif // ADVANCED_GUI_DISABLED
 		}
 	}
 
@@ -1482,6 +1490,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 }
 
 TEST_CASE("[SceneTree][Viewport] Control mouse cursor shape") {
+#ifndef ADVANCED_GUI_DISABLED
 	SUBCASE("[Viewport][CursorShape] Mouse cursor is not overridden by SubViewportContainer") {
 		SubViewportContainer *node_a = memnew(SubViewportContainer);
 		SubViewport *node_b = memnew(SubViewport);
@@ -1519,6 +1528,7 @@ TEST_CASE("[SceneTree][Viewport] Control mouse cursor shape") {
 		memdelete(node_b);
 		memdelete(node_a);
 	}
+#endif // ADVANCED_GUI_DISABLED
 }
 
 class TestArea2D : public Area2D {