diff --git a/platform/icons/src/actions/popFrame.png b/platform/icons/src/actions/popFrame.png
index ab8f34f2b85f..9824f0fd7c59 100644
Binary files a/platform/icons/src/actions/popFrame.png and b/platform/icons/src/actions/popFrame.png differ
diff --git a/platform/icons/src/actions/popFrame@2x.png b/platform/icons/src/actions/popFrame@2x.png
index f8f993573be7..b886d8329cc1 100644
Binary files a/platform/icons/src/actions/popFrame@2x.png and b/platform/icons/src/actions/popFrame@2x.png differ
diff --git a/platform/icons/src/actions/popFrame@2x_dark.png b/platform/icons/src/actions/popFrame@2x_dark.png
index 67841639eb39..4d83e21f6211 100644
Binary files a/platform/icons/src/actions/popFrame@2x_dark.png and b/platform/icons/src/actions/popFrame@2x_dark.png differ
diff --git a/platform/icons/src/actions/popFrame_dark.png b/platform/icons/src/actions/popFrame_dark.png
index f500727281e9..d7ac988416d1 100644
Binary files a/platform/icons/src/actions/popFrame_dark.png and b/platform/icons/src/actions/popFrame_dark.png differ
diff --git a/platform/icons/src/actions/runToCursor.png b/platform/icons/src/actions/runToCursor.png
index aa9a263157c0..7ef5ef79c4f3 100644
Binary files a/platform/icons/src/actions/runToCursor.png and b/platform/icons/src/actions/runToCursor.png differ
diff --git a/platform/icons/src/actions/runToCursor@2x.png b/platform/icons/src/actions/runToCursor@2x.png
index 795e028958fb..7cc6c8775188 100644
Binary files a/platform/icons/src/actions/runToCursor@2x.png and b/platform/icons/src/actions/runToCursor@2x.png differ
diff --git a/platform/icons/src/actions/runToCursor@2x_dark.png b/platform/icons/src/actions/runToCursor@2x_dark.png
index 67a8fb0a0c72..4eb1f0f2a6be 100644
Binary files a/platform/icons/src/actions/runToCursor@2x_dark.png and b/platform/icons/src/actions/runToCursor@2x_dark.png differ
diff --git a/platform/icons/src/actions/runToCursor_dark.png b/platform/icons/src/actions/runToCursor_dark.png
index 94f588df6284..117140dc5f2b 100644
Binary files a/platform/icons/src/actions/runToCursor_dark.png and b/platform/icons/src/actions/runToCursor_dark.png differ
diff --git a/platform/icons/src/actions/stepOut.png b/platform/icons/src/actions/stepOut.png
index 4ea29bcfd92b..2f030ae77cce 100644
Binary files a/platform/icons/src/actions/stepOut.png and b/platform/icons/src/actions/stepOut.png differ
diff --git a/platform/icons/src/actions/stepOut@2x.png b/platform/icons/src/actions/stepOut@2x.png
index 12e74b329ea0..a1fb68cfd077 100644
Binary files a/platform/icons/src/actions/stepOut@2x.png and b/platform/icons/src/actions/stepOut@2x.png differ
diff --git a/platform/icons/src/actions/stepOut@2x_dark.png b/platform/icons/src/actions/stepOut@2x_dark.png
deleted file mode 100644
index b1f72ccf6999..000000000000
Binary files a/platform/icons/src/actions/stepOut@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/actions/stepOut_dark.png b/platform/icons/src/actions/stepOut_dark.png
deleted file mode 100644
index 5b2cddc50fc2..000000000000
Binary files a/platform/icons/src/actions/stepOut_dark.png and /dev/null differ
diff --git a/platform/icons/src/actions/traceInto.png b/platform/icons/src/actions/traceInto.png
index 138dda98bdf2..62113372611c 100644
Binary files a/platform/icons/src/actions/traceInto.png and b/platform/icons/src/actions/traceInto.png differ
diff --git a/platform/icons/src/actions/traceInto@2x.png b/platform/icons/src/actions/traceInto@2x.png
index e69a342eca6d..429a430a8c5e 100644
Binary files a/platform/icons/src/actions/traceInto@2x.png and b/platform/icons/src/actions/traceInto@2x.png differ
diff --git a/platform/icons/src/actions/traceInto@2x_dark.png b/platform/icons/src/actions/traceInto@2x_dark.png
deleted file mode 100644
index f3fed9ebde70..000000000000
Binary files a/platform/icons/src/actions/traceInto@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/actions/traceInto_dark.png b/platform/icons/src/actions/traceInto_dark.png
deleted file mode 100644
index d0ba74ddc767..000000000000
Binary files a/platform/icons/src/actions/traceInto_dark.png and /dev/null differ
diff --git a/platform/icons/src/actions/traceOver.png b/platform/icons/src/actions/traceOver.png
index 082de1ffd2ad..9e7465c45f10 100644
Binary files a/platform/icons/src/actions/traceOver.png and b/platform/icons/src/actions/traceOver.png differ
diff --git a/platform/icons/src/actions/traceOver@2x.png b/platform/icons/src/actions/traceOver@2x.png
index ddba0dffcf31..d3a154baf3df 100644
Binary files a/platform/icons/src/actions/traceOver@2x.png and b/platform/icons/src/actions/traceOver@2x.png differ
diff --git a/platform/icons/src/actions/traceOver@2x_dark.png b/platform/icons/src/actions/traceOver@2x_dark.png
deleted file mode 100644
index f7d4ffc221d4..000000000000
Binary files a/platform/icons/src/actions/traceOver@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/actions/traceOver_dark.png b/platform/icons/src/actions/traceOver_dark.png
deleted file mode 100644
index efe5af21c483..000000000000
Binary files a/platform/icons/src/actions/traceOver_dark.png and /dev/null differ
diff --git a/platform/icons/src/debugger/actions/force_run_to_cursor.png b/platform/icons/src/debugger/actions/force_run_to_cursor.png
index 353a0f281a65..662507e2c3c8 100644
Binary files a/platform/icons/src/debugger/actions/force_run_to_cursor.png and b/platform/icons/src/debugger/actions/force_run_to_cursor.png differ
diff --git a/platform/icons/src/debugger/actions/force_run_to_cursor@2x.png b/platform/icons/src/debugger/actions/force_run_to_cursor@2x.png
index 7ec3b697e925..9ef69fe3baf7 100644
Binary files a/platform/icons/src/debugger/actions/force_run_to_cursor@2x.png and b/platform/icons/src/debugger/actions/force_run_to_cursor@2x.png differ
diff --git a/platform/icons/src/debugger/actions/force_run_to_cursor@2x_dark.png b/platform/icons/src/debugger/actions/force_run_to_cursor@2x_dark.png
new file mode 100644
index 000000000000..8c3eeca62fb6
Binary files /dev/null and b/platform/icons/src/debugger/actions/force_run_to_cursor@2x_dark.png differ
diff --git a/platform/icons/src/debugger/actions/force_run_to_cursor_dark.png b/platform/icons/src/debugger/actions/force_run_to_cursor_dark.png
new file mode 100644
index 000000000000..476d28217adf
Binary files /dev/null and b/platform/icons/src/debugger/actions/force_run_to_cursor_dark.png differ
diff --git a/platform/icons/src/debugger/actions/force_step_into.png b/platform/icons/src/debugger/actions/force_step_into.png
index 39b390bc2873..19539520c5d5 100644
Binary files a/platform/icons/src/debugger/actions/force_step_into.png and b/platform/icons/src/debugger/actions/force_step_into.png differ
diff --git a/platform/icons/src/debugger/actions/force_step_into@2x.png b/platform/icons/src/debugger/actions/force_step_into@2x.png
index a6c4358426ef..152e82528b87 100644
Binary files a/platform/icons/src/debugger/actions/force_step_into@2x.png and b/platform/icons/src/debugger/actions/force_step_into@2x.png differ
diff --git a/platform/icons/src/debugger/actions/force_step_over.png b/platform/icons/src/debugger/actions/force_step_over.png
index aa864b0f6e46..ba9b08355915 100644
Binary files a/platform/icons/src/debugger/actions/force_step_over.png and b/platform/icons/src/debugger/actions/force_step_over.png differ
diff --git a/platform/icons/src/debugger/actions/force_step_over@2x.png b/platform/icons/src/debugger/actions/force_step_over@2x.png
index 50a6883b7bd9..696e04607bb2 100644
Binary files a/platform/icons/src/debugger/actions/force_step_over@2x.png and b/platform/icons/src/debugger/actions/force_step_over@2x.png differ
diff --git a/platform/icons/src/debugger/smartStepInto.png b/platform/icons/src/debugger/smartStepInto.png
new file mode 100644
index 000000000000..1587f9ecf4d6
Binary files /dev/null and b/platform/icons/src/debugger/smartStepInto.png differ
diff --git a/platform/icons/src/debugger/smartStepInto@2x.png b/platform/icons/src/debugger/smartStepInto@2x.png
new file mode 100644
index 000000000000..0dbe528b1209
Binary files /dev/null and b/platform/icons/src/debugger/smartStepInto@2x.png differ
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 82f613c95adf..13cfd5b731c9 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -644,7 +644,7 @@
       <action id="ForceStepOver" class="com.intellij.xdebugger.impl.actions.ForceStepOverAction" icon="AllIcons.Debugger.Actions.Force_step_over"/>
       <action id="StepInto" class="com.intellij.xdebugger.impl.actions.StepIntoAction" icon="AllIcons.Actions.TraceInto"/>
       <action id="ForceStepInto" class="com.intellij.xdebugger.impl.actions.ForceStepIntoAction" icon="AllIcons.Debugger.Actions.Force_step_into"/>
-      <action id="SmartStepInto" class="com.intellij.xdebugger.impl.actions.SmartStepIntoAction" icon="AllIcons.Actions.TraceInto"/>
+      <action id="SmartStepInto" class="com.intellij.xdebugger.impl.actions.SmartStepIntoAction" icon="AllIcons.Debugger.SmartStepInto"/>
       <action id="StepOut" class="com.intellij.xdebugger.impl.actions.StepOutAction" icon="AllIcons.Actions.StepOut"/>
       <action id="RunToCursor" class="com.intellij.xdebugger.impl.actions.RunToCursorAction" icon="AllIcons.Actions.RunToCursor"/>
       <action id="ForceRunToCursor" class="com.intellij.xdebugger.impl.actions.ForceRunToCursorAction" icon="AllIcons.Debugger.Actions.Force_run_to_cursor"/>
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 77d945811130..6351b42974e7 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -273,6 +273,7 @@ public class AllIcons {
     public static final Icon NewWatch = IconLoader.getIcon("/debugger/newWatch.png"); // 16x16
     public static final Icon RestoreLayout = IconLoader.getIcon("/debugger/restoreLayout.png"); // 16x16
     public static final Icon ShowCurrentFrame = IconLoader.getIcon("/debugger/showCurrentFrame.png"); // 16x16
+    public static final Icon SmartStepInto = IconLoader.getIcon("/debugger/smartStepInto.png"); // 16x16
     public static final Icon StackFrame = IconLoader.getIcon("/debugger/stackFrame.png"); // 16x16
     public static final Icon ThreadAtBreakpoint = IconLoader.getIcon("/debugger/threadAtBreakpoint.png"); // 16x16
     public static final Icon ThreadCurrent = IconLoader.getIcon("/debugger/threadCurrent.png"); // 16x16