diff --git a/platform/platform-api/src/com/intellij/ide/CommonActionsManager.java b/platform/platform-api/src/com/intellij/ide/CommonActionsManager.java
index 4b1b3b86f462..912591c7ee81 100644
--- a/platform/platform-api/src/com/intellij/ide/CommonActionsManager.java
+++ b/platform/platform-api/src/com/intellij/ide/CommonActionsManager.java
@@ -22,12 +22,24 @@ public abstract class CommonActionsManager {
 
   public abstract AnAction createNextOccurenceAction(OccurenceNavigator navigator);
 
+  /**
+   * @deprecated use {@link #createCollapseAllAction(TreeExpander, JComponent)} instead
+   */
+  @Deprecated
+  public abstract AnAction createExpandAllAction(TreeExpander expander);
+
   public abstract AnAction createExpandAllAction(TreeExpander expander, JComponent component);
 
   public abstract AnAction createExpandAllHeaderAction(TreeExpander expander, JComponent component);
 
   public abstract AnAction createExpandAllHeaderAction(JTree tree);
 
+  /**
+   * @deprecated use {@link #createCollapseAllAction(TreeExpander, JComponent)} instead
+   */
+  @Deprecated
+  public abstract AnAction createCollapseAllAction(TreeExpander expander);
+
   public abstract AnAction createCollapseAllAction(TreeExpander expander, JComponent component);
 
   public abstract AnAction createCollapseAllHeaderAction(TreeExpander expander, JComponent component);
diff --git a/platform/platform-impl/src/com/intellij/ide/impl/CommonActionsManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/impl/CommonActionsManagerImpl.java
index 720ae5a6f0c0..f825bfd372d7 100644
--- a/platform/platform-impl/src/com/intellij/ide/impl/CommonActionsManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/impl/CommonActionsManagerImpl.java
@@ -25,6 +25,10 @@ public class CommonActionsManagerImpl extends CommonActionsManager {
     return new NextOccurenceToolbarAction(navigator);
   }
 
+  public AnAction createExpandAllAction(TreeExpander expander) {
+    return new ExpandAllToolbarAction(expander);
+  }
+
   @Override
   public AnAction createExpandAllAction(TreeExpander expander, JComponent component) {
     final ExpandAllToolbarAction expandAllToolbarAction = new ExpandAllToolbarAction(expander);
@@ -45,6 +49,10 @@ public class CommonActionsManagerImpl extends CommonActionsManager {
     return createExpandAllHeaderAction(new DefaultTreeExpander(tree), tree);
   }
 
+  public AnAction createCollapseAllAction(TreeExpander expander) {
+    return new CollapseAllToolbarAction(expander);
+  }
+
   @Override
   public AnAction createCollapseAllAction(TreeExpander expander, JComponent component) {
     final CollapseAllToolbarAction collapseAllToolbarAction = new CollapseAllToolbarAction(expander);