diff --git a/python/educational-core/student/resources/META-INF/plugin.xml b/python/educational-core/student/resources/META-INF/plugin.xml
index 2938ae2aed80..a5ac8e742d05 100644
--- a/python/educational-core/student/resources/META-INF/plugin.xml
+++ b/python/educational-core/student/resources/META-INF/plugin.xml
@@ -60,9 +60,9 @@
     <action id="NextWindow" class="com.jetbrains.edu.learning.actions.StudyNextWindowAction" text="Next Answer Placeholder"
             description="Navigate to the next answer holder">
     </action>
-    <action id="PreviousTaskAction" class="com.jetbrains.edu.learning.actions.StudyPreviousStudyTaskAction" text="Previous Task"
+    <action id="PreviousTaskAction" class="com.jetbrains.edu.learning.actions.StudyPreviousTaskAction" text="Previous Task"
             description="Navigate to the previous task"/>
-    <action id="NextTaskAction" class="com.jetbrains.edu.learning.actions.StudyNextStudyTaskAction" text="Next Task"
+    <action id="NextTaskAction" class="com.jetbrains.edu.learning.actions.StudyNextTaskAction" text="Next Task"
             description="Navigate to the next task"/>
     <action id="RefreshTaskAction" class="com.jetbrains.edu.learning.actions.StudyRefreshTaskFileAction" text="Reset Task File"
             description="Refresh current task"/>
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/prev.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/prev.png
deleted file mode 100644
index fc51cb5861b1..000000000000
Binary files a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/prev.png and /dev/null differ
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java
index 35ecc643f5bf..328d2e462294 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java
@@ -27,8 +27,8 @@ public abstract class StudyBasePluginConfigurator implements StudyPluginConfigur
   @NotNull
   public static DefaultActionGroup getDefaultActionGroup() {
     final DefaultActionGroup group = new DefaultActionGroup();
-    group.add(new StudyPreviousStudyTaskAction());
-    group.add(new StudyNextStudyTaskAction());
+    group.add(new StudyPreviousTaskAction());
+    group.add(new StudyNextTaskAction());
     group.add(new StudyRefreshTaskFileAction());
     group.add(new StudyShowHintAction());
 
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextStudyTaskAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextTaskAction.java
similarity index 80%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextStudyTaskAction.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextTaskAction.java
index 1177caa53fcc..0189c3f9d60b 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextStudyTaskAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextTaskAction.java
@@ -10,13 +10,14 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
-public class StudyNextStudyTaskAction extends StudyTaskNavigationAction {
+public class StudyNextTaskAction extends StudyTaskNavigationAction {
 
   public static final String ACTION_ID = "NextTaskAction";
   public static final String SHORTCUT = "ctrl pressed PERIOD";
 
-  public StudyNextStudyTaskAction() {
-    super("Next Task (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")", "Navigate to the next task", AllIcons.Actions.Forward);
+  public StudyNextTaskAction() {
+    super("Next Task (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")",
+          "Navigate to the next task", AllIcons.Actions.Forward);
   }
 
   @Override
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
index 572d1c26b69d..81f7e8075089 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
@@ -1,8 +1,8 @@
 package com.jetbrains.edu.learning.actions;
 
-import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.intellij.icons.AllIcons;
 import com.jetbrains.edu.learning.StudyUtils;
-import icons.InteractiveLearningIcons;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,7 +17,8 @@ public class StudyPrevWindowAction extends StudyWindowNavigationAction {
   public static final String SHORTCUT = "ctrl shift pressed COMMA";
 
   public StudyPrevWindowAction() {
-    super("Navigate to the Previous Answer Placeholder", "Navigate to the previous answer placeholder", InteractiveLearningIcons.Prev);
+    super("Navigate to the Previous Answer Placeholder", "Navigate to the previous answer placeholder",
+          AllIcons.Actions.Back);
   }
 
 
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousStudyTaskAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousTaskAction.java
similarity index 75%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousStudyTaskAction.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousTaskAction.java
index f9b339af6dff..b7911602537f 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousStudyTaskAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousTaskAction.java
@@ -1,19 +1,20 @@
 package com.jetbrains.edu.learning.actions;
 
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.KeyboardShortcut;
 import com.intellij.openapi.keymap.KeymapUtil;
 import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.learning.navigation.StudyNavigator;
-import icons.InteractiveLearningIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
-public class StudyPreviousStudyTaskAction extends StudyTaskNavigationAction {
-  public StudyPreviousStudyTaskAction() {
-    super("Previous Task (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")", "Navigate to the previous task", InteractiveLearningIcons.Prev);
+public class StudyPreviousTaskAction extends StudyTaskNavigationAction {
+  public StudyPreviousTaskAction() {
+    super("Previous Task (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")",
+          "Navigate to the previous task", AllIcons.Actions.Back);
   }
 
   public static final String ACTION_ID = "PreviousTaskAction";
diff --git a/python/educational-core/student/src/icons/InteractiveLearningIcons.java b/python/educational-core/student/src/icons/InteractiveLearningIcons.java
index 2b4a362b7eca..7e2e777ffe95 100644
--- a/python/educational-core/student/src/icons/InteractiveLearningIcons.java
+++ b/python/educational-core/student/src/icons/InteractiveLearningIcons.java
@@ -19,7 +19,6 @@ public class InteractiveLearningIcons {
   public static final Icon InterpreterGear = load("/icons/com/jetbrains/edu/learning/interpreterGear.png"); // 16x16
   public static final Icon Lesson = load("/icons/com/jetbrains/edu/learning/Lesson.png"); // 16x16
   public static final Icon LessonCompl = load("/icons/com/jetbrains/edu/learning/LessonCompl.png"); // 16x16
-  public static final Icon Prev = load("/icons/com/jetbrains/edu/learning/prev.png"); // 16x16
   public static final Icon ResetTaskFile = load("/icons/com/jetbrains/edu/learning/ResetTaskFile.png"); // 16x16
   public static final Icon Sandbox = load("/icons/com/jetbrains/edu/learning/Sandbox.png"); // 16x16
   public static final Icon ShowHint = load("/icons/com/jetbrains/edu/learning/showHint.png"); // 16x16
diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyInstructionPainter.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyInstructionPainter.java
index 0496db550dbb..61f09c95fb4b 100644
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyInstructionPainter.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyInstructionPainter.java
@@ -17,8 +17,8 @@ public class PyStudyInstructionPainter extends EditorEmptyTextPainter {
     appendAction(painter, "Navigate to the next answer placeholder", shortcut);
     appendAction(painter, "Navigate between answer placeholders", getActionShortcutText(StudyPrevWindowAction.ACTION_ID) + separator +
                                                                   getActionShortcutText(StudyNextWindowAction.ACTION_ID));
-    appendAction(painter, "Navigate between tasks", getActionShortcutText(StudyPreviousStudyTaskAction.ACTION_ID) + separator +
-                                                    getActionShortcutText(StudyNextStudyTaskAction.ACTION_ID));
+    appendAction(painter, "Navigate between tasks", getActionShortcutText(StudyPreviousTaskAction.ACTION_ID) + separator +
+                                                    getActionShortcutText(StudyNextTaskAction.ACTION_ID));
     appendAction(painter, "Reset current task file", getActionShortcutText(StudyRefreshTaskFileAction.ACTION_ID));
     appendAction(painter, "Check task", getActionShortcutText(PyStudyCheckAction.ACTION_ID));
     appendAction(painter, "Get hint for the answer placeholder", getActionShortcutText(StudyShowHintAction.ACTION_ID));