diff --git a/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java b/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java
index 140de948a336..3279c9fc6a39 100644
--- a/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java
+++ b/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java
@@ -36,7 +36,6 @@ public interface FileEditorProvider {
   Key<FileEditorProvider> KEY = Key.create("com.intellij.fileEditorProvider");
 
   /**
-   * If provider is not dumb-aware, and it is the only
    * @param file file to be tested for acceptance. This
    * parameter is never <code>null</code>.
    *
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
index ce5b90c91285..790160ba9a5a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
@@ -463,8 +463,11 @@ public abstract class EditorComposite implements Disposable {
       myComponent.setComponent(myTabbedPaneWrapper.getComponent());
     }
     else {
-      myTabbedPaneWrapper.addTab(editor.getName(), editor.getComponent());
+      JComponent component = createEditorComponent(editor);
+      myTabbedPaneWrapper.addTab(editor.getName(), component);
     }
+    myFocusWatcher.deinstall(myFocusWatcher.getTopComponent());
+    myFocusWatcher.install(myComponent);
     myEditors = editors;
   }
 
diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges.png b/platform/vcs-log/impl/resources/icons/CollapseMerges.png
index 8f7aa5c6fb8c..6db6ed905657 100644
Binary files a/platform/vcs-log/impl/resources/icons/CollapseMerges.png and b/platform/vcs-log/impl/resources/icons/CollapseMerges.png differ
diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png b/platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png
index 75be03ec2788..53daece20cd1 100644
Binary files a/platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png and b/platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png differ
diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges@2x_dark.png b/platform/vcs-log/impl/resources/icons/CollapseMerges@2x_dark.png
index f678b1b8cf6b..e67fd10fb5ef 100644
Binary files a/platform/vcs-log/impl/resources/icons/CollapseMerges@2x_dark.png and b/platform/vcs-log/impl/resources/icons/CollapseMerges@2x_dark.png differ
diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png b/platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png
index e5af04bfcd72..6fc4b35f523a 100644
Binary files a/platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png and b/platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png differ
diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges.png b/platform/vcs-log/impl/resources/icons/ExpandMerges.png
index c49336a3ffd6..cac2e3887e4c 100644
Binary files a/platform/vcs-log/impl/resources/icons/ExpandMerges.png and b/platform/vcs-log/impl/resources/icons/ExpandMerges.png differ
diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png b/platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png
index 27c572c6919b..f82a66e9743b 100644
Binary files a/platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png and b/platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png differ
diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png b/platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png
index 22ff8c99a712..26c98cbdedc4 100644
Binary files a/platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png and b/platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png differ
diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png b/platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png
index 6d5d8f1c562e..4089cbeb437f 100644
Binary files a/platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png and b/platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png differ