diff --git a/resources/graphics/icons/mini-kfaenza/document-export.png b/resources/graphics/icons/mini-kfaenza/document-export.png
deleted file mode 100644
index 09eaa9f14..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/document-export.png and /dev/null differ
diff --git a/resources/graphics/icons/mini-kfaenza/document-import.png b/resources/graphics/icons/mini-kfaenza/document-import.png
deleted file mode 100644
index a694a567a..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/document-import.png and /dev/null differ
diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp
index 1a60c9a4a..271dcb3e0 100644
--- a/src/core/messagesmodel.cpp
+++ b/src/core/messagesmodel.cpp
@@ -145,8 +145,6 @@ QVariant MessagesModel::data(const QModelIndex &idx, int role) const {
       int index_column = idx.column();
 
       if (index_column == MSG_DB_DCREATED_INDEX) {
-        // TODO: toLocalTime() may be unnecessary here
-        // because parseDateTime already returns localtime.
         return TextFactory::parseDateTime(QSqlTableModel::data(idx,
                                                                role).value<qint64>()).toLocalTime().toString(Qt::DefaultLocaleShortDate);
       }
diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index 22488aff8..6562e4461 100755
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -60,6 +60,14 @@ FormMain::FormMain(QWidget *parent)
   // Establish connections.
   createConnections();
 
+  // Add these actions to the list of actions of the main window.
+  // This allows to use actions via shortcuts
+  // even if main menu is not visible.
+  // TODO: volba zobrazit/skryt hlavni menu
+  // bude li menu skryte tak jen v rohu robrazit
+  // tlacitko s tim menu.
+  addActions(allActions());
+
   // Prepare tabs.
   m_ui->m_tabWidget->initializeTabs();
 
@@ -79,8 +87,7 @@ QList<QAction*> FormMain::allActions() {
   QList<QAction*> actions;
 
   // Add basic actions.
-  actions << m_ui->m_actionImport << m_ui->m_actionExport <<
-             m_ui->m_actionSettings << m_ui->m_actionQuit <<
+  actions << m_ui->m_actionSettings << m_ui->m_actionQuit <<
              m_ui->m_actionFullscreen << m_ui->m_actionAboutGuard <<
              m_ui->m_actionSwitchFeedsListVisibility << m_ui->m_actionSwitchMainWindow;
 
@@ -245,8 +252,6 @@ void FormMain::setupIcons() {
   m_ui->m_actionSettings->setIcon(icon_theme_factory->fromTheme("application-settings"));
   m_ui->m_actionQuit->setIcon(icon_theme_factory->fromTheme("application-exit"));
   m_ui->m_actionAboutGuard->setIcon(icon_theme_factory->fromTheme("application-about"));
-  m_ui->m_actionImport->setIcon(icon_theme_factory->fromTheme("document-import"));
-  m_ui->m_actionExport->setIcon(icon_theme_factory->fromTheme("document-export"));
   m_ui->m_actionDefragmentDatabase->setIcon(icon_theme_factory->fromTheme("defragment-database"));
 
   // View.
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index 8c3708617..6c3be2505 100644
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -15,7 +15,16 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <item>
@@ -39,7 +48,7 @@
      <x>0</x>
      <y>0</y>
      <width>979</width>
-     <height>20</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="m_menuFile">
@@ -139,28 +148,6 @@
    <addaction name="m_menuTools"/>
    <addaction name="m_menuHelp"/>
   </widget>
-  <action name="m_actionImport">
-   <property name="text">
-    <string>&amp;Import</string>
-   </property>
-   <property name="toolTip">
-    <string>Import stuff.</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">Ctrl+Shift+I</string>
-   </property>
-  </action>
-  <action name="m_actionExport">
-   <property name="text">
-    <string>E&amp;xport</string>
-   </property>
-   <property name="toolTip">
-    <string>Export stuff.</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">Ctrl+Shift+E</string>
-   </property>
-  </action>
   <action name="m_actionQuit">
    <property name="text">
     <string>&amp;Quit</string>
diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp
index e2f087cd3..1e44a2c6b 100755
--- a/src/gui/formupdate.cpp
+++ b/src/gui/formupdate.cpp
@@ -91,8 +91,6 @@ void FormUpdate::checkForUpdates() {
       // TODO: Display "update" button if
       // URL of file for current platform (Windows or OS2)
       // is available.
-      // TODO: Tady po stisku update tlacitka se provede
-      // stazeni archivu do tempu.
       m_btnUpdate->setEnabled(true);
       m_btnUpdate->setToolTip(isUpdateForThisSystem() ?
                                 tr("Download installation file for your OS.") :
@@ -103,7 +101,7 @@ void FormUpdate::checkForUpdates() {
       m_ui->m_lblStatus->setStatus(WidgetWithStatus::Warning,
                                    tr("No new release available."),
                                    tr("This release is not newer than\ncurrently installed one."));
-      m_btnUpdate->setEnabled(true);
+      m_btnUpdate->setEnabled(false);
       m_btnUpdate->setToolTip(tr("No new update available."));
     }
   }