diff --git a/doc/wiki/ToolBar.jpg b/doc/wiki/ToolBar.jpg
index 98f300a0b..82b0388d4 100644
Binary files a/doc/wiki/ToolBar.jpg and b/doc/wiki/ToolBar.jpg differ
diff --git a/doc/wiki/ToolBar_PerspectiveSelector.jpg b/doc/wiki/ToolBar_PerspectiveSelector.jpg
new file mode 100644
index 000000000..f509c3f9f
Binary files /dev/null and b/doc/wiki/ToolBar_PerspectiveSelector.jpg differ
diff --git a/src/Gui/HelpWhatsThis.cpp b/src/Gui/HelpWhatsThis.cpp
index d8899bcb7..abe7a4405 100644
--- a/src/Gui/HelpWhatsThis.cpp
+++ b/src/Gui/HelpWhatsThis.cpp
@@ -83,14 +83,18 @@ HelpWhatsThis::getText(GCHelp chapter) {
         return text.arg("ScopeBar_Views#options").arg(tr("Application level Options/Preferences for all athletes"));
 
     // Tool Bar
-    case ToolBar_Download:
-        return text.arg("First-Steps_Download-or-import#downloading-a-activity-from-device").arg(tr("Direct download from Powertap, SRM, Joule, Joule GPS, Moxy Monitor or Macro-X device"));
-    case ToolBar_Manual:
-        return text.arg("Menu%20Bar_Activity").arg(tr("Import any activity file - supported by Golden Cheetah - mass import is supported here"));
+    case ToolBar_Back:
+        return text.arg("Tool%20Bar_Functions#back").arg(tr("Navigate backward"));
+    case ToolBar_Forward:
+        return text.arg("Tool%20Bar_Functions#forward").arg(tr("Navigate forward"));
+    case ToolBar_PerspectiveSelector:
+        return text.arg("Tool%20Bar_Functions#perspective-selector").arg(tr("Select active perspective for the current view, create new perspectives and manage existing ones"));
     case ToolBar_ToggleSidebar:
-        return text.arg("Menu%20Bar_View").arg(tr("Activate / De-activate the Sidebar - which provides different sub-sections to select data shown in the main view"));
+        return text.arg("Tool%20Bar_Functions#side-bar").arg(tr("Activate / De-activate the Sidebar - which provides different sub-sections to select data shown in the main view"));
     case ToolBar_ToggleComparePane:
-        return text.arg("Compare-Pane_General").arg(tr("Activate / De-activate the Compare Pane - which allows to compare activities, intervals or date ranges - also across athletes"));
+        return text.arg("Tool%20Bar_Functions#bottom-bar").arg(tr("Activate / De-activate the Compare Pane - which allows to compare activities and intervals in Activities View or date ranges in Trends View - also across athletes. In Train View it shows/hide the Intensity Adjustments and Workout Control Pane."));
+    case ToolBar_TabTile:
+        return text.arg("Tool%20Bar_Functions#tabtile").arg(tr("Changes the current view layout between Tabbed and Tiled"));
 
     // Menus
     case MenuBar_Athlete:
diff --git a/src/Gui/HelpWhatsThis.h b/src/Gui/HelpWhatsThis.h
index f05630f19..ca33e6df7 100644
--- a/src/Gui/HelpWhatsThis.h
+++ b/src/Gui/HelpWhatsThis.h
@@ -41,10 +41,12 @@ Q_OBJECT
                  ScopeBar_Sync,
                  ScopeBar_Options,
 
-                 ToolBar_Download,
-                 ToolBar_Manual,
+                 ToolBar_Back,
+                 ToolBar_Forward,
+                 ToolBar_PerspectiveSelector,
                  ToolBar_ToggleSidebar,
                  ToolBar_ToggleComparePane,
+                 ToolBar_TabTile,
 
                  MenuBar_Athlete,
 
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 109da42d9..39e8188cf 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -283,6 +283,8 @@ MainWindow::MainWindow(const QDir &home)
     back->setIconSize(isize);
     back->setStyle(toolStyle);
     connect(back, SIGNAL(clicked(bool)), this, SIGNAL(backClicked()));
+    HelpWhatsThis *helpBack = new HelpWhatsThis(back);
+    back->setWhatsThis(helpBack->getWhatsThisText(HelpWhatsThis::ToolBar_Back));
 
     forward = new QPushButton(this);
     forward->setIcon(forwardIcon);
@@ -291,6 +293,8 @@ MainWindow::MainWindow(const QDir &home)
     forward->setIconSize(isize);
     forward->setStyle(toolStyle);
     connect(forward, SIGNAL(clicked(bool)), this, SIGNAL(forwardClicked()));
+    HelpWhatsThis *helpForward = new HelpWhatsThis(forward);
+    forward->setWhatsThis(helpForward->getWhatsThisText(HelpWhatsThis::ToolBar_Forward));
 
     lowbar = new QPushButton(this);
     lowbar->setIcon(lowbarIcon);
@@ -322,6 +326,8 @@ MainWindow::MainWindow(const QDir &home)
     lowbar->setStyle(toolStyle);
     tabtile->setToolTip(tr("Toggle Tab/Tile"));
     connect(tabtile, SIGNAL(clicked(bool)), this, SLOT(toggleStyle()));
+    HelpWhatsThis *helpTabtile = new HelpWhatsThis(tabtile);
+    tabtile->setWhatsThis(helpTabtile->getWhatsThisText(HelpWhatsThis::ToolBar_TabTile));
 
     // What's this button
     whatsthis = new QPushButton(this);
@@ -339,6 +345,8 @@ MainWindow::MainWindow(const QDir &home)
     perspectiveSelector->setFixedWidth(200 * dpiXFactor);
     perspectiveSelector->setFixedHeight(gl_toolheight * dpiYFactor);
     connect(perspectiveSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(perspectiveSelected(int)));
+    HelpWhatsThis *helpPerspectiveSelector = new HelpWhatsThis(perspectiveSelector);
+    perspectiveSelector->setWhatsThis(helpPerspectiveSelector->getWhatsThisText(HelpWhatsThis::ToolBar_PerspectiveSelector));
 
     searchBox = new SearchFilterBox(this,context,false);