diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
index 064217c0eff5..d94daa6ca3bd 100644
--- a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
+++ b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
@@ -488,7 +488,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
   private final class GroupByScopeTypeAction extends ToggleAction {
     GroupByScopeTypeAction() {
       super(AnalysisScopeBundle.message("action.group.by.scope.type"), AnalysisScopeBundle.message("action.group.by.scope.type.description"),
-            AllIcons.Nodes.TestSourceFolder);
+            AllIcons.Actions.GroupByTestProduction);
     }
 
     public boolean isSelected(AnActionEvent event) {
diff --git a/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java b/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java
index ecb5e7af5b58..35e42df26497 100644
--- a/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java
+++ b/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java
@@ -32,7 +32,7 @@ public final class GroupByScopeTypeAction extends ToggleAction {
 
   public GroupByScopeTypeAction(Runnable update) {
     super(IdeBundle.message("action.group.by.scope.type"),
-          IdeBundle.message("action.description.group.by.scope"), AllIcons.Nodes.TestSourceFolder);
+          IdeBundle.message("action.description.group.by.scope"), AllIcons.Actions.GroupByTestProduction);
     myUpdate = update;
   }
 
diff --git a/platform/icons/src/actions/groupByTestProduction.png b/platform/icons/src/actions/groupByTestProduction.png
new file mode 100644
index 000000000000..3a16c53de2f4
Binary files /dev/null and b/platform/icons/src/actions/groupByTestProduction.png differ
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
index d88fd8f1b8ff..ac753c186b83 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
@@ -583,7 +583,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
   private final class GroupByScopeTypeAction extends ToggleAction {
     GroupByScopeTypeAction() {
       super(AnalysisScopeBundle.message("action.group.by.scope.type"), AnalysisScopeBundle.message("action.group.by.scope.type.description"),
-            AllIcons.Nodes.TestSourceFolder);
+            AllIcons.Actions.GroupByTestProduction);
     }
 
     public boolean isSelected(AnActionEvent event) {
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java
index 384f21d8fea2..c27390a4d115 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java
@@ -26,7 +26,6 @@ import com.intellij.usages.UsageViewSettings;
 import com.intellij.usages.impl.rules.*;
 import com.intellij.usages.rules.UsageGroupingRule;
 import com.intellij.usages.rules.UsageGroupingRuleProvider;
-import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -135,7 +134,7 @@ public class UsageGroupingRuleProviderImpl implements UsageGroupingRuleProvider
 
   private static class GroupByScopeAction extends RuleAction {
     private GroupByScopeAction(UsageViewImpl view) {
-      super(view, "Group by test/production", PlatformIcons.TEST_SOURCE_FOLDER);
+      super(view, "Group by test/production", AllIcons.Actions.GroupByTestProduction);
     }
     @Override
     protected boolean getOptionValue() {
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 4a87b8b0b5a3..ca9871de9ab7 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -58,6 +58,7 @@ public class AllIcons {
     public static final Icon GroupByModule = IconLoader.getIcon("/actions/GroupByModule.png"); // 16x16
     public static final Icon GroupByModuleGroup = IconLoader.getIcon("/actions/GroupByModuleGroup.png"); // 16x16
     public static final Icon GroupByPackage = IconLoader.getIcon("/actions/GroupByPackage.png"); // 16x16
+    public static final Icon GroupByTestProduction = IconLoader.getIcon("/actions/groupByTestProduction.png"); // 16x16
     public static final Icon Help = IconLoader.getIcon("/actions/help.png"); // 16x16
     public static final Icon Install = IconLoader.getIcon("/actions/install.png"); // 16x16
     public static final Icon IntentionBulb = IconLoader.getIcon("/actions/intentionBulb.png"); // 16x16
diff --git a/plugins/tasks/tasks-core/src/icons/TasksIcons.java b/plugins/tasks/tasks-core/src/icons/TasksIcons.java
index 20769cf5472b..6d4cdb74f7c7 100644
--- a/plugins/tasks/tasks-core/src/icons/TasksIcons.java
+++ b/plugins/tasks/tasks-core/src/icons/TasksIcons.java
@@ -13,6 +13,7 @@ public class TasksIcons {
     return IconLoader.getIcon(path, TasksIcons.class);
   }
 
+  public static final Icon Assembla = load("/icons/assembla.png"); // 16x16
   public static final Icon Bug = load("/icons/bug.png"); // 16x16
   public static final Icon Exception = load("/icons/exception.png"); // 16x16
   public static final Icon Feature = load("/icons/feature.png"); // 16x16
@@ -20,7 +21,6 @@ public class TasksIcons {
   public static final Icon Github = load("/icons/github.png"); // 16x16
   public static final Icon Lighthouse = load("/icons/lighthouse.gif"); // 16x16
   public static final Icon Mantis = load("/icons/mantis.png"); // 16x16
-  public static final Icon Assembla = load("/icons/assembla.png"); // 16x16
   public static final Icon Other = load("/icons/other.png"); // 16x16
   
   public static class Pivotal {