diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java
index 1925df192b1a..1363d72267b9 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java
@@ -270,13 +270,19 @@ public class BreakpointsDialog extends DialogWrapper {
           }
           return enabled;
         }
-      });
+      }).
+      setToolbarPosition(ActionToolbarPosition.TOP).
+      setToolbarBorder(IdeBorderFactory.createEmptyBorder());
+
+    tree.setBorder(IdeBorderFactory.createBorder());
 
     for (ToggleActionButton action : myToggleRuleActions) {
       decorator.addExtraAction(action);
     }
 
     JPanel decoratedTree = decorator.createPanel();
+    decoratedTree.setBorder(IdeBorderFactory.createEmptyBorder());
+
     myTreeController.setTreeView(tree);
 
     myTreeController.buildTree(myBreakpointItems);