diff --git a/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java
index 4012d30c74f6..5833255d194b 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java
@@ -48,6 +48,7 @@ import com.intellij.openapi.util.Couple;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.IdeBorderFactory;
 import com.intellij.util.ui.AnimatedIcon;
 import com.intellij.util.ui.AsyncProcessIcon;
 import com.intellij.util.ui.UIUtil;
@@ -451,6 +452,7 @@ public class BinaryDiffViewer extends ListenerDiffViewerBase {
       myBusySpinner.setVisible(false);
 
       add(myBusySpinner, BorderLayout.WEST);
+      setBorder(IdeBorderFactory.createEmptyBorder(0, 4, 0, 4));
     }
 
     public void setBusy(boolean busy) {
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java
index af25e58bebfa..2fe2db5fd8aa 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java
@@ -16,6 +16,7 @@
 package com.intellij.diff.tools.util;
 
 import com.intellij.openapi.diff.DiffBundle;
+import com.intellij.ui.IdeBorderFactory;
 import com.intellij.util.ui.AnimatedIcon;
 import com.intellij.util.ui.AsyncProcessIcon;
 
@@ -34,6 +35,7 @@ public abstract class StatusPanel extends JPanel {
 
     add(myTextLabel, BorderLayout.CENTER);
     add(myBusySpinner, BorderLayout.WEST);
+    setBorder(IdeBorderFactory.createEmptyBorder(0, 4, 0, 4));
   }
 
   public void update() {
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideContentPanel.java
index 4e5004a5658d..8ad3bf684c8b 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideContentPanel.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideContentPanel.java
@@ -37,6 +37,7 @@ public class TwosideContentPanel extends JPanel {
       mySplitter = new DiffSplitter();
       mySplitter.setFirstComponent(new MyPanel(editor1, titleComponents.get(0)));
       mySplitter.setSecondComponent(new MyPanel(editor2, titleComponents.get(1)));
+      mySplitter.setHonorComponentsMinimumSize(false);
       add(mySplitter, BorderLayout.CENTER);
     }
     else {
diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
index f96e27c71f62..591c3c976136 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
@@ -398,11 +398,13 @@ public class DiffUtil {
     if (readOnly) title += " " + DiffBundle.message("diff.content.read.only.content.title.suffix");
 
     JPanel panel = new JPanel(new BorderLayout());
-    panel.setBorder(IdeBorderFactory.createEmptyBorder(0, 4, 0, 0));
-    panel.add(createTitlePanel(title), BorderLayout.WEST);
+    panel.setBorder(IdeBorderFactory.createEmptyBorder(0, 4, 0, 4));
+    panel.add(createTitlePanel(title), BorderLayout.CENTER);
     if (charset != null && separator != null) {
       JPanel panel2 = new JPanel();
+      panel2.setLayout(new BoxLayout(panel2, BoxLayout.X_AXIS));
       panel2.add(createCharsetPanel(charset));
+      panel2.add(Box.createRigidArea(new Dimension(4, 0)));
       panel2.add(createSeparatorPanel(separator));
       panel.add(panel2, BorderLayout.EAST);
     }