diff --git a/python/edu/learn-python/gen/icons/StudyIcons.java b/python/edu/learn-python/gen/icons/StudyIcons.java
index d5a48ba4adfb..477e5ed54364 100644
--- a/python/edu/learn-python/gen/icons/StudyIcons.java
+++ b/python/edu/learn-python/gen/icons/StudyIcons.java
@@ -19,7 +19,7 @@ public class StudyIcons {
   public static final Icon Prev = load("/icons/com/jetbrains/python/edu/prev.png"); // 16x16
   public static final Icon Resolve = load("/icons/com/jetbrains/python/edu/resolve.png"); // 16x16
   public static final Icon Sandbox = load("/icons/com/jetbrains/python/edu/Sandbox.png"); // 16x16
-  public static final Icon ShowHint = load("/icons/com/jetbrains/python/edu/showHint.png"); // 24x24
+  public static final Icon ShowHint = load("/icons/com/jetbrains/python/edu/showHint.png"); // 16x16
   public static final Icon Task = load("/icons/com/jetbrains/python/edu/Task.png"); // 16x16
   public static final Icon TaskCompl = load("/icons/com/jetbrains/python/edu/TaskCompl.png"); // 16x16
   public static final Icon TaskProbl = load("/icons/com/jetbrains/python/edu/TaskProbl.png"); // 16x16
diff --git a/python/edu/learn-python/resources/META-INF/plugin.xml b/python/edu/learn-python/resources/META-INF/plugin.xml
index 388da68ae665..59457f3a1a95 100644
--- a/python/edu/learn-python/resources/META-INF/plugin.xml
+++ b/python/edu/learn-python/resources/META-INF/plugin.xml
@@ -55,11 +55,6 @@
     <action id="WatchInputAction" class="com.jetbrains.python.edu.actions.StudyEditInputAction" text="WatchInputAction"
             description="watch input"/>
     <action id="StudyRunAction" class="com.jetbrains.python.edu.actions.StudyRunAction" text="StudyRunAction" description="run your code"/>
-    <action id="ShowHintAction" class="com.jetbrains.python.edu.actions.StudyShowHintAction" text="Show hint"
-            description="show hint">
-      <add-to-group group-id="MainToolBar" anchor="last"/>
-    </action>
-
     <action id="WelcomeScreen.PythonIntro" class="com.jetbrains.python.edu.actions.StudyIntroductionCourseAction" icon="StudyIcons.EducationalProjectType">
       <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
     </action>
diff --git a/python/edu/learn-python/resources/icons/com/jetbrains/python/edu/showHint.png b/python/edu/learn-python/resources/icons/com/jetbrains/python/edu/showHint.png
index f10fd560464a..e3d4abf91fe9 100644
Binary files a/python/edu/learn-python/resources/icons/com/jetbrains/python/edu/showHint.png and b/python/edu/learn-python/resources/icons/com/jetbrains/python/edu/showHint.png differ
diff --git a/python/edu/learn-python/resources/icons/com/jetbrains/python/edu/showHint@2x.png b/python/edu/learn-python/resources/icons/com/jetbrains/python/edu/showHint@2x.png
new file mode 100644
index 000000000000..1d79e73b99ed
Binary files /dev/null and b/python/edu/learn-python/resources/icons/com/jetbrains/python/edu/showHint@2x.png differ
diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java b/python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java
index 0568a406759b..a464996d877a 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java
@@ -32,11 +32,15 @@ public class StudyShowHintAction extends DumbAwareAction {
     super("Show hint", "Show hint", StudyIcons.ShowHint);
   }
 
-  public void actionPerformed(AnActionEvent e) {
+  public void actionPerformed(@NotNull AnActionEvent e) {
     final Project project = e.getProject();
     if (project == null) {
       return;
     }
+    showHint(project);
+  }
+
+  public static void showHint(Project project) {
     Course course = StudyTaskManager.getInstance(project).getCourse();
     if (course == null) {
       return;
diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/editor/StudyEditor.java b/python/edu/learn-python/src/com/jetbrains/python/edu/editor/StudyEditor.java
index 1a06e7ade6ab..a85df6c4cf14 100644
--- a/python/edu/learn-python/src/com/jetbrains/python/edu/editor/StudyEditor.java
+++ b/python/edu/learn-python/src/com/jetbrains/python/edu/editor/StudyEditor.java
@@ -66,6 +66,7 @@ public class StudyEditor implements TextEditor {
   private JButton myRefreshButton;
   private static final Map<Document, StudyDocumentListener> myDocumentListeners = new HashMap<Document, StudyDocumentListener>();
   private final Project myProject;
+  private JButton myShowHintButton;
 
   public JButton getCheckButton() {
     return myCheckButton;
@@ -196,6 +197,7 @@ public class StudyEditor implements TextEditor {
     myPrevTaskButton = addButton(taskActionsPanel, "Prev Task", StudyIcons.Prev);
     myNextTaskButton = addButton(taskActionsPanel, "Next Task", AllIcons.Actions.Forward);
     myRefreshButton = addButton(taskActionsPanel, "Start task again", AllIcons.Actions.Refresh);
+    myShowHintButton = addButton(taskActionsPanel, "Show hint", StudyIcons.ShowHint);
     if (!taskFile.getTask().getUserTests().isEmpty()) {
       JButton runButton = addButton(taskActionsPanel, "Run", AllIcons.General.Run);
       runButton.addActionListener(new ActionListener() {
@@ -242,9 +244,14 @@ public class StudyEditor implements TextEditor {
     myRefreshButton.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        StudyRefreshTaskFileAction studyRefreshTaskAction =
-          (StudyRefreshTaskFileAction)ActionManager.getInstance().getAction("RefreshTaskAction");
-        studyRefreshTaskAction.refresh(myProject);
+        StudyRefreshTaskFileAction.refresh(myProject);
+      }
+    });
+
+    myShowHintButton.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        StudyShowHintAction.showHint(myProject);
       }
     });
   }