diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java
index fba88ad0d735..82951c4a95ad 100644
--- a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java
@@ -157,8 +157,7 @@ public class GenerateAntBuildDialog extends DialogWrapper {
     }
     myChunksPanel.setLayout(new BorderLayout());
     myChunksPanel.setBorder(
-      IdeBorderFactory.createTitledBorder(CompilerBundle.message("generate.ant.build.dialog.cyclic.modules.table.title"),
-                                          true));
+      IdeBorderFactory.createTitledBorder(CompilerBundle.message("generate.ant.build.dialog.cyclic.modules.table.title")));
     JLabel textLabel = new JLabel(CompilerBundle.message("generate.ant.build.dialog.cyclic.modules.table.description"));
     textLabel.setUI(new MultiLineLabelUI());
     textLabel.setBorder(JBUI.Borders.empty(4, 4, 6, 4));
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java
index f913f621fe13..4671b67901ae 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java
@@ -140,7 +140,7 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
 
 
     final JPanel showPanel = new JPanel(new GridBagLayout());
-    showPanel.setBorder(IdeBorderFactory.createTitledBorder("Show", true));
+    showPanel.setBorder(IdeBorderFactory.createTitledBorder("Show"));
 
     showPanel.add(myCbShowDeclaredType, new GridBagConstraints(0, RELATIVE, 1, 1, 0.0, 0.0, WEST, NONE, JBUI.emptyInsets(), 0, 0));
     showPanel.add(myCbShowObjectId, new GridBagConstraints(0, RELATIVE, 1, 1, 0.0, 0.0, WEST, NONE, JBUI.insetsTop(4), 0, 0));
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracingPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracingPropertiesPanel.java
index 2726839baf17..dadd917c8724 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracingPropertiesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CallTracingPropertiesPanel.java
@@ -40,7 +40,7 @@ public class CallTracingPropertiesPanel extends XBreakpointCustomPropertiesPanel
     _panel.add(myStartTracing);
     _panel.add(myEndTracing);
     _panel.add(filters);
-    _panel.setBorder(IdeBorderFactory.createTitledBorder("Tracing", true));
+    _panel.setBorder(IdeBorderFactory.createTitledBorder("Tracing"));
 
     ActionListener listener = new ActionListener() {
       @Override
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java
index 9f5a1f155261..a4e6ee39277f 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java
@@ -71,7 +71,7 @@ public class ExceptionBreakpointPropertiesPanel extends XBreakpointCustomPropert
     _panel0.add(Box.createHorizontalStrut(3), BorderLayout.EAST);
     _panel.add(_panel0, BorderLayout.NORTH);
     _panel.setBorder(IdeBorderFactory.createTitledBorder(
-      DebuggerBundle.message("label.exception.breakpoint.properties.panel.group.notifications"), true));
+      DebuggerBundle.message("label.exception.breakpoint.properties.panel.group.notifications")));
 
     ActionListener listener = new ActionListener() {
       @Override
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java
index 4d6640a69d35..f0ded0f3d724 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java
@@ -64,7 +64,7 @@ public class FieldBreakpointPropertiesPanel extends XBreakpointCustomPropertiesP
     _panel0.add(Box.createHorizontalStrut(3), BorderLayout.WEST);
     _panel0.add(Box.createHorizontalStrut(3), BorderLayout.EAST);
     _panel.add(_panel0, BorderLayout.NORTH);
-    _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("label.group.watch.events"), true));
+    _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("label.group.watch.events")));
 
     ActionListener listener = new ActionListener() {
       @Override
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java
index 5ddaf5ae1c31..0d229c2492ed 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java
@@ -70,7 +70,7 @@ public class MethodBreakpointPropertiesPanel extends XBreakpointCustomProperties
     _panel0.add(Box.createHorizontalStrut(3), BorderLayout.WEST);
     _panel0.add(Box.createHorizontalStrut(3), BorderLayout.EAST);
     _panel.add(_panel0, BorderLayout.NORTH);
-    _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("label.group.watch.events"), true));
+    _panel.setBorder(IdeBorderFactory.createTitledBorder(DebuggerBundle.message("label.group.watch.events")));
 
     ActionListener listener = new ActionListener() {
       @Override
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java
index c49ceb9411ab..b674fa7351e9 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java
@@ -125,8 +125,7 @@ public class BuildElementsEditor extends ModuleElementsEditor {
     myPerModuleCompilerOutput.addActionListener(listener);
 
     final JPanel panel = new JPanel(new BorderLayout());
-    panel.setBorder(IdeBorderFactory.createTitledBorder(ProjectBundle.message("project.roots.output.compiler.title"),
-                                                        true));
+    panel.setBorder(IdeBorderFactory.createTitledBorder(ProjectBundle.message("project.roots.output.compiler.title")));
     panel.add(outputPathsPanel, BorderLayout.NORTH);
     return panel;
   }
diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java
index dec30cfe8b40..8d3f99e773db 100644
--- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java
@@ -523,7 +523,7 @@ public class JavaDocLocalInspection extends LocalInspectionTool {
     private JPanel createScopePanel(String[] modifiers, Options options) {
       JPanel panel = new JPanel(new BorderLayout());
       panel.setBorder(BorderFactory.createCompoundBorder(
-        IdeBorderFactory.createTitledBorder(InspectionsBundle.message("inspection.scope.for.title"), true),
+        IdeBorderFactory.createTitledBorder(InspectionsBundle.message("inspection.scope.for.title")),
         BorderFactory.createEmptyBorder(0, 3, 3, 3)));
 
       @SuppressWarnings("UseOfObsoleteCollectionType") Hashtable<Integer, JComponent> sliderLabels = new Hashtable<>();
@@ -562,7 +562,7 @@ public class JavaDocLocalInspection extends LocalInspectionTool {
     private JPanel createTagsPanel(String[] tags, Options options) {
       JPanel panel = new JPanel(new GridBagLayout());
       panel.setBorder(BorderFactory.createCompoundBorder(
-        IdeBorderFactory.createTitledBorder(InspectionsBundle.message("inspection.javadoc.required.tags.option.title"), true),
+        IdeBorderFactory.createTitledBorder(InspectionsBundle.message("inspection.javadoc.required.tags.option.title")),
         BorderFactory.createEmptyBorder(0, 3, 3, 3)));
 
       GridBagConstraints gc = new GridBagConstraints();
diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java b/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java
index 33c93ed17660..d62f32c7446c 100644
--- a/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java
+++ b/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java
@@ -180,7 +180,7 @@ public class CyclicDependenciesAction extends AnAction{
     @Override
     protected JComponent createCenterPanel() {
       myScopePanel.setBorder(IdeBorderFactory.createTitledBorder(
-        AnalysisScopeBundle.message("analysis.scope.title", myAnalysisNoun), true));
+        AnalysisScopeBundle.message("analysis.scope.title", myAnalysisNoun)));
       myProjectButton.setText(AnalysisScopeBundle.message("cyclic.dependencies.scope.dialog.project.button", myAnalysisVerb));
       ButtonGroup group = new ButtonGroup();
       group.add(myProjectButton);
diff --git a/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java
index a195d51e1996..68c989c310ce 100644
--- a/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java
+++ b/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java
@@ -75,7 +75,7 @@ public class FindClassUsagesDialog extends JavaFindUsagesDialog<JavaClassFindUsa
   protected JPanel createFindWhatPanel() {
     JPanel findWhatPanel = new JPanel();
 
-    findWhatPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.what.group"), true));
+    findWhatPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.what.group")));
     findWhatPanel.setLayout(new BoxLayout(findWhatPanel, BoxLayout.Y_AXIS));
 
     myCbUsages = addCheckboxToPanel(FindBundle.message("find.what.usages.checkbox"), getFindUsagesOptions().isUsages, findWhatPanel, true);
diff --git a/java/java-impl/src/com/intellij/find/findUsages/FindMethodUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindMethodUsagesDialog.java
index 91128e8bb5a5..dcb85f988bcb 100644
--- a/java/java-impl/src/com/intellij/find/findUsages/FindMethodUsagesDialog.java
+++ b/java/java-impl/src/com/intellij/find/findUsages/FindMethodUsagesDialog.java
@@ -51,7 +51,7 @@ public class FindMethodUsagesDialog extends JavaFindUsagesDialog<JavaMethodFindU
   @Override
   protected JPanel createFindWhatPanel() {
     JPanel findWhatPanel = new JPanel();
-    findWhatPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.what.group"), true));
+    findWhatPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.what.group")));
     findWhatPanel.setLayout(new BoxLayout(findWhatPanel, BoxLayout.Y_AXIS));
 
     myCbUsages = addCheckboxToPanel(FindBundle.message("find.what.usages.checkbox"), getFindUsagesOptions().isUsages, findWhatPanel, true);
diff --git a/java/java-impl/src/com/intellij/find/findUsages/FindPackageUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindPackageUsagesDialog.java
index 2ab888ee7f9d..d388b755bd22 100644
--- a/java/java-impl/src/com/intellij/find/findUsages/FindPackageUsagesDialog.java
+++ b/java/java-impl/src/com/intellij/find/findUsages/FindPackageUsagesDialog.java
@@ -55,7 +55,7 @@ public class FindPackageUsagesDialog extends JavaFindUsagesDialog<JavaPackageFin
   @Override
   protected JPanel createFindWhatPanel() {
     JPanel findWhatPanel = new JPanel();
-    findWhatPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.what.group"), true));
+    findWhatPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.what.group")));
     findWhatPanel.setLayout(new BoxLayout(findWhatPanel, BoxLayout.Y_AXIS));
 
     myCbUsages = addCheckboxToPanel(FindBundle.message("find.what.usages.checkbox"), getFindUsagesOptions().isUsages, findWhatPanel, true);
diff --git a/java/java-impl/src/com/intellij/find/findUsages/FindThrowUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindThrowUsagesDialog.java
index 330093c33362..44555b456747 100644
--- a/java/java-impl/src/com/intellij/find/findUsages/FindThrowUsagesDialog.java
+++ b/java/java-impl/src/com/intellij/find/findUsages/FindThrowUsagesDialog.java
@@ -81,7 +81,7 @@ public class FindThrowUsagesDialog extends JavaFindUsagesDialog<JavaThrowFindUsa
   @Override
   protected JPanel createFindWhatPanel() {
     final JPanel findWhatPanel = new JPanel();
-    findWhatPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.what.group"), true));
+    findWhatPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.what.group")));
     findWhatPanel.setLayout(new BoxLayout(findWhatPanel, BoxLayout.Y_AXIS));
 
     myCbUsages = addCheckboxToPanel(FindBundle.message("find.what.usages.checkbox")       , myFindUsagesOptions.isUsages,            findWhatPanel,  true);
diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
index 4c9d08a96a03..16424813f0ff 100644
--- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
@@ -297,7 +297,7 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps
     leftBox.add(myCbUseAccessorsWhenAccessible);
     JPanel leftPanel = new JPanel(new BorderLayout());
     leftPanel.setBorder(IdeBorderFactory.createTitledBorder(
-      RefactoringBundle.message("encapsulate.fields.encapsulate.border.title"), true));
+      RefactoringBundle.message("encapsulate.fields.encapsulate.border.title")));
     leftPanel.add(leftBox, BorderLayout.CENTER);
     leftPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST);
 
@@ -321,7 +321,7 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps
     fieldsBox.add(myRbFieldAsIs);
     JPanel fieldsVisibilityPanel = new JPanel(new BorderLayout());
     fieldsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorder(
-      RefactoringBundle.message("encapsulate.fields..encapsulated.fields.visibility.border.title"), true));
+      RefactoringBundle.message("encapsulate.fields..encapsulated.fields.visibility.border.title")));
     fieldsVisibilityPanel.add(fieldsBox, BorderLayout.CENTER);
     fieldsVisibilityPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST);
 
@@ -332,7 +332,7 @@ public class EncapsulateFieldsDialog extends RefactoringDialog implements Encaps
     methodsBox.add(myRbAccessorPrivate);
     JPanel methodsVisibilityPanel = new JPanel(new BorderLayout());
     methodsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorder(
-      RefactoringBundle.message("encapsulate.fields.accessors.visibility.border.title"), true));
+      RefactoringBundle.message("encapsulate.fields.accessors.visibility.border.title")));
     methodsVisibilityPanel.add(methodsBox, BorderLayout.CENTER);
     methodsVisibilityPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST);
 
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialogPanel.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialogPanel.java
index eabf5d636a4a..e0d43e5ff866 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialogPanel.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialogPanel.java
@@ -140,8 +140,7 @@ public class IntroduceFieldDialogPanel extends IntroduceFieldCentralPanel {
     mainPanel.setLayout(new BorderLayout());
 
     JPanel initializationPanel = new JPanel();
-    initializationPanel.setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("initialize.in.border.title"),
-                                                                      true));
+    initializationPanel.setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("initialize.in.border.title")));
     initializationPanel.setLayout(new BoxLayout(initializationPanel, BoxLayout.Y_AXIS));
 
 
diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintDialog.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintDialog.java
index 374256810c92..2fd015c2e61b 100644
--- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintDialog.java
+++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintDialog.java
@@ -231,7 +231,7 @@ class PrintDialog extends DialogWrapper {
 
   private JPanel createOrientationPanel() {
     JPanel panel = new JPanel();
-    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("print.orientation.group"), true));
+    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("print.orientation.group")));
     panel.setLayout(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
     gbConstraints.gridy = 0;
@@ -257,7 +257,7 @@ class PrintDialog extends DialogWrapper {
 
   private JPanel createStylePanel() {
     JPanel panel = new JPanel();
-    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("print.style.group"), true));
+    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("print.style.group")));
     panel.setLayout(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
     gbConstraints.gridy = 0;
@@ -283,7 +283,7 @@ class PrintDialog extends DialogWrapper {
 
   private JPanel createWrappingPanel() {
     JPanel panel = new JPanel();
-    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("print.wrapping.group"), true));
+    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("print.wrapping.group")));
     panel.setLayout(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
     gbConstraints.gridy = 0;
@@ -309,7 +309,7 @@ class PrintDialog extends DialogWrapper {
 
   private JPanel createMarginsPanel() {
     JPanel panel = new JPanel();
-    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("print.margins.group"), true));
+    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("print.margins.group")));
     panel.setLayout(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
     gbConstraints.gridy = 0;
@@ -402,7 +402,7 @@ class PrintDialog extends DialogWrapper {
                                         JComboBox<PrintSettings.Placement> linePlacementCombo,
                                         JComboBox<PrintSettings.Alignment> lineAlignmentCombo) {
     JPanel panel = new JPanel();
-    panel.setBorder(IdeBorderFactory.createTitledBorder(name, true));
+    panel.setBorder(IdeBorderFactory.createTitledBorder(name));
     panel.setLayout(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
     gbConstraints.gridy = 0;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
index e22feb018ef6..c65f8de7f397 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
@@ -208,7 +208,7 @@ public class LiveTemplateSettingsEditor extends JPanel {
 
   private JPanel createTemplateOptionsPanel() {
     JPanel panel = new JPanel();
-    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeInsightBundle.message("dialog.edit.template.options.title"), true));
+    panel.setBorder(IdeBorderFactory.createTitledBorder(CodeInsightBundle.message("dialog.edit.template.options.title")));
     panel.setLayout(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
     gbConstraints.fill = GridBagConstraints.BOTH;
diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java b/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java
index fd5d52ab0a29..ef32fe9954b7 100644
--- a/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java
+++ b/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java
@@ -240,7 +240,7 @@ public abstract class AbstractFindUsagesDialog extends DialogWrapper {
   @Nullable
   protected JPanel createUsagesOptionsPanel() {
     JPanel optionsPanel = new JPanel();
-    optionsPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.options.group"), true));
+    optionsPanel.setBorder(IdeBorderFactory.createTitledBorder(FindBundle.message("find.options.group")));
     optionsPanel.setLayout(new BoxLayout(optionsPanel, BoxLayout.Y_AXIS));
     addUsagesOptions(optionsPanel);
     return optionsPanel.getComponents().length == 0 ? null : optionsPanel;
diff --git a/platform/platform-api/src/com/intellij/ui/GuiUtils.java b/platform/platform-api/src/com/intellij/ui/GuiUtils.java
index 091d6b7f130a..fe7eb8afe31d 100644
--- a/platform/platform-api/src/com/intellij/ui/GuiUtils.java
+++ b/platform/platform-api/src/com/intellij/ui/GuiUtils.java
@@ -133,7 +133,7 @@ public class GuiUtils {
 
   public static JPanel makeTitledPanel(JComponent aComponent, String aTitle) {
     JPanel result = makePaddedPanel(aComponent, false, true, false, true);
-    return wrapWithBorder(result, IdeBorderFactory.createTitledBorder(aTitle, true));
+    return wrapWithBorder(result, IdeBorderFactory.createTitledBorder(aTitle));
   }
 
 
diff --git a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
index d2437c2482a1..24dcab75af2e 100644
--- a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
+++ b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
@@ -135,7 +135,7 @@ public class IdeBorderFactory {
                                                   int titlePosition,
                                                   Font titleFont,
                                                   Color titleColor) {
-      return IdeBorderFactory.createTitledBorder(title, true);
+      return IdeBorderFactory.createTitledBorder(title);
     }
   }
 
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java
index 3617189f2def..ee3da78c5dac 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java
@@ -320,8 +320,7 @@ public class SearchDialog extends DialogWrapper {
 
     JPanel searchOptions = new JPanel();
     searchOptions.setLayout(new GridLayout(getRowsCount(), 1, 0, 0));
-    searchOptions.setBorder(IdeBorderFactory.createTitledBorder(SSRBundle.message("ssdialog.options.group.border"),
-                                                                true));
+    searchOptions.setBorder(IdeBorderFactory.createTitledBorder(SSRBundle.message("ssdialog.options.group.border")));
 
     JPanel allOptions = new JPanel(new BorderLayout());
     if (myShowScopePanel) {
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/DateFilterComponent.java b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/DateFilterComponent.java
index 885f0354175c..7bf8cc93b906 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/DateFilterComponent.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/DateFilterComponent.java
@@ -46,7 +46,7 @@ public class DateFilterComponent {
 
   public DateFilterComponent(final boolean showBorder, final DateFormat dateFormat) {
     if (showBorder) {
-      myDatePanel.setBorder(IdeBorderFactory.createTitledBorder(VcsBundle.message("border.changes.filter.date.filter"), true));
+      myDatePanel.setBorder(IdeBorderFactory.createTitledBorder(VcsBundle.message("border.changes.filter.date.filter")));
     }
     myDateAfter.setDateFormat(dateFormat);
     myDateBefore.setDateFormat(dateFormat);
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/StandardVersionFilterComponent.java b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/StandardVersionFilterComponent.java
index 2098a82a6056..5af2128caf41 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/StandardVersionFilterComponent.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/StandardVersionFilterComponent.java
@@ -52,7 +52,7 @@ public abstract class StandardVersionFilterComponent<T extends ChangeBrowserSett
   }
 
   protected void init(final T settings) {
-    myVersionNumberPanel.setBorder(IdeBorderFactory.createTitledBorder(getChangeNumberTitle(), true));
+    myVersionNumberPanel.setBorder(IdeBorderFactory.createTitledBorder(getChangeNumberTitle()));
     installCheckBoxesListeners();
     initValues(settings);
     updateAllEnabled(null);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CompositeCommittedChangesProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CompositeCommittedChangesProvider.java
index e557ee101783..c2f08a5318bf 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CompositeCommittedChangesProvider.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CompositeCommittedChangesProvider.java
@@ -208,7 +208,7 @@ public class CompositeCommittedChangesProvider implements CommittedChangesProvid
         myEditors.put(vcs, editor);
 
         JPanel wrapperPane = new JPanel(new BorderLayout());
-        wrapperPane.setBorder(IdeBorderFactory.createTitledBorder(vcs.getDisplayName(), true));
+        wrapperPane.setBorder(IdeBorderFactory.createTitledBorder(vcs.getDisplayName()));
         final JCheckBox checkBox = new JCheckBox(VcsBundle.message("composite.change.provider.include.vcs.checkbox", vcs.getDisplayName()), true);
         checkBox.addActionListener(new ActionListener() {
           @Override
diff --git a/plugins/devkit/devkit-core/src/build/PluginModuleBuildConfEditor.java b/plugins/devkit/devkit-core/src/build/PluginModuleBuildConfEditor.java
index d55d84b83954..2fe57f2766f4 100644
--- a/plugins/devkit/devkit-core/src/build/PluginModuleBuildConfEditor.java
+++ b/plugins/devkit/devkit-core/src/build/PluginModuleBuildConfEditor.java
@@ -75,7 +75,7 @@ public class PluginModuleBuildConfEditor implements ModuleConfigurationEditor {
     myWholePanel.add(myPluginXMLLabel, gc);
     myWholePanel.add(myPluginXML, gc);
     JPanel manifestPanel = new JPanel(new GridBagLayout());
-    manifestPanel.setBorder(IdeBorderFactory.createTitledBorder(DevKitBundle.message("manifest.settings"), true));
+    manifestPanel.setBorder(IdeBorderFactory.createTitledBorder(DevKitBundle.message("manifest.settings")));
     gc.insets.left = 0;
     manifestPanel.add(myUseUserManifest, gc);
     gc.insets.left = 2;
diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.java
index e1e35db89f70..8e8e0752b102 100644
--- a/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.java
+++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.java
@@ -31,8 +31,8 @@ public class CreateEditorConfigForm {
   private final static int MAX_LANGUAGES_ROWS = 10;
 
   public CreateEditorConfigForm() {
-    myPropertiesPanel.setBorder(IdeBorderFactory.createTitledBorder(EditorConfigBundle.message("export.properties.title"), true));
-    myLanguagesPanel.setBorder(IdeBorderFactory.createTitledBorder(EditorConfigBundle.message("export.languages.title"), true));
+    myPropertiesPanel.setBorder(IdeBorderFactory.createTitledBorder(EditorConfigBundle.message("export.properties.title")));
+    myLanguagesPanel.setBorder(IdeBorderFactory.createTitledBorder(EditorConfigBundle.message("export.languages.title")));
     myLanguagesPanel.setLayout(new BoxLayout(myLanguagesPanel, BoxLayout.X_AXIS));
     myLanguageCheckBoxes = creteLanguageCheckBoxes(myLanguagesPanel);
     setLanguagePanelEnabled(false);
diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/view/ConfigUI.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/view/ConfigUI.java
index 3f0ea81d58fd..0183a197bb52 100644
--- a/plugins/generate-tostring/src/org/jetbrains/java/generate/view/ConfigUI.java
+++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/view/ConfigUI.java
@@ -96,7 +96,7 @@ public class ConfigUI extends JPanel {
         // UI Layout - Settings
         JPanel panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        panel.setBorder(IdeBorderFactory.createTitledBorder("Settings", true));
+        panel.setBorder(IdeBorderFactory.createTitledBorder("Settings"));
         Container innerPanel = Box.createHorizontalBox();
         innerPanel.add(fullyQualifiedName);
         innerPanel.add(Box.createHorizontalGlue());
@@ -136,7 +136,7 @@ public class ConfigUI extends JPanel {
         }
         panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        panel.setBorder(IdeBorderFactory.createTitledBorder("When method already exists", true));
+        panel.setBorder(IdeBorderFactory.createTitledBorder("When method already exists"));
         for (JRadioButton anInitialValueForReplaceDialog : initialValueForReplaceDialog) {
             panel.add(anInitialValueForReplaceDialog);
         }
@@ -154,7 +154,7 @@ public class ConfigUI extends JPanel {
         }
         panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        panel.setBorder(IdeBorderFactory.createTitledBorder("Where to insert?", true));
+        panel.setBorder(IdeBorderFactory.createTitledBorder("Where to insert?"));
         for (JRadioButton anInitialValueForNewMethodDialog : initialValueForNewMethodDialog) {
             panel.add(anInitialValueForNewMethodDialog);
         }
@@ -165,7 +165,7 @@ public class ConfigUI extends JPanel {
         // UI Layout - Exclude fields
         panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        panel.setBorder(IdeBorderFactory.createTitledBorder("Exclude", true));
+        panel.setBorder(IdeBorderFactory.createTitledBorder("Exclude"));
         innerPanel = Box.createHorizontalBox();
         innerPanel.add(filterConstant);
         innerPanel.add(Box.createHorizontalGlue());
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
index 03fe713b742c..acccb6bf7ee7 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
@@ -253,7 +253,7 @@ public class GrIntroduceParameterDialog extends DialogWrapper {
     panel.add(myReplaceFieldsInaccessibleInRadioButton);
     panel.add(myReplaceAllFieldsRadioButton);
 
-    panel.setBorder(IdeBorderFactory.createTitledBorder("Replace fields used in expression with their getters", true));
+    panel.setBorder(IdeBorderFactory.createTitledBorder("Replace fields used in expression with their getters"));
     return panel;
   }
 
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java
index 259fe1192c3b..e2bb807af4a8 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java
@@ -27,7 +27,7 @@ public class HgMergeDialog extends HgCommonDialogWithChoices {
                        @Nullable HgRepository selectedRepo) {
     super(project, repositories, selectedRepo);
     hgRepositorySelectorComponent.setTitle("Select repository to merge");
-    myBranchesBorderPanel.setBorder(IdeBorderFactory.createTitledBorder("Merge with", true));
+    myBranchesBorderPanel.setBorder(IdeBorderFactory.createTitledBorder("Merge with"));
     setTitle("Merge");
   }
 
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRepositorySelectorComponent.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRepositorySelectorComponent.java
index edc2fb0c1dec..fef14f37de47 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRepositorySelectorComponent.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRepositorySelectorComponent.java
@@ -45,7 +45,7 @@ public class HgRepositorySelectorComponent {
   }
 
   public void setTitle(@NotNull String title) {
-    mainPanel.setBorder(IdeBorderFactory.createTitledBorder(title, true));
+    mainPanel.setBorder(IdeBorderFactory.createTitledBorder(title));
   }
 
   @NotNull
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java
index c0b66075841b..89cd16821463 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java
@@ -24,7 +24,7 @@ public class HgUpdateToDialog extends HgCommonDialogWithChoices {
 
   public HgUpdateToDialog(Project project, @NotNull Collection<HgRepository> repos, @Nullable HgRepository selectedRepo) {
     super(project, repos, selectedRepo);
-    myBranchesBorderPanel.setBorder(IdeBorderFactory.createTitledBorder("Switch to", true));
+    myBranchesBorderPanel.setBorder(IdeBorderFactory.createTitledBorder("Switch to"));
     hgRepositorySelectorComponent.setTitle("Select repository to switch");
     setTitle("Switch Working Directory");
     cleanCbx.setVisible(true);
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/AddClientPropertyDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/AddClientPropertyDialog.java
index d665c687f541..6dfebba5b578 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/AddClientPropertyDialog.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/AddClientPropertyDialog.java
@@ -25,8 +25,7 @@ public class AddClientPropertyDialog extends DialogWrapper {
     super(project, false);
     init();
     setTitle(UIDesignerBundle.message("client.property.add.title"));
-    myGroupPanel.setBorder(IdeBorderFactory.createTitledBorder(UIDesignerBundle.message("client.properties.type.header"),
-                                                               true));
+    myGroupPanel.setBorder(IdeBorderFactory.createTitledBorder(UIDesignerBundle.message("client.properties.type.header")));
   }
 
   @Override
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/FormLayoutColumnProperties.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/FormLayoutColumnProperties.java
index 331bfed5a063..5e838627762f 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/FormLayoutColumnProperties.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/FormLayoutColumnProperties.java
@@ -137,7 +137,7 @@ public class FormLayoutColumnProperties implements CustomPropertiesPanel {
         myRightRadioButton.setText(row ? UIDesignerBundle.message("alignment.bottom") : UIDesignerBundle.message("alignment.right"));
         mySizePanel.setBorder(IdeBorderFactory.createTitledBorder(myIsRow
                                                                   ? UIDesignerBundle.message("title.height")
-                                                                  : UIDesignerBundle.message("title.width"), true));
+                                                                  : UIDesignerBundle.message("title.width")));
 
         FormSpec formSpec = row ? myLayout.getRowSpec(myIndex) : myLayout.getColumnSpec(myIndex);
         showAlignment(formSpec.getDefaultAlignment());
diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java
index 005e4a175f97..84432398fd4f 100644
--- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java
+++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java
@@ -72,7 +72,7 @@ public class ConfigUI extends JPanel {
         showInMainMenu.setToolTipText("Uncheck to remove XPath-related actions from the Main-Menubar");
 
         JPanel settings = new JPanel(new BorderLayout());
-        settings.setBorder(IdeBorderFactory.createTitledBorder("Settings", true));
+        settings.setBorder(IdeBorderFactory.createTitledBorder("Settings"));
         c.add(c = new JPanel(new BorderLayout()), BorderLayout.NORTH);
         c.add(settings, BorderLayout.NORTH);
 
@@ -90,7 +90,7 @@ public class ConfigUI extends JPanel {
         settings.add(/*settings = */new JPanel(new BorderLayout()), BorderLayout.SOUTH);
 
         JPanel colors = new JPanel(new GridBagLayout());
-        colors.setBorder(IdeBorderFactory.createTitledBorder("Colors", true));
+        colors.setBorder(IdeBorderFactory.createTitledBorder("Colors"));
         c.add(c = new JPanel(new BorderLayout()), BorderLayout.SOUTH);
         c.add(colors, BorderLayout.NORTH);
 
diff --git a/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointType.java b/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointType.java
index dd0f4343fd7b..a3890e3b8273 100644
--- a/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointType.java
+++ b/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointType.java
@@ -193,7 +193,7 @@ public class PyExceptionBreakpointType
       innerPanel.add(Box.createHorizontalStrut(3), BorderLayout.WEST);
       innerPanel.add(Box.createHorizontalStrut(3), BorderLayout.EAST);
       panel.add(innerPanel, BorderLayout.NORTH);
-      panel.setBorder(IdeBorderFactory.createTitledBorder("Activation policy", true));
+      panel.setBorder(IdeBorderFactory.createTitledBorder("Activation policy"));
 
       return panel;
     }