diff --git a/platform/lang-api/src/com/intellij/execution/util/ListTableWithButtons.java b/platform/lang-api/src/com/intellij/execution/util/ListTableWithButtons.java
index 22cbf612d5fd..2189fc9351e3 100644
--- a/platform/lang-api/src/com/intellij/execution/util/ListTableWithButtons.java
+++ b/platform/lang-api/src/com/intellij/execution/util/ListTableWithButtons.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import com.intellij.ui.*;
 import com.intellij.ui.table.TableView;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.ColumnInfo;
+import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.ListTableModel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -27,7 +28,6 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellRenderer;
-import java.awt.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.util.Collections;
@@ -83,7 +83,7 @@ public abstract class ListTableWithButtons<T> extends Observable {
       }
     };
     myTableView.setRowHeight(new JTextField().getPreferredSize().height);
-    myTableView.setIntercellSpacing(new Dimension(0, 0));
+    myTableView.setIntercellSpacing(JBUI.emptySize());
     myTableView.setStriped(true);
     
     myTableView.getTableViewModel().setSortable(false);
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/additional/ForceArrangementPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/additional/ForceArrangementPanel.java
index 9524bb28417f..aa200be4effa 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/additional/ForceArrangementPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/additional/ForceArrangementPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@ import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.ui.EnumComboBoxModel;
 import com.intellij.ui.OptionGroup;
+import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.*;
 
 public class ForceArrangementPanel {
 
@@ -62,7 +62,7 @@ public class ForceArrangementPanel {
     JPanel textWithComboPanel = new JPanel();
     textWithComboPanel.setLayout(new BoxLayout(textWithComboPanel, BoxLayout.LINE_AXIS));
     textWithComboPanel.add(new JLabel(ApplicationBundle.message("arrangement.settings.additional.force.combobox.name")));
-    textWithComboPanel.add(Box.createRigidArea(new Dimension(5, 0)));
+    textWithComboPanel.add(Box.createRigidArea(JBUI.size(5, 0)));
     textWithComboPanel.add(myForceRearrangeComboBox);
     group.add(textWithComboPanel);
     return group.createPanel();