diff --git a/platform/platform-api/src/com/intellij/ui/SeparatorFactory.java b/platform/platform-api/src/com/intellij/ui/SeparatorFactory.java
index fc00ff815350..7b5175396c2b 100644
--- a/platform/platform-api/src/com/intellij/ui/SeparatorFactory.java
+++ b/platform/platform-api/src/com/intellij/ui/SeparatorFactory.java
@@ -16,8 +16,6 @@
 
 package com.intellij.ui;
 
-import com.intellij.util.ui.UIUtil;
-import com.jgoodies.forms.factories.DefaultComponentFactory;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -31,22 +29,12 @@ public class SeparatorFactory {
   }
 
   public static JComponent createSeparator(String textWithMnemonic, @Nullable JComponent labelFor) {
-    Color oldColor = UIManager.getColor("Separator.foreground");
-    UIManager.put("Separator.foreground", UIUtil.getBorderColor());
-    final JComponent separator = DefaultComponentFactory.getInstance().createSeparator(textWithMnemonic);
-    UIManager.put("Separator.foreground", oldColor);
-    if (labelFor != null) {
-      ((JLabel) separator.getComponent(0)).setLabelFor(labelFor);
-    }
-    separator.setBorder(IdeBorderFactory.createEmptyBorder(3, 0, 5, 5));
-    return separator;
+    return new TitledSeparatorWithMnemonic(textWithMnemonic, labelFor);
   }
 
   public static JComponent createSeparatorWithBoldTitle(String textWithMnemonic, @Nullable JComponent labelFor) {
-    Font oldFont = UIManager.getFont("TitledBorder.font");
-    UIManager.put("TitledBorder.font", oldFont.deriveFont(Font.BOLD));
-    final JComponent separator = createSeparator(textWithMnemonic, labelFor);
-    UIManager.put("TitledBorder.font", oldFont);
+    TitledSeparatorWithMnemonic separator = new TitledSeparatorWithMnemonic(textWithMnemonic, labelFor);
+    separator.setTitleFont(separator.getTitleFont().deriveFont(Font.BOLD));
     return separator;
   }
 }
\ No newline at end of file