diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index 375fc904e..8dd50c950 100755
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -87,6 +87,8 @@ QList<QAction*> FormMain::allActions() {
   actions << m_ui->m_actionSettings;
   actions << m_ui->m_actionImportFeeds;
   actions << m_ui->m_actionExportFeeds;
+  actions << m_ui->m_actionRestoreDatabaseSettings;
+  actions << m_ui->m_actionBackupDatabaseSettings;
   actions << m_ui->m_actionRestart;
   actions << m_ui->m_actionQuit;
   actions << m_ui->m_actionFullscreen;
@@ -211,6 +213,8 @@ void FormMain::setupIcons() {
   m_ui->m_actionReportBugBitBucket->setIcon(icon_theme_factory->fromTheme("application-report-bug"));
   m_ui->m_actionExportFeeds->setIcon(icon_theme_factory->fromTheme("document-export"));
   m_ui->m_actionImportFeeds->setIcon(icon_theme_factory->fromTheme("document-import"));
+  m_ui->m_actionBackupDatabaseSettings->setIcon(icon_theme_factory->fromTheme("document-export"));
+  m_ui->m_actionRestoreDatabaseSettings->setIcon(icon_theme_factory->fromTheme("document-import"));
   m_ui->m_actionDonate->setIcon(icon_theme_factory->fromTheme("application-donate"));
   m_ui->m_actionDisplayWiki->setIcon(icon_theme_factory->fromTheme("application-wiki"));
 
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index f087e70fa..88e8d354c 100755
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -58,6 +58,9 @@
     <addaction name="m_actionImportFeeds"/>
     <addaction name="m_actionExportFeeds"/>
     <addaction name="separator"/>
+    <addaction name="m_actionRestoreDatabaseSettings"/>
+    <addaction name="m_actionBackupDatabaseSettings"/>
+    <addaction name="separator"/>
     <addaction name="m_actionRestart"/>
     <addaction name="m_actionQuit"/>
    </widget>
@@ -615,6 +618,16 @@
     <string>&amp;Restart</string>
    </property>
   </action>
+  <action name="m_actionRestoreDatabaseSettings">
+   <property name="text">
+    <string>&amp;Restore database/settings</string>
+   </property>
+  </action>
+  <action name="m_actionBackupDatabaseSettings">
+   <property name="text">
+    <string>&amp;Backup database/settings</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp
index a139050c8..de4398e4f 100755
--- a/src/miscellaneous/application.cpp
+++ b/src/miscellaneous/application.cpp
@@ -142,7 +142,10 @@ void Application::onAboutToQuit() {
 
   qDebug("Cleaning up resources and saving application state.");
 
+#if defined(Q_OS_WIN)
   system()->removeTrolltechJunkRegistryKeys();
+#endif
+
   mainForm()->tabWidget()->feedMessageViewer()->quit();
   database()->saveDatabase();
   mainForm()->saveSize();