diff --git a/platform/lang-impl/src/com/intellij/find/actions/CompositeActiveComponent.java b/platform/lang-impl/src/com/intellij/find/actions/CompositeActiveComponent.java
index 182efc382e44..5091436d97f1 100644
--- a/platform/lang-impl/src/com/intellij/find/actions/CompositeActiveComponent.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/CompositeActiveComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ class CompositeActiveComponent implements ActiveComponent {
   public CompositeActiveComponent(@NotNull ActiveComponent... components) {
     myComponents = components;
 
-    myComponent = new JPanel(new FlowLayout(FlowLayout.CENTER, JBUI.scale(2), JBUI.scale(4)));
+    myComponent = new JPanel(new FlowLayout(FlowLayout.CENTER, JBUI.scale(2), JBUI.scale(2)));
     myComponent.setBorder(null);
     myComponent.setOpaque(false);
     for (ActiveComponent component : components) {
diff --git a/platform/util/src/com/intellij/ui/CaptionPanel.java b/platform/util/src/com/intellij/ui/CaptionPanel.java
index 632cd22c7b80..9cbd9e879418 100644
--- a/platform/util/src/com/intellij/ui/CaptionPanel.java
+++ b/platform/util/src/com/intellij/ui/CaptionPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@ public class CaptionPanel extends JPanel {
 
   public CaptionPanel() {
     setLayout(new BorderLayout());
-    setBorder(new EmptyBorder(0, 4, 0, 4));
   }
 
   @Override