diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index 50ef26385..26b0d0f25 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -162,6 +162,9 @@
 		<member name="docks/filesystem/thumbnail_size" type="int" setter="" getter="">
 			The thumbnail size to use in the FileSystem dock (in pixels). See also [member filesystem/file_dialog/thumbnail_size].
 		</member>
+		<member name="docks/filesystem/wide_bottom_panel" type="bool" setter="" getter="">
+			If [code]true[/code], the editor will display the FileSystem panel at the bottom as an openable panel instead of a dock.
+		</member>
 		<member name="docks/property_editor/auto_refresh_interval" type="float" setter="" getter="">
 			The refresh interval to use for the inspector dock's properties. The effect of this setting is mainly noticeable when adjusting gizmos in the 2D/3D editor and looking at the inspector at the same time. Lower values make the inspector more often, but take up more CPU time.
 		</member>
@@ -397,6 +400,9 @@
 			- [b]Cancel First[/b] forces the ordering Cancel/OK.
 			- [b]OK First[/b] forces the ordering OK/Cancel.
 		</member>
+		<member name="interface/editor/hide_main_screen_plugin_names" type="bool" setter="" getter="">
+			If [code]true[/code] the names of the main screen plugins will be hidden (when they have an icon).
+		</member>
 		<member name="interface/editor/automatically_open_screenshots" type="bool" setter="" getter="">
 			If [code]true[/code], automatically opens screenshots with the default program associated to [code].png[/code] files after a screenshot is taken using the [b]Editor &gt; Take Screenshot[/b] action.
 		</member>
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 380859617..8547e637d 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -354,6 +354,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("interface/editor/quit_confirmation", true);
 	_initial_set("interface/editor/accept_dialog_cancel_ok_buttons", 0);
 	hints["interface/editor/accept_dialog_cancel_ok_buttons"] = PropertyInfo(Variant::INT, "interface/editor/accept_dialog_cancel_ok_buttons", PROPERTY_HINT_ENUM, vformat("Auto (%s),Cancel First,OK First", OS::get_singleton()->get_swap_ok_cancel() ? "OK First" : "Cancel First"), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED);
+	_initial_set("interface/editor/hide_main_screen_plugin_names", false);
 
 	// Inspector
 	_initial_set("interface/inspector/max_array_dictionary_items_per_page", 20);
@@ -426,6 +427,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("docks/filesystem/thumbnail_size", 64);
 	hints["docks/filesystem/thumbnail_size"] = PropertyInfo(Variant::INT, "docks/filesystem/thumbnail_size", PROPERTY_HINT_RANGE, "32,128,16");
 	_initial_set("docks/filesystem/always_show_folders", true);
+	_initial_set("docks/filesystem/wide_bottom_panel", false);
 
 	// Property editor
 	_initial_set("docks/property_editor/auto_refresh_interval", 0.3);
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 95194d42d..7952ec97d 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -2889,8 +2889,6 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 	VBoxContainer *top_vbc = memnew(VBoxContainer);
 	add_child(top_vbc);
 
-
-
 	HBoxContainer *toolbar_hbc = memnew(HBoxContainer);
 	toolbar_hbc->add_theme_constant_override("separation", 0);
 	top_vbc->add_child(toolbar_hbc);