diff --git a/src/debugger/gui/DataGridOpsWidget.cxx b/src/debugger/gui/DataGridOpsWidget.cxx
index 06b137bcc..874d57d36 100644
--- a/src/debugger/gui/DataGridOpsWidget.cxx
+++ b/src/debugger/gui/DataGridOpsWidget.cxx
@@ -32,38 +32,38 @@ DataGridOpsWidget::DataGridOpsWidget(GuiObject* boss, const GUI::Font& font,
   int xpos = x;  int ypos = y;
   _zeroButton = new ButtonWidget(boss, font, xpos, ypos, bwidth, bheight,
                                  "0", kDGZeroCmd);
-  _zeroButton->setToolTip("Zero currently selected value");
+  _zeroButton->setToolTip("Zero currently selected value (Z)");
 
   ypos += bheight + space;
   _invButton = new ButtonWidget(boss, font, xpos, ypos, bwidth, bheight,
                                 "Inv", kDGInvertCmd);
-  _invButton->setToolTip("Invert currently selected value");
+  _invButton->setToolTip("Invert currently selected value (I)");
 
   ypos += bheight + space;
   _incButton = new ButtonWidget(boss, font, xpos, ypos, bwidth, bheight,
                                 "++", kDGIncCmd);
-  _incButton->setToolTip("Increase currently selected value.");
+  _incButton->setToolTip("Increase currently selected value. (=, Keypad +)");
 
   ypos += bheight + space;
   _shiftLeftButton = new ButtonWidget(boss, font, xpos, ypos, bwidth, bheight,
                                       "<<", kDGShiftLCmd);
-  _shiftLeftButton->setToolTip("Shift currently selected value left");
+  _shiftLeftButton->setToolTip("Shift currently selected value left (,)");
 
   // Move to next column, skip a row
   xpos = x + bwidth + space;  ypos = y + bheight + space;
   _negButton = new ButtonWidget(boss, font, xpos, ypos, bwidth, bheight,
                                 "Neg", kDGNegateCmd);
-  _negButton->setToolTip("Negate currently selected value");
+  _negButton->setToolTip("Negate currently selected value (N)");
 
   ypos += bheight + space;
   _decButton = new ButtonWidget(boss, font, xpos, ypos, bwidth, bheight,
                                 "--", kDGDecCmd);
-  _decButton->setToolTip("Decrease currently selected value");
+  _decButton->setToolTip("Decrease currently selected value (-, Keypad -)");
 
   ypos += bheight + space;
   _shiftRightButton = new ButtonWidget(boss, font, xpos, ypos, bwidth, bheight,
                                        ">>", kDGShiftRCmd);
-  _shiftRightButton->setToolTip("Shift currently selected value right");
+  _shiftRightButton->setToolTip("Shift currently selected value right (.)");
 
   // Calculate real dimensions
   _w = 2 * (bwidth+space);
diff --git a/src/debugger/gui/DebuggerDialog.cxx b/src/debugger/gui/DebuggerDialog.cxx
index c5160ee99..4c0bc0e46 100644
--- a/src/debugger/gui/DebuggerDialog.cxx
+++ b/src/debugger/gui/DebuggerDialog.cxx
@@ -563,26 +563,31 @@ void DebuggerDialog::addRomArea()
 
   b = new ButtonWidget(this, *myLFont, buttonX, buttonY,
                        bwidth, bheight, "Step", kDDStepCmd, true);
+  b->setToolTip("Ctrl+S");
   b->setHelpAnchor("GlobalButtons", true);
   wid2.push_back(b);
   buttonY += bheight + 4;
   b = new ButtonWidget(this, *myLFont, buttonX, buttonY,
                        bwidth, bheight, "Trace", kDDTraceCmd, true);
+  b->setToolTip("Ctrl+T");
   b->setHelpAnchor("GlobalButtons", true);
   wid2.push_back(b);
   buttonY += bheight + 4;
   b = new ButtonWidget(this, *myLFont, buttonX, buttonY,
                        bwidth, bheight, "Scan +1", kDDSAdvCmd, true);
+  b->setToolTip("Ctrl+L");
   b->setHelpAnchor("GlobalButtons", true);
   wid2.push_back(b);
   buttonY += bheight + 4;
   b = new ButtonWidget(this, *myLFont, buttonX, buttonY,
                        bwidth, bheight, "Frame +1", kDDAdvCmd, true);
+  b->setToolTip("Ctrl+F");
   b->setHelpAnchor("GlobalButtons", true);
   wid2.push_back(b);
   buttonY += bheight + 4;
   b = new ButtonWidget(this, *myLFont, buttonX, buttonY,
                        bwidth, bheight, "Run", kDDRunCmd);
+  b->setToolTip("Escape");
   b->setHelpAnchor("GlobalButtons", true);
   wid2.push_back(b);
 
@@ -594,6 +599,7 @@ void DebuggerDialog::addRomArea()
   myRewindButton =
     new ButtonWidget(this, *myLFont, buttonX, buttonY,
                      bwidth, bheight, LEFT_ARROW.data(), 7, 11, kDDRewindCmd, true);
+  myRewindButton->setToolTip("Alt[+Shift]+Left");
   myRewindButton->setHelpAnchor("GlobalButtons", true);
   myRewindButton->clearFlags(Widget::FLAG_ENABLED);
 
@@ -603,6 +609,7 @@ void DebuggerDialog::addRomArea()
   myUnwindButton =
     new ButtonWidget(this, *myLFont, buttonX, buttonY,
                      bwidth, bheight, RIGHT_ARROW.data(), 7, 11, kDDUnwindCmd, true);
+  myUnwindButton->setToolTip("Alt[+Shift]+Right");
   myUnwindButton->setHelpAnchor("GlobalButtons", true);
   myUnwindButton->clearFlags(Widget::FLAG_ENABLED);
 
diff --git a/src/debugger/gui/TiaWidget.cxx b/src/debugger/gui/TiaWidget.cxx
index 782d67065..4838f3d8e 100644
--- a/src/debugger/gui/TiaWidget.cxx
+++ b/src/debugger/gui/TiaWidget.cxx
@@ -102,6 +102,7 @@ TiaWidget::TiaWidget(GuiObject* boss, const GUI::Font& lfont,
   // Fixed debug colors
   xpos += myCOLUP0Color->getWidth() + 30;  ypos = 10 + lineHeight + 6;
   myFixedEnabled = new CheckboxWidget(boss, lfont, xpos, ypos, "Debug Colors", kDbgClCmd);
+  myFixedEnabled->setToolTip("Enable fixed debug colors", Event::ToggleFixedColors);
   myFixedEnabled->setTarget(this);
   addFocusWidget(myFixedEnabled);
 
diff --git a/src/gui/DeveloperDialog.cxx b/src/gui/DeveloperDialog.cxx
index 30320099d..fd22e69d9 100644
--- a/src/gui/DeveloperDialog.cxx
+++ b/src/gui/DeveloperDialog.cxx
@@ -398,7 +398,7 @@ void DeveloperDialog::addVideoTab(const GUI::Font& font)
   // debug colors
   myDebugColorsWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT * 1, ypos + 1,
                                            "Debug colors (*)");
-  myDebugColorsWidget->setToolTip(Event::ToggleFixedColors);
+  myDebugColorsWidget->setToolTip("Enable fixed debug colors", Event::ToggleFixedColors);
   wid.push_back(myDebugColorsWidget);
   ypos += lineHeight + VGAP + 2;