diff --git a/data/images/toolbar/bluecurve/large/hint.gif b/data/images/toolbar/bluecurve/large/hint.gif
new file mode 100644
index 00000000..b6474d97
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/hint.gif differ
diff --git a/data/images/toolbar/bluecurve/large/hint.png b/data/images/toolbar/bluecurve/large/hint.png
new file mode 100644
index 00000000..647382d2
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/hint.png differ
diff --git a/data/images/toolbar/bluecurve/small/hint.gif b/data/images/toolbar/bluecurve/small/hint.gif
new file mode 100644
index 00000000..defe15bc
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/hint.gif differ
diff --git a/data/images/toolbar/bluecurve/small/hint.png b/data/images/toolbar/bluecurve/small/hint.png
new file mode 100644
index 00000000..806a6723
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/hint.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/hint.gif b/data/images/toolbar/bluecurve/xlarge/hint.gif
new file mode 100644
index 00000000..b3abdced
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/hint.gif differ
diff --git a/data/images/toolbar/bluecurve/xlarge/hint.png b/data/images/toolbar/bluecurve/xlarge/hint.png
new file mode 100644
index 00000000..1823ef28
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/hint.png differ
diff --git a/data/images/toolbar/crystal/large/hint.gif b/data/images/toolbar/crystal/large/hint.gif
new file mode 100644
index 00000000..2d5946ac
Binary files /dev/null and b/data/images/toolbar/crystal/large/hint.gif differ
diff --git a/data/images/toolbar/crystal/large/hint.png b/data/images/toolbar/crystal/large/hint.png
new file mode 100644
index 00000000..09e49953
Binary files /dev/null and b/data/images/toolbar/crystal/large/hint.png differ
diff --git a/data/images/toolbar/crystal/small/hint.gif b/data/images/toolbar/crystal/small/hint.gif
new file mode 100644
index 00000000..196aa4f1
Binary files /dev/null and b/data/images/toolbar/crystal/small/hint.gif differ
diff --git a/data/images/toolbar/crystal/small/hint.png b/data/images/toolbar/crystal/small/hint.png
new file mode 100644
index 00000000..30b6cc9b
Binary files /dev/null and b/data/images/toolbar/crystal/small/hint.png differ
diff --git a/data/images/toolbar/default/large/hint.gif b/data/images/toolbar/default/large/hint.gif
new file mode 100644
index 00000000..2d5946ac
Binary files /dev/null and b/data/images/toolbar/default/large/hint.gif differ
diff --git a/data/images/toolbar/default/large/hint.png b/data/images/toolbar/default/large/hint.png
new file mode 100644
index 00000000..09e49953
Binary files /dev/null and b/data/images/toolbar/default/large/hint.png differ
diff --git a/data/images/toolbar/default/small/hint.gif b/data/images/toolbar/default/small/hint.gif
new file mode 100644
index 00000000..196aa4f1
Binary files /dev/null and b/data/images/toolbar/default/small/hint.gif differ
diff --git a/data/images/toolbar/default/small/hint.png b/data/images/toolbar/default/small/hint.png
new file mode 100644
index 00000000..30b6cc9b
Binary files /dev/null and b/data/images/toolbar/default/small/hint.png differ
diff --git a/data/images/toolbar/human/large/hint.png b/data/images/toolbar/human/large/hint.png
new file mode 100644
index 00000000..71fcce90
Binary files /dev/null and b/data/images/toolbar/human/large/hint.png differ
diff --git a/data/images/toolbar/human/small/hint.png b/data/images/toolbar/human/small/hint.png
new file mode 100644
index 00000000..8853deff
Binary files /dev/null and b/data/images/toolbar/human/small/hint.png differ
diff --git a/data/images/toolbar/human/xlarge/hint.png b/data/images/toolbar/human/xlarge/hint.png
new file mode 100644
index 00000000..7bd89519
Binary files /dev/null and b/data/images/toolbar/human/xlarge/hint.png differ
diff --git a/data/images/toolbar/remix light/large/hint.png b/data/images/toolbar/remix light/large/hint.png
new file mode 100644
index 00000000..9f0d532d
Binary files /dev/null and b/data/images/toolbar/remix light/large/hint.png differ
diff --git a/data/images/toolbar/remix light/small/hint.png b/data/images/toolbar/remix light/small/hint.png
new file mode 100644
index 00000000..40f5c861
Binary files /dev/null and b/data/images/toolbar/remix light/small/hint.png differ
diff --git a/data/images/toolbar/remix light/xlarge/hint.png b/data/images/toolbar/remix light/xlarge/hint.png
new file mode 100644
index 00000000..dd38c857
Binary files /dev/null and b/data/images/toolbar/remix light/xlarge/hint.png differ
diff --git a/data/images/toolbar/remix/large/hint.png b/data/images/toolbar/remix/large/hint.png
new file mode 100644
index 00000000..03b57696
Binary files /dev/null and b/data/images/toolbar/remix/large/hint.png differ
diff --git a/data/images/toolbar/remix/small/hint.png b/data/images/toolbar/remix/small/hint.png
new file mode 100644
index 00000000..09c8071d
Binary files /dev/null and b/data/images/toolbar/remix/small/hint.png differ
diff --git a/data/images/toolbar/remix/xlarge/hint.png b/data/images/toolbar/remix/xlarge/hint.png
new file mode 100644
index 00000000..fdebddf6
Binary files /dev/null and b/data/images/toolbar/remix/xlarge/hint.png differ
diff --git a/data/images/toolbar/tango/large/hint.png b/data/images/toolbar/tango/large/hint.png
new file mode 100644
index 00000000..2ac57475
Binary files /dev/null and b/data/images/toolbar/tango/large/hint.png differ
diff --git a/data/images/toolbar/tango/small/hint.png b/data/images/toolbar/tango/small/hint.png
new file mode 100644
index 00000000..3369d581
Binary files /dev/null and b/data/images/toolbar/tango/small/hint.png differ
diff --git a/data/images/toolbar/tango/xlarge/hint.png b/data/images/toolbar/tango/xlarge/hint.png
new file mode 100644
index 00000000..bc4ffdc1
Binary files /dev/null and b/data/images/toolbar/tango/xlarge/hint.png differ
diff --git a/pysollib/actions.py b/pysollib/actions.py
index 5721c164..07c41114 100644
--- a/pysollib/actions.py
+++ b/pysollib/actions.py
@@ -941,6 +941,11 @@ class PysolToolbar(PysolToolbarTk):
             self.menubar.mShuffle()
         return 1
 
+    def mHint(self, *args):
+        if not self._busy():
+            self.menubar.mHint()
+        return 1
+
     def mPause(self, *args):
         if not self._busy():
             self.menubar.mPause()
diff --git a/pysollib/kivy/toolbar.py b/pysollib/kivy/toolbar.py
index 06231aec..5f72441f 100644
--- a/pysollib/kivy/toolbar.py
+++ b/pysollib/kivy/toolbar.py
@@ -198,6 +198,7 @@ class PysolToolbarTk(BoxLayout):
             (n_("Redo"),     self.mRedo,      _("Redo last move")),
             (n_("Autodrop"), self.mDrop,      _("Auto drop cards")),
             (n_("Shuffle"),  self.mShuffle,   _("Shuffle tiles")),
+            (n_("Hint"),     self.mPause,     _("Hint")),
             (n_("Pause"),    self.mPause,     _("Pause game")),
             (None,           None,            None),
             # (n_("Statistics"), self.mPlayerStats, _("View statistics")),
diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py
index 0b32e495..435f077d 100644
--- a/pysollib/tile/toolbar.py
+++ b/pysollib/tile/toolbar.py
@@ -184,6 +184,7 @@ class PysolToolbarTk:
             (n_("Redo"),     self.mRedo,      _("Redo last move")),
             (n_("Autodrop"), self.mDrop,      _("Auto drop cards")),
             (n_("Shuffle"),  self.mShuffle,   _("Shuffle tiles")),
+            (n_("Hint"),     self.mHint,      _("Hint")),
             (n_("Pause"),    self.mPause,     _("Pause game")),
             (None,           None,            None),
             (n_("Statistics"), self.mPlayerStats, _("View statistics")),
diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py
index 607076e5..1ae34844 100644
--- a/pysollib/tk/toolbar.py
+++ b/pysollib/tk/toolbar.py
@@ -193,6 +193,7 @@ class PysolToolbarTk:
             (n_("Redo"),     self.mRedo,      _("Redo last move")),
             (n_("Autodrop"), self.mDrop,      _("Auto drop cards")),
             (n_("Shuffle"),  self.mShuffle,   _("Shuffle tiles")),
+            (n_("Hint"),     self.mHint,      _("Hint")),
             (n_("Pause"),    self.mPause,     _("Pause game")),
             (None,           None,            None),
             (n_("Statistics"), self.mPlayerStats, _("View statistics")),
diff --git a/pysollib/ui/tktile/tkconst.py b/pysollib/ui/tktile/tkconst.py
index 28bbc963..19322633 100644
--- a/pysollib/ui/tktile/tkconst.py
+++ b/pysollib/ui/tktile/tkconst.py
@@ -65,6 +65,7 @@ TOOLBAR_BUTTONS = (
     "redo",
     "autodrop",
     "shuffle",
+    "hint",
     "pause",
     "statistics",
     "rules",