IDEA-197316 refresh and remove outdated arrows icons in /general

java/java-impl/src/com/intellij/codeInspection/unusedSymbol/VisibilityModifierChooser.java

@@ -48,8 +48,8 @@ public class VisibilityModifierChooser extends JLabel implements UserActivityPro
                                    @NotNull Consumer<? super String> modifierChangedConsumer,
                                    @NotNull String[] modifiers) {
     myCanBeEnabled = canBeEnabled;
-    setIcon(AllIcons.General.Combo2);
-    setDisabledIcon(AllIcons.General.Combo2);
+    setIcon(AllIcons.General.ArrowDown);
+    setDisabledIcon(AllIcons.General.ArrowDown);
     setIconTextGap(0);
     setHorizontalTextPosition(SwingConstants.LEFT);
     myCurrentModifier = modifier;

platform/core-api/src/com/intellij/util/PlatformIcons.java

@@ -93,7 +93,7 @@ public interface PlatformIcons {
 
   Icon UP_DOWN_ARROWS = AllIcons.Ide.UpDown;
 
-  Icon COMBOBOX_ARROW_ICON = AllIcons.General.ComboArrow;
+  Icon COMBOBOX_ARROW_ICON = AllIcons.General.ArrowDown;
 
   Icon EXPORT_ICON = AllIcons.ToolbarDecorator.Export;
   Icon IMPORT_ICON = AllIcons.ToolbarDecorator.Import;

platform/icons/src/actions/icon-robots.txt

@@ -9,7 +9,7 @@ deprecated: createPatch.png; to be removed in IDEA 2020
 deprecated: delete.png -> /actions/cancel.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Cancel
 deprecated: diffPreview.png -> /actions/diff.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Diff
 deprecated: diffWithCurrent.png -> /actions/diff.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Diff
-deprecated: down.png -> /general/splitDown.png; to be removed in IDEA 2020 - use AllIcons.General.SplitDown
+deprecated: down.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown
 deprecated: erDiagram.png; to be removed in IDEA 2020 - use J2EEIcons.ErDiagram
 deprecated: exclude.png -> /general/remove.svg; to be removed in IDEA 2020 - use AllIcons.General.Remove
 deprecated: export.png -> /toolbarDecorator/export.svg; to be removed in IDEA 2020 - use AllIcons.ToolbarDecorator.Export
@@ -18,7 +18,7 @@ deprecated: filter_small.png -> /general/filter.svg; to be removed in IDEA 2020
 deprecated: findPlain.png -> /actions/find.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Find
 deprecated: findWhite.png; to be removed in IDEA 2020
 deprecated: get.png -> /actions/download.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Download
-deprecated: left.png -> /general/splitLeft.png; to be removed in IDEA 2020 - use AllIcons.General.SplitLeft
+deprecated: left.png -> /general/arrowLeft.png; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft
 deprecated: menu-find.png -> /actions/find.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Find
 deprecated: menu-help.png -> /actions/help.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Help
 deprecated: menu-replace.png -> /actions/replace.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Replace
@@ -32,11 +32,12 @@ deprecated: realIntentionOffBulb.png; to be removed in IDEA 2020
 deprecated: reset.png -> /actions/rollback.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Rollback
 deprecated: reset-to-default.png -> /actions/rollback.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Rollback
 deprecated: Reset_to_empty.png -> /actions/uninstall.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Uninstall
-deprecated: right.png; to be removed in IDEA 2020 - use AllIcons.General.SplitRight
+deprecated: right.png -> /general/arrowRight.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowRight
 deprecated: showChangesOnly.png -> /actions/preview.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Preview
 deprecated: showViewer.png
 deprecated: sortAsc.png -> /actions/moveUp.svg; to be removed in IDEA 2020 - use AllIcons.Actions.MoveUp
 deprecated: sortDesc.png -> /actions/moveDown.svg; to be removed in IDEA 2020 - use AllIcons.Actions.MoveDown
 deprecated: submit1.png -> /actions/setDefault.svg; to be removed in IDEA 2020 - use AllIcons.Actions.SetDefault
 deprecated: synchronizeFS.png -> /actions/refresh.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Refresh
-deprecated: up.png -> /general/splitUp.png; to be removed in IDEA 2020 - use AllIcons.General.SplitUp
+deprecated: up.png -> /general/arrowUp.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowUp
+

platform/icons/src/general/arrowDown.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="8 6 12.5 11 3.5 11" transform="matrix(1 0 0 -1 0 17)"/>
+</svg>

platform/icons/src/general/arrowDownSmall.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="9" height="5" viewBox="0 0 9 5">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="4.5 0 9 5 0 5" transform="matrix(1 0 0 -1 0 5)"/>
+</svg>

platform/icons/src/general/arrowDownSmall_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="9" height="5" viewBox="0 0 9 5">
+  <polygon fill="#AFB1B3" fill-rule="evenodd" points="4.5 0 9 5 0 5" transform="matrix(1 0 0 -1 0 5)"/>
+</svg>

platform/icons/src/general/arrowDown_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#AFB1B3" fill-rule="evenodd" points="8 6 12.5 11 3.5 11" transform="matrix(1 0 0 -1 0 17)"/>
+</svg>

platform/icons/src/general/arrowLeft.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="7.5 5.5 12 10.5 3 10.5" transform="rotate(-90 7.5 8)"/>
+</svg>

platform/icons/src/general/arrowLeft_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#AFB1B3" fill-rule="evenodd" points="7.5 5.5 12 10.5 3 10.5" transform="rotate(-90 7.5 8)"/>
+</svg>

platform/icons/src/general/arrowRight.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="8.5 5.5 13 10.5 4 10.5" transform="matrix(0 -1 -1 0 16.5 16.5)"/>
+</svg>

platform/icons/src/general/arrowRight_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#AFB1B3" fill-rule="evenodd" points="8.5 5.5 13 10.5 4 10.5" transform="matrix(0 -1 -1 0 16.5 16.5)"/>
+</svg>

platform/icons/src/general/arrowSplitCenterH.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#6E6E6E" points="10.5 6.5 14 9.5 7 9.5" transform="rotate(90 10.5 8)"/>
+    <polygon fill="#6E6E6E" points="5.5 6.5 9 9.5 2 9.5" transform="matrix(0 1 1 0 -2.5 2.5)"/>
+  </g>
+</svg>

platform/icons/src/general/arrowSplitCenterH_dark.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#AFB1B3" points="10.5 6.5 14 9.5 7 9.5" transform="rotate(90 10.5 8)"/>
+    <polygon fill="#AFB1B3" points="5.5 6.5 9 9.5 2 9.5" transform="matrix(0 1 1 0 -2.5 2.5)"/>
+  </g>
+</svg>

platform/icons/src/general/arrowSplitCenterV.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#6E6E6E" points="8 4 10.5 7 5.5 7"/>
+    <polygon fill="#6E6E6E" points="8 9 10.5 12 5.5 12" transform="matrix(1 0 0 -1 0 21)"/>
+  </g>
+</svg>

platform/icons/src/general/arrowSplitCenterV_dark.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#AFB1B3" points="8 4 10.5 7 5.5 7"/>
+    <polygon fill="#AFB1B3" points="8 9 10.5 12 5.5 12" transform="matrix(1 0 0 -1 0 21)"/>
+  </g>
+</svg>

platform/icons/src/general/arrowUp.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="8 5 12.5 10 3.5 10"/>
+</svg>

platform/icons/src/general/arrowUp_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#AFB1B3" fill-rule="evenodd" points="8 5 12.5 10 3.5 10"/>
+</svg>

platform/icons/src/general/icon-robots.txt

@@ -1,8 +1,19 @@
+deprecated: arrowDown_white.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown
 deprecated: autohideOff.png -> /general/pin_tab.svg; to be removed in IDEA 2020 - AllIcons.General.Pin_tab
 deprecated: autohideOffInactive.png -> /general/pin_tab.svg; to be removed in IDEA 2020 - AllIcons.General.Pin_tab
 deprecated: autohideOffPressed.png -> /general/pin_tab.svg; to be removed in IDEA 2020 - AllIcons.General.Pin_tab
 deprecated: collapseAll.png -> /actions/collapseall.svg; to be removed in IDEA 2020 - AllIcons.Actions.Collapseall
 deprecated: collapseAllHover.png -> /actions/collapseall.svg; to be removed in IDEA 2020 - AllIcons.Actions.Collapseall
+deprecated: combo.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown
+deprecated: combo2.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown
+deprecated: combo3.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown
+deprecated: comboArrow.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown
+deprecated: comboArrowDown.png -> /general/arrowDownSmall.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDownSmall
+deprecated: comboArrowLeft.png -> /general/arrowLeft.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft
+deprecated: comboArrowLeftPassive.png -> /general/arrowLeft.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft
+deprecated: comboArrowRight.png -> /general/arrowRight.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowRight
+deprecated: comboArrowRightPassive.png -> /general/arrowRight.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowRight
+deprecated: comboBoxButtonArrow.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown
 deprecated: configurableDefault.png; to be removed in IDEA 2020
 deprecated: Configure.png -> /general/settings.svg; to be removed in IDEA 2020 - AllIcons.General.Settings
 deprecated: createNewProject.png -> /welcome/createNewProject.svg; to be removed in IDEA 2020 - use AllIcons.Welcome.CreateNewProject
@@ -29,4 +40,10 @@ deprecated: projectSettings.png -> /general/gearPlain.svg; to be removed in IDEA
 deprecated: readHelp.png -> /actions/help.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Help
 deprecated: recursive.png -> /actions/showAsTree.svg; to be removed in IDEA 2020 - use AllIcons.Actions.ShowAsTree
 deprecated: secondaryGroup.png -> /general/gearPlain.svg; to be removed in IDEA 2020 - use AllIcons.General.GearPlain
+deprecated: splitCenterH.png -> /general/arrowSplitCenterH.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowSplitCenterH
+deprecated: splitCenterV.png -> /general/arrowSplitCenterV.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowSplitCenterV
+deprecated: splitUp.png -> /general/arrowUp.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowUp
+deprecated: splitDown.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown
+deprecated: splitLeft.png -> /general/arrowLeft.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft
+deprecated: splitRight.png -> /general/arrowRight.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowRight
 deprecated: uninstallPlugin.png; to be removed in IDEA 2020

platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTableCellRenderer.java

@@ -19,6 +19,7 @@ package com.intellij.find.actions;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.newvfs.VfsPresentationUtil;
 import com.intellij.psi.search.SearchScope;
@@ -160,7 +161,9 @@ class ShowUsagesTableCellRenderer implements TableCellRenderer {
       if (isOriginUsage && column == USAGE_TEXT_COL) {
         SimpleColoredComponent origin = new SimpleColoredComponent();
         origin.setIconTextGap(JBUI.scale(5)); // for this particular icon it looks better
-        origin.setIcon(isSelected ? slightlyDifferentColor(AllIcons.General.ComboArrowLeftPassive) : AllIcons.General.ComboArrowLeftPassive);
+
+        Icon arrowLeftIcon = ObjectUtils.assertNotNull(IconLoader.getDisabledIcon(AllIcons.General.ArrowLeft));
+        origin.setIcon(isSelected ? slightlyDifferentColor(arrowLeftIcon) : arrowLeftIcon);
         // use attributes of "line number" to show "Current" word
         SimpleTextAttributes attributes =
           text.length == 0 ? SimpleTextAttributes.REGULAR_ATTRIBUTES.derive(-1, new Color(0x808080), null, null) :

platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java

@@ -135,8 +135,8 @@ public class ToolEditorDialog extends DialogWrapper {
   private void createUIComponents() {
     myOutputFilterField = new RawCommandLineEditor(OUTPUT_FILTERS_SPLITTER, OUTPUT_FILTERS_JOINER);
 
-    myAdvancedOptionsSeparator = new AbstractTitledSeparatorWithIcon(AllIcons.General.SplitRight,
-                                                                     AllIcons.General.SplitDown,
+    myAdvancedOptionsSeparator = new AbstractTitledSeparatorWithIcon(AllIcons.General.ArrowRight,
+                                                                     AllIcons.General.ArrowDown,
                                                                      "Advanced Options") {
       @Override
       protected RefreshablePanel createPanel() {

platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java

@@ -46,9 +46,8 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
       }
       return myWin10ComboDropTriangleIcon;
     }
-    Icon icon = UIUtil.isUnderDarcula() ? AllIcons.General.ComboArrow : AllIcons.General.ComboBoxButtonArrow;
-    if (myIcon != icon) {
-      myIcon = icon;
+    if (myIcon != AllIcons.General.ArrowDown) {
+      myIcon = AllIcons.General.ArrowDown;
       myDisabledIcon = IconLoader.getDisabledIcon(myIcon);
     }
     return enabled ? myIcon : myDisabledIcon;

platform/platform-api/src/com/intellij/openapi/ui/JBPopupMenu.java

@@ -196,7 +196,7 @@ public class JBPopupMenu extends JPopupMenu {
           g.setColor(dim[i]);
           g.drawLine(0, i, myTarget.getWidth(), i);
         }
-        AllIcons.General.SplitUp.paintIcon(myTarget, g, myTarget.getWidth() / 2 - AllIcons.General.SplitUp.getIconWidth() / 2, 0);
+        AllIcons.General.ArrowUp.paintIcon(myTarget, g, myTarget.getWidth() / 2 - AllIcons.General.ArrowUp.getIconWidth() / 2, 0);
       }
       if (super.preferredLayoutSize(myTarget).height - getMaxHeight() - myShift > 0) {
         for (int i = 0; i < dim.length; i++) {
@@ -204,8 +204,8 @@ public class JBPopupMenu extends JPopupMenu {
           g.drawLine(0, myTarget.getHeight() - i, myTarget.getWidth(),
                      myTarget.getHeight() - i);
         }
-        AllIcons.General.SplitDown.paintIcon(myTarget, g, myTarget.getWidth() / 2 - AllIcons.General.SplitDown.getIconWidth() / 2,
-                                             myTarget.getHeight() - AllIcons.General.SplitDown.getIconHeight());
+        AllIcons.General.ArrowDown.paintIcon(myTarget, g, myTarget.getWidth() / 2 - AllIcons.General.ArrowDown.getIconWidth() / 2,
+                                             myTarget.getHeight() - AllIcons.General.ArrowDown.getIconHeight());
       }
     }
 

platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java

@@ -687,11 +687,11 @@ public class ThreeComponentsSplitter extends JPanel implements Disposable {
       int xMask = isVerticalSplit ? 1 : 0;
       int yMask = isVerticalSplit ? 0 : 1;
 
-      Icon glueIcon = isVerticalSplit ? AllIcons.General.SplitGlueV : AllIcons.General.SplitCenterH;
+      Icon glueIcon = isVerticalSplit ? AllIcons.General.SplitGlueV : AllIcons.General.ArrowSplitCenterH;
       int glueFill = isVerticalSplit ? GridBagConstraints.VERTICAL : GridBagConstraints.HORIZONTAL;
       add(new JLabel(glueIcon),
           new GridBagConstraints(0, 0, 1, 1, 0, 0, isVerticalSplit ? GridBagConstraints.EAST : GridBagConstraints.NORTH, glueFill, new Insets(0, 0, 0, 0), 0, 0));
-      JLabel splitDownlabel = new JLabel(isVerticalSplit ? AllIcons.General.SplitDown : AllIcons.General.SplitRight);
+      JLabel splitDownlabel = new JLabel(isVerticalSplit ? AllIcons.General.ArrowDown : AllIcons.General.ArrowRight);
       splitDownlabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
       splitDownlabel.setToolTipText(isVerticalSplit ? UIBundle.message("splitter.down.tooltip.text") : UIBundle
         .message("splitter.right.tooltip.text"));
@@ -718,7 +718,7 @@ public class ThreeComponentsSplitter extends JPanel implements Disposable {
       //
       add(new JLabel(glueIcon),
           new GridBagConstraints(2 * xMask, 2 * yMask, 1, 1, 0, 0, GridBagConstraints.CENTER, glueFill, new Insets(0, 0, 0, 0), 0, 0));
-      JLabel splitCenterlabel = new JLabel(isVerticalSplit ? AllIcons.General.SplitCenterV : AllIcons.General.SplitCenterH);
+      JLabel splitCenterlabel = new JLabel(isVerticalSplit ? AllIcons.General.ArrowSplitCenterV : AllIcons.General.ArrowSplitCenterH);
       splitCenterlabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
       splitCenterlabel.setToolTipText(UIBundle.message("splitter.center.tooltip.text"));
       new ClickListener() {
@@ -733,7 +733,7 @@ public class ThreeComponentsSplitter extends JPanel implements Disposable {
       add(new JLabel(glueIcon),
           new GridBagConstraints(4 * xMask, 4 * yMask, 1, 1, 0, 0, GridBagConstraints.CENTER, glueFill, new Insets(0, 0, 0, 0), 0, 0));
       //
-      JLabel splitUpLabel = new JLabel(isVerticalSplit ? AllIcons.General.SplitUp : AllIcons.General.SplitLeft);
+      JLabel splitUpLabel = new JLabel(isVerticalSplit ? AllIcons.General.ArrowUp : AllIcons.General.ArrowLeft);
       splitUpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
       splitUpLabel.setToolTipText(isVerticalSplit ? UIBundle.message("splitter.up.tooltip.text") : UIBundle
         .message("splitter.left.tooltip.text"));

platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java

@@ -46,7 +46,7 @@ public class JBComboBoxLabel extends JPanel {
   }
 
   public void setSelectionIcon() {
-    myIcon.setIcon(AllIcons.General.Combo);
+    myIcon.setIcon(AllIcons.General.ArrowDown);
   }
 
   @Override

platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java

@@ -73,8 +73,8 @@ import java.awt.event.MouseEvent;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.intellij.openapi.util.text.StringUtil.isEmptyOrSpaces;
@@ -174,7 +174,7 @@ public abstract class PluginManagerMain implements Disposable {
     JLabel mySortLabel = new JLabel();
     mySortLabel.setForeground(UIUtil.getLabelDisabledForeground());
     mySortLabel.setBorder(JBUI.Borders.empty(1, 1, 1, 5));
-    mySortLabel.setIcon(AllIcons.General.SplitDown);
+    mySortLabel.setIcon(AllIcons.General.ArrowDown);
     mySortLabel.setHorizontalTextPosition(SwingConstants.LEADING);
     header.add(mySortLabel, BorderLayout.EAST);
     myTablePanel.add(header, BorderLayout.NORTH);

platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java

@@ -564,7 +564,7 @@ public final class LafManagerImpl extends LafManager implements PersistentStateC
     if (UIUtil.isUnderWin10LookAndFeel()) {
       uiDefaults.put("Menu.arrowIcon", new Win10MenuArrowIcon());
     } else if ((SystemInfo.isLinux || SystemInfo.isWindows) && (UIUtil.isUnderIntelliJLaF() || UIUtil.isUnderDarcula())) {
-      uiDefaults.put("Menu.arrowIcon", new DefaultMenuArrowIcon(AllIcons.General.SplitRight));
+      uiDefaults.put("Menu.arrowIcon", new DefaultMenuArrowIcon(AllIcons.General.ArrowRight));
     }
 
     uiDefaults.put("MenuItem.background", UIManager.getColor("Menu.background"));

platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties

@@ -60,7 +60,7 @@ Label.selectedForeground=BBBBBB
 
 TableHeaderUI=com.intellij.ide.ui.laf.darcula.DarculaTableHeaderUI
 Table.gridColor=2c2c2c
-Table.ascendingSortIcon=AllIcons.General.SplitUp
+Table.ascendingSortIcon=AllIcons.General.ArrowUp
 Table.descendingSortIcon=AllIcons.General.SplitDown
 Table.cellNoFocusBorder=4,4,4,4
 Table.focusSelectedCellHighlightBorder=com.intellij.ide.ui.laf.darcula.DarculaTableSelectedCellHighlightBorder

platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties

@@ -55,7 +55,7 @@ Label.selectedForeground=000000
 
 TableHeaderUI=com.intellij.ide.ui.laf.darcula.DarculaTableHeaderUI
 Table.gridColor=dddddd
-Table.ascendingSortIcon=AllIcons.General.SplitUp
+Table.ascendingSortIcon=AllIcons.General.ArrowUp
 Table.descendingSortIcon=AllIcons.General.SplitDown
 Table.background=ffffff
 Table.cellNoFocusBorder=4,4,4,4

platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties

@@ -51,7 +51,7 @@ link.visited.foreground=016cc1
 ScrollBarUI=com.intellij.ui.components.JBScrollBar
 TableHeaderUI=com.intellij.ide.ui.laf.darcula.DarculaTableHeaderUI
 Table.gridColor=dddddd
-Table.ascendingSortIcon=AllIcons.General.SplitUp
+Table.ascendingSortIcon=AllIcons.General.ArrowUp
 Table.descendingSortIcon=AllIcons.General.SplitDown
 Table.background=ffffff
 Table.cellNoFocusBorder=4,4,4,4

platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java

@@ -22,7 +22,7 @@ import java.awt.*;
 
 public abstract class ComboIcon {
 
-  private final ActiveIcon myIcon = new ActiveIcon(AllIcons.General.Combo2);
+  private final ActiveIcon myIcon = new ActiveIcon(AllIcons.General.ArrowDown);
 
   public void paintIcon(final Component c, final Graphics g) {
     myIcon.setActive(isActive());

platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java

@@ -17,6 +17,7 @@ package com.intellij.openapi.wm.impl.content;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.ui.popup.ActiveIcon;
+import com.intellij.openapi.util.IconLoader;
 
 import javax.swing.*;
 import java.awt.*;
@@ -24,9 +25,9 @@ import java.awt.*;
 public abstract class MoreIcon {
 
   private final ActiveIcon myLeft =
-    new ActiveIcon(AllIcons.General.ComboArrowLeft, AllIcons.General.ComboArrowLeftPassive);
+    new ActiveIcon(AllIcons.General.ArrowLeft, IconLoader.getDisabledIcon(AllIcons.General.ArrowLeft));
   private final ActiveIcon myRight =
-    new ActiveIcon(AllIcons.General.ComboArrowRight, AllIcons.General.ComboArrowRightPassive);
+    new ActiveIcon(AllIcons.General.ArrowRight, IconLoader.getDisabledIcon(AllIcons.General.ArrowRight));
 
   protected final int myGap = 2;
   protected boolean myLeftPainted;

platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java

@@ -807,7 +807,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac
   }
 
   private static JLabel createArrow(final ActionLink link) {
-    JLabel arrow = new JLabel(AllIcons.General.Combo3);
+    JLabel arrow = new JLabel(AllIcons.General.ArrowDown);
     arrow.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
     arrow.setVerticalAlignment(SwingConstants.BOTTOM);
     new ClickListener() {

platform/platform-impl/src/com/intellij/ui/HideableDecorator.java

@@ -67,7 +67,7 @@ public class HideableDecorator {
   }
 
   private void updateIcon() {
-    Icon icon = myOn ? AllIcons.General.SplitDown : AllIcons.General.SplitRight;
+    Icon icon = myOn ? AllIcons.General.ArrowDown : AllIcons.General.ArrowRight;
     myTitledSeparator.getLabel().setIcon(icon);
     myTitledSeparator.getLabel().setDisabledIcon(IconLoader.getTransparentIcon(icon, 0.5f));
   }

platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java

@@ -18,7 +18,9 @@ package com.intellij.ui;
 import com.intellij.openapi.ui.Divider;
 import com.intellij.openapi.ui.PseudoSplitter;
 import com.intellij.openapi.ui.Splitter;
+import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vcs.changes.RefreshablePanel;
+import com.intellij.util.ObjectUtils;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.JBUI.Panels;
 import com.intellij.util.ui.MouseEventHandler;
@@ -28,7 +30,8 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 
-import static com.intellij.icons.AllIcons.General.*;
+import static com.intellij.icons.AllIcons.General.ArrowDownSmall;
+import static com.intellij.icons.AllIcons.General.ArrowRight;
 
 public abstract class SplitterWithSecondHideable {
   public interface OnOffListener<T> {
@@ -92,7 +95,7 @@ public abstract class SplitterWithSecondHideable {
 
   private class MyTitledSeparator extends AbstractTitledSeparatorWithIcon {
     MyTitledSeparator(@NotNull String separatorText, boolean vertical) {
-      super(ComboArrowRight, vertical ? ComboArrowDown : ComboArrowRightPassive, separatorText);
+      super(ArrowRight, vertical ? ArrowDownSmall : ObjectUtils.assertNotNull(IconLoader.getDisabledIcon(ArrowRight)), separatorText);
     }
 
     @Override