diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/JdkPopupAction.java b/java/java-impl/src/com/intellij/openapi/projectRoots/JdkPopupAction.java
index d3056614bad1..509333b9b04f 100644
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/JdkPopupAction.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/JdkPopupAction.java
@@ -116,7 +116,7 @@ public class JdkPopupAction extends AnAction {
                 if (selectedFile != null) {
                   selected = homes.getFirst().getAbsolutePath().equals(VfsUtilCore.virtualToIoFile(selectedFile).getAbsolutePath());
                 }
-                e.getPresentation().setIcon(selected ? AllIcons.Diff.CurrentLine : null);
+                e.getPresentation().setIcon(selected ? AllIcons.Actions.Forward : null);
               }
 
               @Override
diff --git a/java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java b/java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java
index 11b5d45cd5c2..40ea6a5605af 100644
--- a/java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java
+++ b/java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java
@@ -71,7 +71,7 @@ public class AnnotationsPanel {
                                            int column) {
         append((String)value, SimpleTextAttributes.REGULAR_ATTRIBUTES);
         if (value.equals(myDefaultAnnotation)) {
-          setIcon(AllIcons.Diff.CurrentLine);
+          setIcon(AllIcons.Actions.Forward);
         }
         else {
           setIcon(EmptyIcon.ICON_16);
diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/blockingCallsDetection/BlockingAnnotationsPanel.java b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/blockingCallsDetection/BlockingAnnotationsPanel.java
index d8a5664d60b4..7df0bb5e697f 100644
--- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/blockingCallsDetection/BlockingAnnotationsPanel.java
+++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/blockingCallsDetection/BlockingAnnotationsPanel.java
@@ -77,7 +77,7 @@ class BlockingAnnotationsPanel {
                                            int column) {
         append((String)value, SimpleTextAttributes.REGULAR_ATTRIBUTES);
         if (value.equals(myDefaultAnnotation)) {
-          setIcon(AllIcons.Diff.CurrentLine);
+          setIcon(AllIcons.Actions.Forward);
         }
         else {
           setIcon(EmptyIcon.ICON_16);
diff --git a/platform/icons/src/diff/currentLine.png b/platform/icons/compatibilityResources/diff/currentLine.png
similarity index 100%
rename from platform/icons/src/diff/currentLine.png
rename to platform/icons/compatibilityResources/diff/currentLine.png
diff --git a/platform/icons/src/diff/currentLine@2x.png b/platform/icons/compatibilityResources/diff/currentLine@2x.png
similarity index 100%
rename from platform/icons/src/diff/currentLine@2x.png
rename to platform/icons/compatibilityResources/diff/currentLine@2x.png
diff --git a/platform/icons/src/diff/icon-robots.txt b/platform/icons/src/diff/icon-robots.txt
new file mode 100644
index 000000000000..05973c846b76
--- /dev/null
+++ b/platform/icons/src/diff/icon-robots.txt
@@ -0,0 +1,2 @@
+deprecated: currentLine.png; to be removed in IDEA 2020 - use AllIcons.Actions.Forward
+deprecated: Diff.png; to be removed in IDEA 2020 - use AllIcons.Actions.Diff
diff --git a/platform/icons/src/icon-robots.txt b/platform/icons/src/icon-robots.txt
index 117461249bd1..67e013c92420 100644
--- a/platform/icons/src/icon-robots.txt
+++ b/platform/icons/src/icon-robots.txt
@@ -1,2 +1 @@
 skip: diff_frame*
-deprecated: diff/Diff.png
diff --git a/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java b/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java
index 8ed74f3fafba..4101cb37ad76 100644
--- a/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java
+++ b/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java
@@ -32,7 +32,7 @@ import javax.swing.*;
  */
 public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAware {
 
-  protected static final Icon ourCurrentAction = AllIcons.Diff.CurrentLine;
+  protected static final Icon ourCurrentAction = AllIcons.Actions.Forward;
   protected static final Icon ourNotCurrentAction = EmptyIcon.create(ourCurrentAction.getIconWidth(), ourCurrentAction.getIconHeight());
 
   protected String myActionPlace = ActionPlaces.UNKNOWN;
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index f0eee9df4fe9..3b80983b8667 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -723,16 +723,21 @@ public class AllIcons {
     public static final Icon Compare4MiddleBottom = IconLoader.getIcon("/diff/compare4MiddleBottom.png"); // 16x16
     public static final Icon Compare4MiddleRight = IconLoader.getIcon("/diff/compare4MiddleRight.png"); // 16x16
     public static final Icon Compare4RightBottom = IconLoader.getIcon("/diff/compare4RightBottom.png"); // 16x16
-    public static final Icon CurrentLine = IconLoader.getIcon("/diff/currentLine.png"); // 16x16
     public static final Icon GutterCheckBox = IconLoader.getIcon("/diff/gutterCheckBox.svg"); // 12x12
     public static final Icon GutterCheckBoxSelected = IconLoader.getIcon("/diff/gutterCheckBoxSelected.svg"); // 12x12
     public static final Icon MagicResolve = IconLoader.getIcon("/diff/magicResolve.svg"); // 12x12
     public static final Icon MagicResolveToolbar = IconLoader.getIcon("/diff/magicResolveToolbar.svg"); // 16x16
     public static final Icon Remove = IconLoader.getIcon("/diff/remove.svg"); // 12x12
 
+    /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Forward */
     @SuppressWarnings("unused")
     @Deprecated
-    public static final Icon Diff = IconLoader.getIcon("/diff/Diff.png");
+    public static final Icon CurrentLine = AllIcons.Actions.Forward;
+
+    /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Diff */
+    @SuppressWarnings("unused")
+    @Deprecated
+    public static final Icon Diff = AllIcons.Actions.Diff;
 
   }