diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.form b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.form
index 206aef278bf9..423e4c1a4187 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.form
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.form
@@ -173,7 +173,7 @@
                       <grid row="2" 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 value="&amp;Temporary"/>
+                      <text value="&amp;Remove once hit"/>
                     </properties>
                   </component>
                 </children>
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
index cc21c0ee9b40..f78b7dbc4e47 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
@@ -533,7 +533,7 @@ public abstract class BreakpointPropertiesPanel {
     myLogMessageCheckBox.setSelected(breakpoint.LOG_ENABLED);
     myTemporaryCheckBox.setSelected(breakpoint.REMOVE_AFTER_HIT);
     myEnabledCheckbox.setSelected(breakpoint.ENABLED);
-    myEnabledCheckbox.setText(breakpoint.getShortName());
+    myEnabledCheckbox.setText(breakpoint.getShortName() + " enabled");
     myEnabledCheckbox.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent event) {
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 2d1a30e9f834..bda64b01f894 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
@@ -106,6 +106,7 @@ public class BreakpointsDialog extends DialogWrapper {
     setTitle("Breakpoints");
     setModal(false);
     init();
+    setOKButtonText("Done");
   }
 
   private String getSplitterProportionKey() {
@@ -171,11 +172,6 @@ public class BreakpointsDialog extends DialogWrapper {
     return new Action[]{getOKAction()};
   }
 
-  private static Font smaller(Font f) {
-    return f.deriveFont(f.getStyle(), f.getSize() - 2);
-  }
-
-
   private class ToggleBreakpointGroupingRuleEnabledAction extends ToggleActionButton {
     private XBreakpointGroupingRule myRule;
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.form b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.form
index a5f353c7518d..af0292479091 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.form
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.form
@@ -59,7 +59,7 @@
               <grid row="2" 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 value="&amp;Temporary"/>
+              <text value="&amp;Remove once hit"/>
             </properties>
           </component>
         </children>
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java
index c547c2e09074..6be7cd05eaa0 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java
@@ -196,7 +196,7 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> implement
       customPanel.loadFrom(myBreakpoint);
     }
     myEnabledCheckbox.setSelected(myBreakpoint.isEnabled());
-    myEnabledCheckbox.setText(XBreakpointUtil.getShortText(myBreakpoint));
+    myEnabledCheckbox.setText(XBreakpointUtil.getShortText(myBreakpoint) + " enabled");
   }
 
   public JPanel getMainPanel() {