diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java
index 0fb7c15d69eb..ba8647f78ad8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java
@@ -111,7 +111,6 @@ public class CreateClassDialog extends DialogWrapper {
       gbConstraints.weightx = 0;
       gbConstraints.gridwidth = 1;
       panel.add(myInformationLabel, gbConstraints);
-      panel.setBorder(IdeBorderFactory.createRoundedBorder());
       gbConstraints.insets = new Insets(4, 8, 4, 8);
       gbConstraints.gridx = 1;
       gbConstraints.weightx = 1;
diff --git a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java
index bb7324006261..4ee9df907ef9 100644
--- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java
@@ -92,8 +92,6 @@ class CopyClassDialog extends DialogWrapper{
     JPanel panel = new JPanel(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
 
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
-
     gbConstraints.insets = new Insets(4,8,4,8);
     gbConstraints.weightx = 1;
     gbConstraints.gridwidth = 2;
@@ -111,6 +109,7 @@ class CopyClassDialog extends DialogWrapper{
     gbConstraints.gridx = 1;
     gbConstraints.weightx = 1;
     myNameField = new EditorTextField("");
+    myNameLabel.setLabelFor(myNameField);
     panel.add(myNameField, gbConstraints);
 
     gbConstraints.gridx = 0;
@@ -123,11 +122,10 @@ class CopyClassDialog extends DialogWrapper{
     String qualifiedName = getQualifiedName();
 
     myTfPackage = new PackageNameReferenceEditorCombo(qualifiedName, myProject, RECENTS_KEY, RefactoringBundle.message("choose.destination.package"));
-    if (qualifiedName.length() > 0) {
-      myTfPackage.setTextFieldPreferredWidth(qualifiedName.length() + 5);
-    }
+    myTfPackage.setTextFieldPreferredWidth(Math.max(qualifiedName.length() + 5, 40));
 
     myPackageLabel.setText(RefactoringBundle.message("destination.package"));
+    myPackageLabel.setLabelFor(myTfPackage);
 
     panel.add(myTfPackage, gbConstraints);
     if (myDoClone) {
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java
index 61d9337db533..e8518f3d6300 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java
@@ -72,7 +72,6 @@ public class EnclosingMethodSelectionDialog extends DialogWrapper {
 
   protected JComponent createNorthPanel() {
     JPanel panel = new JPanel();
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
 
     panel.setLayout(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterSettingsUI.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterSettingsUI.java
index bb4380916a3a..e1f93383548d 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterSettingsUI.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterSettingsUI.java
@@ -111,8 +111,6 @@ public abstract class IntroduceParameterSettingsUI {
   protected JPanel createReplaceFieldsWithGettersPanel() {
     JPanel radioButtonPanel = new JPanel(new GridBagLayout());
 
-    radioButtonPanel.setBorder(IdeBorderFactory.createRoundedBorder());
-
     GridBagConstraints gbConstraints = new GridBagConstraints();
     gbConstraints.insets = new Insets(4, 8, 4, 8);
     gbConstraints.weighty = 1;
diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java
index d73c07a7f4a2..c737e105da7b 100644
--- a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java
@@ -126,7 +126,6 @@ public class MakeParameterizedStaticDialog extends AbstractMakeStaticDialog {
     GridBagConstraints gbConstraints = new GridBagConstraints();
 
     JPanel panel = new JPanel(new GridBagLayout());
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
 
     gbConstraints.insets = new Insets(4, 8, 4, 8);
     gbConstraints.weighty = 0;
diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java
index 359e9ea264d0..995255a2d4c9 100644
--- a/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java
@@ -72,10 +72,8 @@ public class SimpleMakeStaticDialog extends AbstractMakeStaticDialog {
   }
 
   protected JComponent createNorthPanel() {
-    GridBagConstraints gbConstraints = new GridBagConstraints();
-
     JPanel panel = new JPanel(new GridBagLayout());
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
+    GridBagConstraints gbConstraints = new GridBagConstraints();
 
     gbConstraints.insets = new Insets(4, 8, 4, 8);
     gbConstraints.weighty = 1;
diff --git a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java
index 2c4fdc0464ff..1fe6cebd6626 100644
--- a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java
@@ -130,7 +130,6 @@ public class EditMigrationDialog extends DialogWrapper{
 
   protected JComponent createCenterPanel() {
     JPanel tablePanel = new JPanel(new BorderLayout());
-    tablePanel.setBorder(IdeBorderFactory.createRoundedBorder());
     tablePanel.add(createTable(), BorderLayout.CENTER);
 
     JPanel tableButtonsPanel = new JPanel();
diff --git a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationEntryDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationEntryDialog.java
index a02c348a28c8..77cd1bdc5c55 100644
--- a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationEntryDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationEntryDialog.java
@@ -55,7 +55,6 @@ public class EditMigrationEntryDialog extends DialogWrapper{
   protected JComponent createNorthPanel() {
     JPanel panel = new JPanel(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
     gbConstraints.insets = new Insets(4, 4, 4, 4);
     gbConstraints.weighty = 1;
 
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
index b80490140319..5d5dbd8bcb76 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
@@ -157,7 +157,6 @@ public class MoveClassesOrPackagesDialog extends RefactoringDialog {
 
   private void createUIComponents() {
     myMainPanel = new JPanel();
-    myMainPanel.setBorder(IdeBorderFactory.createRoundedBorder());
 
     myWithBrowseButtonReference = createPackageChooser();
     myClassPackageChooser = createPackageChooser();
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
index b9d6bdfaa051..626a1d62ba55 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
@@ -71,7 +71,6 @@ public class MoveClassesOrPackagesToNewDirectoryDialog extends DialogWrapper {
                                                    final MoveCallback moveCallback) {
     super(false);
     setTitle(MoveHandler.REFACTORING_NAME);
-    myRootPanel.setBorder(IdeBorderFactory.createRoundedBorder());
     myDirectory = directory;
     myElementsToMove = elementsToMove;
     myMoveCallback = moveCallback;
diff --git a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java
index 89857dea18c3..a9727dc53411 100644
--- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java
@@ -80,8 +80,6 @@ public class TurnRefsToSuperDialog extends RefactoringDialog {
 
   protected JComponent createNorthPanel() {
     JPanel panel = new JPanel();
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
-
     panel.setLayout(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
 
diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java b/java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java
index 8f2057b6ecca..91387299d8af 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java
@@ -84,7 +84,6 @@ public class TypeCookDialog extends RefactoringDialog {
 
   protected JComponent createNorthPanel() {
     JPanel optionsPanel = new JPanel(new GridBagLayout());
-    optionsPanel.setBorder(IdeBorderFactory.createRoundedBorder());
     GridBagConstraints gbConstraints = new GridBagConstraints();
 
     if (myCbDropCasts.isEnabled()) {
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationPanel.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationPanel.java
index de2242dde030..6d15a3d567ce 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationPanel.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationPanel.java
@@ -95,8 +95,6 @@ public class MigrationPanel extends JPanel implements Disposable {
     myProject = project;
     myPreviewUsages = previewUsages;
 
-    setBorder(IdeBorderFactory.createRoundedBorder());
-
     myRootsTree = new MyTree(new DefaultTreeModel(new DefaultMutableTreeNode()));
     final TypeMigrationTreeBuilder builder = new TypeMigrationTreeBuilder(myRootsTree, project);
     final MigrationRootNode currentRoot = new MigrationRootNode(project, myLabeler, builder, root, myPreviewUsages);
diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
index 21f880b3571b..33dcd9c29d64 100644
--- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
+++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
@@ -294,7 +294,6 @@ public class CreateTestDialog extends DialogWrapper {
 
   protected JComponent createCenterPanel() {
     JPanel panel = new JPanel(new GridBagLayout());
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
 
     GridBagConstraints constr = new GridBagConstraints();
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
index 8cceecadb503..f4f219c30e12 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
@@ -363,7 +363,6 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
     String tooltipText = ApplicationBundle.message("quickdoc.tooltip.font.size.by.wheel");
     result.setToolTipText(tooltipText);
     myFontSizeSlider.setToolTipText(tooltipText);
-    result.setBorder(IdeBorderFactory.createRoundedBorder());
     result.setVisible(false);
     result.setOpaque(true);
     myFontSizeSlider.setOpaque(true);
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 bf93897a9ba7..23046e290378 100644
--- a/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java
+++ b/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java
@@ -228,7 +228,7 @@ public abstract class AbstractFindUsagesDialog extends DialogWrapper {
     JComponent scopePanel = createSearchScopePanel();
     if (scopePanel != null) {
       JPanel panel = new JPanel(new BorderLayout());
-      panel.add(allOptionsPanel, BorderLayout.CENTER);
+      panel.add(allOptionsPanel, BorderLayout.NORTH);
       panel.add(scopePanel, BorderLayout.SOUTH);
       return panel;
     }
diff --git a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java
index 56cf4eb7db70..ad321d2d041d 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java
@@ -137,8 +137,6 @@ class CopyFilesOrDirectoriesDialog extends DialogWrapper{
   protected JComponent createNorthPanel() {
     JPanel panel = new JPanel(new GridBagLayout());
 
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
-
     myInformationLabel = new JLabel();
 
     panel.add(myInformationLabel, new GridBagConstraints(0,0,2,1,1,0,GridBagConstraints.WEST,GridBagConstraints.HORIZONTAL,new Insets(4,8,4,8),0,0));
diff --git a/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeDialog.java b/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeDialog.java
index df21b8eba25c..921432749580 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeDialog.java
@@ -78,7 +78,6 @@ public class ExtractIncludeDialog extends DialogWrapper {
 
   protected JComponent createCenterPanel() {
     JPanel panel = new JPanel(new VerticalFlowLayout());
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
 
     JLabel nameLabel = new JLabel();
     panel.add(nameLabel);
diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java
index 38632095a53a..375600273294 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java
@@ -86,8 +86,6 @@ public class MoveFilesOrDirectoriesDialog extends DialogWrapper{
     JPanel panel = new JPanel();
     panel.setLayout(new GridBagLayout());
 
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
-
     myNameLabel = new JLabel();
     panel.add(myNameLabel, new GridBagConstraints(0,0,2,1,1,0,GridBagConstraints.WEST,GridBagConstraints.HORIZONTAL,new Insets(4,8,4,8),0,0));
 
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
index 588d4649242c..0a9214d694fd 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
@@ -169,8 +169,6 @@ public class RenameDialog extends RefactoringDialog {
     JPanel panel = new JPanel(new GridBagLayout());
     GridBagConstraints gbConstraints = new GridBagConstraints();
 
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
-
     gbConstraints.insets = new Insets(4, 8, 4, 8);
     gbConstraints.weighty = 0;
     gbConstraints.weightx = 1;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java
index 408bababe8d9..f0ee2a828588 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java
@@ -77,7 +77,6 @@ public class SafeDeleteDialog extends DialogWrapper {
 
   protected JComponent createNorthPanel() {
     final JPanel panel = new JPanel(new GridBagLayout());
-    panel.setBorder(IdeBorderFactory.createRoundedBorder());
     final GridBagConstraints gbc = new GridBagConstraints();
 
     final String warningMessage = DeleteUtil.generateWarningMessage(IdeBundle.message("search.for.usages.and.delete.elements"), myElements);
diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java
index 4f3570601e50..342a2e54e765 100644
--- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java
+++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java
@@ -161,8 +161,7 @@ public class XmlTagRenameDialog extends RefactoringDialog {
   protected JComponent createNorthPanel() {
     final JPanel panel = new JPanel();
     panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-
-    panel.setBorder(BorderFactory.createCompoundBorder(IdeBorderFactory.createRoundedBorder(), BorderFactory.createEmptyBorder(4, 8, 4, 8)));
+    panel.setBorder(BorderFactory.createEmptyBorder(4, 8, 4, 8));
 
     myTitleLabel = new JLabel();
     panel.add(myTitleLabel);