diff --git a/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.form b/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.form
index c6a6a46348e0..61bf224c1ac1 100644
--- a/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.form
+++ b/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.form
@@ -3,12 +3,12 @@
   <grid id="27dc6" binding="myMainPanel" default-binding="true" layout-manager="GridLayoutManager" row-count="2" 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>
-      <xy x="20" y="20" width="557" height="400"/>
+      <xy x="20" y="20" width="567" height="424"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="c4b8f" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="c4b8f" binding="myMavenPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
@@ -17,7 +17,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="none" title="Maven Jar Repositories"/>
+        <border type="none"/>
         <children>
           <scrollpane id="73c10" class="com.intellij.ui.components.JBScrollPane">
             <constraints>
@@ -82,7 +82,7 @@
           </grid>
         </children>
       </grid>
-      <grid id="408c" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="408c" binding="myServiceListPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -91,7 +91,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="none" title="Artifactory, Nexus or Bintray Service URLs:"/>
+        <border type="none"/>
         <children>
           <scrollpane id="3bdae" class="com.intellij.ui.components.JBScrollPane">
             <constraints>
diff --git a/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.java b/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.java
index 120f69ee0163..1ea1a4d99cac 100644
--- a/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.java
+++ b/java/idea-ui/src/com/intellij/jarRepository/settings/RemoteRepositoriesConfigurable.java
@@ -13,10 +13,12 @@ import com.intellij.openapi.ui.InputValidator;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.CollectionListModel;
+import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.ListUtil;
 import com.intellij.ui.SimpleListCellRenderer;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -43,6 +45,8 @@ public class RemoteRepositoriesConfigurable implements SearchableConfigurable, C
   private JButton myRemoveRepoButton;
   private JButton myResetToDefaultReposButton;
   private JButton myResetToDefaultServicesButton;
+  private JPanel myMavenPanel;
+  private JPanel myServiceListPanel;
 
   private final Project myProject;
   private final CollectionListModel<String> myServicesModel = new CollectionListModel<>();
@@ -68,6 +72,9 @@ public class RemoteRepositoriesConfigurable implements SearchableConfigurable, C
   }
 
   private void configControls() {
+    myMavenPanel.setBorder(IdeBorderFactory.createTitledBorder("Maven jar repositories:", false, JBUI.insetsTop(8)).setShowLine(false));
+    myServiceListPanel.setBorder(IdeBorderFactory.createTitledBorder("Artifactory, Nexus or Bintray Service URLs:", false, JBUI.insetsTop(8)).setShowLine(false));
+
     setupListControls(
       myServiceList, myServicesModel, myAddServiceButton, myEditServiceButton, myRemoveServiceButton,
       "Artifactory, Nexus or Bintray Service URLs", "Service URL", "No services", DataAdapter.STRING_ADAPTER