diff --git a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.form b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.form
index df88a087c4a4..c1f3a6de73ce 100644
--- a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.form
+++ b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.form
@@ -131,24 +131,6 @@
                           <text resource-bundle="messages/ApplicationBundle" key="margin.columns"/>
                         </properties>
                       </component>
-                      <grid id="30317" binding="myIndentsDetectionPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                        <margin top="0" left="0" bottom="0" right="0"/>
-                        <constraints>
-                          <grid row="5" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-                        </constraints>
-                        <properties/>
-                        <border type="none" title-resource-bundle="messages/ApplicationBundle" title-key="settings.code.style.general.indents.detection"/>
-                        <children>
-                          <component id="253fc" class="javax.swing.JCheckBox" binding="myAutodetectIndentsBox">
-                            <constraints>
-                              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                            </constraints>
-                            <properties>
-                              <text resource-bundle="messages/ApplicationBundle" key="settings.code.style.general.autodetect.indents"/>
-                            </properties>
-                          </component>
-                        </children>
-                      </grid>
                       <grid id="5c88a" binding="myAdditionalSettingsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                         <constraints>
                           <grid row="6" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -157,6 +139,14 @@
                         <border type="none"/>
                         <children/>
                       </grid>
+                      <component id="253fc" class="javax.swing.JCheckBox" binding="myAutodetectIndentsBox">
+                        <constraints>
+                          <grid row="5" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <text resource-bundle="messages/ApplicationBundle" key="settings.code.style.general.autodetect.indents"/>
+                        </properties>
+                      </component>
                     </children>
                   </grid>
                   <grid id="b4d8" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
diff --git a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
index 5a9cf7c4d182..a71c758d3ef1 100644
--- a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
@@ -29,6 +29,7 @@ import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.ex.ConfigurableWrapper;
 import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.ui.VerticalFlowLayout;
 import com.intellij.openapi.ui.popup.Balloon;
@@ -72,7 +73,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
 
   private IntegerField myRightMarginField;
 
-  private com.intellij.openapi.ui.ComboBox myLineSeparatorCombo;
+  private ComboBox myLineSeparatorCombo;
   private JPanel myPanel;
   private JBCheckBox myCbWrapWhenTypingReachesRightMargin;
   private JCheckBox myEnableFormatterTags;
@@ -84,7 +85,6 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
   private JPanel myMarkerOptionsPanel;
   private JPanel myAdditionalSettingsPanel;
   private JCheckBox myAutodetectIndentsBox;
-  private JPanel myIndentsDetectionPanel;
   private CommaSeparatedIntegersField myVisualGuides;
   private JBLabel myVisualGuidesHint;
   private JBLabel myLineSeparatorHint;
@@ -116,8 +116,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
       setFormatterTagControlsEnabled(tagsEnabled);
     });
 
-    myIndentsDetectionPanel
-      .setBorder(IdeBorderFactory.createTitledBorder(ApplicationBundle.message("settings.code.style.general.indents.detection")));
+    myAutodetectIndentsBox.setBorder(JBUI.Borders.emptyTop(10));
 
     myPanel.setBorder(JBUI.Borders.empty(0, 10));
     myScrollPane = ScrollPaneFactory.createScrollPane(null, true);
@@ -129,6 +128,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
     for (GeneralCodeStyleOptionsProvider provider : myAdditionalOptions) {
       JComponent generalSettingsComponent = provider.createComponent();
       if (generalSettingsComponent != null) {
+        myAdditionalSettingsPanel.add(Box.createRigidArea(JBUI.size(0, 5)));
         myAdditionalSettingsPanel.add(generalSettingsComponent);
       }
     }
diff --git a/plugins/editorconfig/src/org/editorconfig/settings/EditorConfigConfigurable.kt b/plugins/editorconfig/src/org/editorconfig/settings/EditorConfigConfigurable.kt
index 33a9545472f7..f86752bdf2d8 100644
--- a/plugins/editorconfig/src/org/editorconfig/settings/EditorConfigConfigurable.kt
+++ b/plugins/editorconfig/src/org/editorconfig/settings/EditorConfigConfigurable.kt
@@ -29,7 +29,7 @@ class EditorConfigConfigurable : CodeStyleSettingsProvider(), GeneralCodeStyleOp
   private lateinit var myEnabled: JCheckBox
 
   override fun createComponent(): JComponent {
-    return panel(title = EditorConfigBundle.message("config.title")) {
+    return panel {
       row {
         myEnabled = checkBox(EditorConfigBundle.message("config.enable"), comment = EditorConfigBundle.message("config.warning"))