diff --git a/.editorconfig b/.editorconfig
index 91784612cf1..a2f93af3f56 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,24 +3,18 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+indent_size = 4
 indent_style = tab
 insert_final_newline = true
-
-[*.{cpp,hpp,c,h,mm}]
+max_line_length = 120
 trim_trailing_whitespace = true
 
-[{*.gradle,AndroidManifest.xml}]
-indent_style = space
-indent_size = 4
-
 [{*.py,SConstruct,SCsub}]
 indent_style = space
-indent_size = 4
 
-# YAML requires indentation with spaces instead of tabs.
 [{*.{yml,yaml},.clang{-format,-tidy,d}}]
-indent_style = space
 indent_size = 2
+indent_style = space
 
 [*.svg]
 insert_final_newline = false
diff --git a/modules/gdscript/.editorconfig b/modules/gdscript/.editorconfig
deleted file mode 100644
index b380846f863..00000000000
--- a/modules/gdscript/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.gd]
-indent_size = 4
-trim_trailing_whitespace = true
diff --git a/modules/mono/.editorconfig b/modules/mono/.editorconfig
index fcd10461ad4..91df69b7322 100644
--- a/modules/mono/.editorconfig
+++ b/modules/mono/.editorconfig
@@ -2,21 +2,14 @@
 end_of_line = crlf
 charset = utf-8-bom
 
-[*.sln]
-indent_style = tab
-
 [*.{csproj,props,targets,nuspec,resx}]
 indent_style = space
 indent_size = 2
 
 [*.cs]
 indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-max_line_length = 120
-csharp_indent_case_contents_when_block = false
 
+csharp_indent_case_contents_when_block = false
 csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
 csharp_new_line_before_catch = true
diff --git a/platform/android/.editorconfig b/platform/android/.editorconfig
new file mode 100644
index 00000000000..47198ce223f
--- /dev/null
+++ b/platform/android/.editorconfig
@@ -0,0 +1,2 @@
+[{*.gradle,AndroidManifest.xml}]
+indent_style = space