diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index c4525a2abef78f356db389c3255636d9eeb91577..788e6dbafc02bdae8cf4d27b3c33b074dcbdf580 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -126,12 +126,8 @@ public:
     /// @brief Restore (and connects) the last used connection (if any)
     void restoreLastUsedConnection();
     
-#ifdef UNITTEST_BUILD
-    // Returns a pointer to the MainToolBar so that unit tests can change views.
+    /// @brief Gets a pointer to the Main Tool Bar
     MainToolBar* getMainToolBar(void) { return _mainToolBar; }
-#endif
-
-    MainToolBar* getToolBar() { return _mainToolBar; }
 
 public slots:
     /** @brief Show the application settings */
diff --git a/src/ui/SettingsDialog.cc b/src/ui/SettingsDialog.cc
index d3a5a41e482540e055700d693b972862d4a7e099..d8561886557ed08f743df99cb6e4a4e66ab56039 100644
--- a/src/ui/SettingsDialog.cc
+++ b/src/ui/SettingsDialog.cc
@@ -177,20 +177,20 @@ void SettingsDialog::_selectSavedFilesDirectory(void)
 
 void SettingsDialog::on_showGPS_clicked(bool checked)
 {
-    _mainWindow->getToolBar()->viewStateChanged(TOOL_BAR_SHOW_GPS, checked);
+    _mainWindow->getMainToolBar()->viewStateChanged(TOOL_BAR_SHOW_GPS, checked);
 }
 
 void SettingsDialog::on_showBattery_clicked(bool checked)
 {
-    _mainWindow->getToolBar()->viewStateChanged(TOOL_BAR_SHOW_BATTERY, checked);
+    _mainWindow->getMainToolBar()->viewStateChanged(TOOL_BAR_SHOW_BATTERY, checked);
 }
 
 void SettingsDialog::on_showMessages_clicked(bool checked)
 {
-    _mainWindow->getToolBar()->viewStateChanged(TOOL_BAR_SHOW_MESSAGES, checked);
+    _mainWindow->getMainToolBar()->viewStateChanged(TOOL_BAR_SHOW_MESSAGES, checked);
 }
 
 void SettingsDialog::on_showMav_clicked(bool checked)
 {
-    _mainWindow->getToolBar()->viewStateChanged(TOOL_BAR_SHOW_MAV, checked);
+    _mainWindow->getMainToolBar()->viewStateChanged(TOOL_BAR_SHOW_MAV, checked);
 }