diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index c57361b28..45f63a94e 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -150,6 +150,7 @@ void Config::init(const QString& fileName)
     m_defaults.insert("security/autotypeask", true);
     m_defaults.insert("security/IconDownloadFallbackToGoogle", false);
     m_defaults.insert("GUI/Language", "system");
+    m_defaults.insert("GUI/HideToolbar", false);
     m_defaults.insert("GUI/ShowTrayIcon", false);
     m_defaults.insert("GUI/DarkTrayIcon", false);
     m_defaults.insert("GUI/MinimizeToTray", false);
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 9859e0fdc..5ef48f005 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -133,8 +133,6 @@ MainWindow::MainWindow()
 
     setAcceptDrops(true);
 
-    m_ui->toolBar->setContextMenuPolicy(Qt::PreventContextMenu);
-
     // Setup the search widget in the toolbar
     SearchWidget* search = new SearchWidget();
     search->connectSignals(m_actionMultiplexer);
@@ -841,6 +839,8 @@ void MainWindow::applySettingsChanges()
         m_inactivityTimer->deactivate();
     }
 
+    m_ui->toolBar->setHidden(config()->get("GUI/HideToolbar").toBool());
+
     updateTrayIcon();
 }
 
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 648a0e61a..b67e6ffd1 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -175,6 +175,17 @@
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::PreventContextMenu</enum>
+   </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>&amp;Database</string>
@@ -277,6 +288,9 @@
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="toolBar">
+   <property name="contextMenuPolicy">
+    <enum>Qt::PreventContextMenu</enum>
+   </property>
    <property name="movable">
     <bool>false</bool>
    </property>
diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp
index 751b03286..9a93cd755 100644
--- a/src/gui/SettingsWidget.cpp
+++ b/src/gui/SettingsWidget.cpp
@@ -140,6 +140,7 @@ void SettingsWidget::loadSettings()
     }
 
     m_generalUi->detailsHideCheckBox->setChecked(config()->get("GUI/HideDetailsView").toBool());
+    m_generalUi->toolbarHideCheckBox->setChecked(config()->get("GUI/HideToolbar").toBool());
     m_generalUi->systrayShowCheckBox->setChecked(config()->get("GUI/ShowTrayIcon").toBool());
     m_generalUi->systrayDarkIconCheckBox->setChecked(config()->get("GUI/DarkTrayIcon").toBool());
     m_generalUi->systrayMinimizeToTrayCheckBox->setChecked(config()->get("GUI/MinimizeToTray").toBool());
@@ -210,6 +211,7 @@ void SettingsWidget::saveSettings()
     config()->set("GUI/Language", m_generalUi->languageComboBox->itemData(currentLangIndex).toString());
 
     config()->set("GUI/HideDetailsView", m_generalUi->detailsHideCheckBox->isChecked());
+    config()->set("GUI/HideToolbar", m_generalUi->toolbarHideCheckBox->isChecked());
     config()->set("GUI/ShowTrayIcon", m_generalUi->systrayShowCheckBox->isChecked());
     config()->set("GUI/DarkTrayIcon", m_generalUi->systrayDarkIconCheckBox->isChecked());
     config()->set("GUI/MinimizeToTray", m_generalUi->systrayMinimizeToTrayCheckBox->isChecked());
diff --git a/src/gui/SettingsWidgetGeneral.ui b/src/gui/SettingsWidgetGeneral.ui
index 2d94892f2..34c7bc9b1 100644
--- a/src/gui/SettingsWidgetGeneral.ui
+++ b/src/gui/SettingsWidgetGeneral.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>684</width>
-    <height>732</height>
+    <height>794</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -179,6 +179,13 @@
           <string>General</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_7">
+          <item>
+           <widget class="QCheckBox" name="toolbarHideCheckBox">
+            <property name="text">
+             <string>Hide toolbar (icons)</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QCheckBox" name="systrayShowCheckBox">
             <property name="text">