diff --git a/platform/vcs-log/impl/icons/apply-16.png b/platform/vcs-log/impl/icons/apply-16.png
deleted file mode 100644
index e8927b4f76c8..000000000000
Binary files a/platform/vcs-log/impl/icons/apply-16.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/arrow-32.png b/platform/vcs-log/impl/icons/arrow-32.png
deleted file mode 100644
index 3867b9a30531..000000000000
Binary files a/platform/vcs-log/impl/icons/arrow-32.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/bricks-multicolor-32.png b/platform/vcs-log/impl/icons/bricks-multicolor-32.png
deleted file mode 100644
index 9f40e5f1f420..000000000000
Binary files a/platform/vcs-log/impl/icons/bricks-multicolor-32.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/bricks-user-32.png b/platform/vcs-log/impl/icons/bricks-user-32.png
deleted file mode 100644
index e30f6046d08e..000000000000
Binary files a/platform/vcs-log/impl/icons/bricks-user-32.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/cancel-16.png b/platform/vcs-log/impl/icons/cancel-16.png
deleted file mode 100644
index d6d28630a45f..000000000000
Binary files a/platform/vcs-log/impl/icons/cancel-16.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/cherry-pick-32.png b/platform/vcs-log/impl/icons/cherry-pick-32.png
deleted file mode 100644
index d705810529fc..000000000000
Binary files a/platform/vcs-log/impl/icons/cherry-pick-32.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/edit-32.png b/platform/vcs-log/impl/icons/edit-32.png
deleted file mode 100644
index 4331ce4a1eed..000000000000
Binary files a/platform/vcs-log/impl/icons/edit-32.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/fixup-32.png b/platform/vcs-log/impl/icons/fixup-32.png
deleted file mode 100644
index 150c8f519243..000000000000
Binary files a/platform/vcs-log/impl/icons/fixup-32.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/forbidden-32.png b/platform/vcs-log/impl/icons/forbidden-32.png
deleted file mode 100644
index e8d2f5a3cd6a..000000000000
Binary files a/platform/vcs-log/impl/icons/forbidden-32.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/move-32.png b/platform/vcs-log/impl/icons/move-32.png
deleted file mode 100644
index cd7c217db794..000000000000
Binary files a/platform/vcs-log/impl/icons/move-32.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/spider-1-16.png b/platform/vcs-log/impl/icons/spider-1-16.png
deleted file mode 100644
index f79a856ac991..000000000000
Binary files a/platform/vcs-log/impl/icons/spider-1-16.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/spider-16-2.png b/platform/vcs-log/impl/icons/spider-16-2.png
deleted file mode 100644
index f69f4c4aafbe..000000000000
Binary files a/platform/vcs-log/impl/icons/spider-16-2.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/spider-16.png b/platform/vcs-log/impl/icons/spider-16.png
deleted file mode 100644
index ce80f0fa6e78..000000000000
Binary files a/platform/vcs-log/impl/icons/spider-16.png and /dev/null differ
diff --git a/platform/vcs-log/impl/icons/web-16.png b/platform/vcs-log/impl/icons/web-16.png
deleted file mode 100644
index bea4be079d6f..000000000000
Binary files a/platform/vcs-log/impl/icons/web-16.png and /dev/null differ
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/GitLogIcons.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/GitLogIcons.java
deleted file mode 100644
index f66c3d2da670..000000000000
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/GitLogIcons.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.intellij.vcs.log.ui;
-
-import com.intellij.openapi.util.IconLoader;
-
-import javax.swing.Icon;
-
-public class GitLogIcons {
-  public static final Icon CHERRY_PICK = IconLoader.getIcon("/cherry-pick-32.png");
-  public static final Icon MOVE = IconLoader.getIcon("/move-32.png");
-  public static final Icon REBASE = IconLoader.getIcon("/arrow-32.png");
-  public static final Icon REBASE_INTERACTIVE = IconLoader.getIcon("/edit-32.png");
-  public static final Icon FIX_UP = IconLoader.getIcon("/fixup-32.png");
-  public static final Icon FORBIDDEN = IconLoader.getIcon("/forbidden-32.png");
-
-  public static final Icon APPLY = IconLoader.getIcon("/apply-16.png");
-  public static final Icon CANCEL = IconLoader.getIcon("/cancel-16.png");
-  //public static final Icon SPIDER = IconLoader.getIcon("/spider-16.png");
-  public static final Icon SPIDER = IconLoader.getIcon("/spider-1-16.png");
-  //public static final Icon SPIDER = IconLoader.getIcon("/spider-16-2.png");
-  public static final Icon WEB = IconLoader.getIcon("/web-16.png");
-}
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
index f436d275b11f..80319317196e 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
@@ -10,7 +10,6 @@ import com.intellij.ui.SeparatorComponent;
 import com.intellij.ui.SeparatorOrientation;
 import com.intellij.vcs.log.data.VcsLogDataHolder;
 import com.intellij.vcs.log.data.VcsLogUiProperties;
-import com.intellij.vcs.log.ui.GitLogIcons;
 import com.intellij.vcs.log.ui.VcsLogUI;
 import com.intellij.vcs.log.ui.filter.VcsLogClassicFilterUi;
 import com.intellij.vcs.log.ui.filter.VcsLogFilterUi;
@@ -64,14 +63,14 @@ public class MainFrame {
   }
 
   private JComponent createActionsToolbar() {
-    AnAction hideBranchesAction = new DumbAwareAction("Collapse linear branches", "Collapse linear branches", GitLogIcons.SPIDER) {
+    AnAction hideBranchesAction = new DumbAwareAction("Collapse linear branches", "Collapse linear branches", AllIcons.Actions.Collapseall) {
       @Override
       public void actionPerformed(AnActionEvent e) {
         myUI.hideAll();
       }
     };
 
-    AnAction showBranchesAction = new DumbAwareAction("Expand all branches", "Expand all branches", GitLogIcons.WEB) {
+    AnAction showBranchesAction = new DumbAwareAction("Expand all branches", "Expand all branches", AllIcons.Actions.Expandall) {
       @Override
       public void actionPerformed(AnActionEvent e) {
         myUI.showAll();
@@ -90,8 +89,9 @@ public class MainFrame {
       }
     };
 
-    AnAction showFullPatchAction = new ToggleAction("Show full patch", "Expand all branches even if they occupy a lot of space",
-                                                    AllIcons.Actions.Expandall) {
+    AnAction showFullPatchAction = new ToggleAction("Show long edges",
+                                                    "Show long branch edges even if commits are invisible in the current view.",
+                                                    AllIcons.Ide.UpDown) {
       @Override
       public boolean isSelected(AnActionEvent e) {
         return !myUI.areLongEdgesHidden();