diff --git a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp
index eeb895161..2d9953489 100644
--- a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp
+++ b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp
@@ -4,6 +4,7 @@
 
 #include "definitions/definitions.h"
 #include "dynamic-shortcuts/shortcutcatcher.h"
+#include "gui/reusable/squeezelabel.h"
 
 #include <QAction>
 #include <QGridLayout>
@@ -69,10 +70,20 @@ void DynamicShortcutsWidget::populate(QList<QAction*> actions) {
 
     // Add new catcher to our control.
     auto* action_label = new QLabel(this);
+    auto act_text = action->text().remove(QSL("&"));
+    auto act_toolt = action->toolTip();
+
+    if (act_text == act_toolt) {
+      action_label->setText(act_text);
+    }
+    else {
+      action_label->setText(QSL("%1 (%2)").arg(act_text, act_toolt));
+    }
 
-    action_label->setText(action->text().remove(QSL("&")));
     action_label->setToolTip(action->toolTip());
-    action_label->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+    action_label->setWordWrap(true);
+
+    //action_label->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
 
     auto* action_icon = new QLabel(this);
 
@@ -81,6 +92,7 @@ void DynamicShortcutsWidget::populate(QList<QAction*> actions) {
     m_layout->addWidget(action_icon, row_id, 0);
     m_layout->addWidget(action_label, row_id, 1);
     m_layout->addWidget(catcher, row_id, 2);
+
     row_id++;
     connect(catcher, &ShortcutCatcher::shortcutChanged, this, &DynamicShortcutsWidget::setupChanged);
   }
diff --git a/src/librssguard/gui/dialogs/formmain.ui b/src/librssguard/gui/dialogs/formmain.ui
index 3d6ea6142..fc0644130 100755
--- a/src/librssguard/gui/dialogs/formmain.ui
+++ b/src/librssguard/gui/dialogs/formmain.ui
@@ -100,7 +100,7 @@
    </widget>
    <widget class="QMenu" name="m_menuFeeds">
     <property name="title">
-     <string>Feeds &amp;&amp; categories</string>
+     <string>Feeds</string>
     </property>
     <widget class="QMenu" name="m_menuAddItem">
      <property name="title">
@@ -237,18 +237,21 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>View &amp;fullscreen</string>
+    <string>&amp;Fullscreen</string>
    </property>
    <property name="toolTip">
     <string>Switch fullscreen mode.</string>
    </property>
    <property name="shortcut">
-    <string notr="true">F</string>
+    <string notr="true">F11</string>
    </property>
   </action>
   <action name="m_actionUpdateAllItems">
    <property name="text">
-    <string>&amp;Fetch all feeds</string>
+    <string>&amp;Fetch all</string>
+   </property>
+   <property name="toolTip">
+    <string>Fetch all feeds</string>
    </property>
    <property name="shortcut">
     <string notr="true">Ctrl+Shift+U</string>
@@ -256,7 +259,10 @@
   </action>
   <action name="m_actionUpdateSelectedItems">
    <property name="text">
-    <string>Fetch &amp;selected feeds</string>
+    <string>Fetch &amp;selected</string>
+   </property>
+   <property name="toolTip">
+    <string>Fetch selected feeds</string>
    </property>
    <property name="shortcut">
     <string notr="true">Ctrl+U</string>
@@ -335,7 +341,7 @@
   </action>
   <action name="m_actionDeleteSelectedMessages">
    <property name="text">
-    <string>&amp;Delete selected articles</string>
+    <string>&amp;Delete articles</string>
    </property>
    <property name="shortcut">
     <string notr="true"/>
@@ -390,7 +396,7 @@
   </action>
   <action name="m_actionMarkAllItemsRead">
    <property name="text">
-    <string>&amp;Mark all items read</string>
+    <string>&amp;Mark all read</string>
    </property>
    <property name="toolTip">
     <string>Marks all messages in all items read. This does not take message filters into account.</string>
@@ -443,7 +449,7 @@
   </action>
   <action name="m_actionClearAllItems">
    <property name="text">
-    <string>&amp;Clean all items</string>
+    <string>&amp;Clean all</string>
    </property>
    <property name="toolTip">
     <string>Deletes all messages from all items.</string>
@@ -590,7 +596,7 @@
   </action>
   <action name="m_actionSwitchMessageListOrientation">
    <property name="text">
-    <string>Switch layout orientation</string>
+    <string>Switch layout</string>
    </property>
    <property name="shortcut">
     <string notr="true"/>
@@ -652,7 +658,7 @@
   </action>
   <action name="m_actionRestoreSelectedMessages">
    <property name="text">
-    <string>&amp;Restore selected articles</string>
+    <string>&amp;Restore articles</string>
    </property>
    <property name="shortcut">
     <string notr="true"/>
@@ -724,7 +730,7 @@
   </action>
   <action name="m_actionStopRunningItemsUpdate">
    <property name="text">
-    <string>Stop ongoing fetching of feeds</string>
+    <string>Stop ongoing fetching</string>
    </property>
    <property name="shortcut">
     <string notr="true"/>
diff --git a/src/librssguard/gui/dialogs/formmessagefiltersmanager.ui b/src/librssguard/gui/dialogs/formmessagefiltersmanager.ui
index 8125bb234..bc7b946ca 100644
--- a/src/librssguard/gui/dialogs/formmessagefiltersmanager.ui
+++ b/src/librssguard/gui/dialogs/formmessagefiltersmanager.ui
@@ -225,11 +225,11 @@
        </sizepolicy>
       </property>
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="m_tabExistingMessages">
        <attribute name="title">
-        <string>Existing messages</string>
+        <string>Existing articles</string>
        </attribute>
        <layout class="QHBoxLayout" name="horizontalLayout_7">
         <property name="leftMargin">
@@ -261,7 +261,7 @@
       </widget>
       <widget class="QWidget" name="m_tabSampleMessage">
        <attribute name="title">
-        <string>Sample message</string>
+        <string>Sample article</string>
        </attribute>
        <layout class="QFormLayout" name="formLayout_2">
         <property name="leftMargin">
diff --git a/src/librssguard/gui/dialogs/formsettings.ui b/src/librssguard/gui/dialogs/formsettings.ui
index 011fa0649..9616b9431 100644
--- a/src/librssguard/gui/dialogs/formsettings.ui
+++ b/src/librssguard/gui/dialogs/formsettings.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1030</width>
-    <height>700</height>
+    <width>1000</width>
+    <height>680</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/librssguard/gui/dialogs/formupdate.ui b/src/librssguard/gui/dialogs/formupdate.ui
index ddc829fd6..112d50c45 100644
--- a/src/librssguard/gui/dialogs/formupdate.ui
+++ b/src/librssguard/gui/dialogs/formupdate.ui
@@ -6,146 +6,149 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>607</width>
-    <height>326</height>
+    <width>549</width>
+    <height>324</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Check for updates</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Current release</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="m_lblCurrentRelease">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Available release</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLabel" name="m_lblAvailableRelease">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Status</string>
-       </property>
-       <property name="buddy">
-        <cstring>m_lblStatus</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="LabelWithStatus" name="m_lblStatus" native="true">
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QTabWidget" name="m_tabInfo">
-       <property name="currentIndex">
+  <layout class="QFormLayout" name="formLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Current release</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="m_lblCurrentRelease">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Available release</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLabel" name="m_lblAvailableRelease">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Status</string>
+     </property>
+     <property name="buddy">
+      <cstring>m_lblStatus</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="LabelWithStatus" name="m_lblStatus" native="true">
+     <property name="layoutDirection">
+      <enum>Qt::RightToLeft</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QTabWidget" name="m_tabInfo">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tabChanges">
+      <attribute name="title">
+       <string>Changelog</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="leftMargin">
         <number>0</number>
        </property>
-       <widget class="QWidget" name="tabChanges">
-        <attribute name="title">
-         <string>Changelog</string>
-        </attribute>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="leftMargin">
-          <number>0</number>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QTextEdit" name="m_txtChanges">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
          </property>
-         <property name="topMargin">
-          <number>0</number>
+         <property name="font">
+          <font>
+           <family>DejaVu Sans Mono</family>
+          </font>
          </property>
-         <property name="rightMargin">
-          <number>0</number>
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
          </property>
-         <property name="bottomMargin">
-          <number>0</number>
+         <property name="undoRedoEnabled">
+          <bool>false</bool>
          </property>
-         <item>
-          <widget class="QTextEdit" name="m_txtChanges">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>1</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="font">
-            <font>
-             <family>DejaVu Sans Mono</family>
-            </font>
-           </property>
-           <property name="undoRedoEnabled">
-            <bool>false</bool>
-           </property>
-           <property name="lineWrapMode">
-            <enum>QTextEdit::WidgetWidth</enum>
-           </property>
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-           <property name="html">
-            <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+         <property name="lineWrapMode">
+          <enum>QTextEdit::WidgetWidth</enum>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+         <property name="html">
+          <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="tabFiles">
-        <attribute name="title">
-         <string>Available files</string>
-        </attribute>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <property name="leftMargin">
-          <number>0</number>
          </property>
-         <property name="topMargin">
-          <number>0</number>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
          </property>
-         <property name="rightMargin">
-          <number>0</number>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tabFiles">
+      <attribute name="title">
+       <string>Available files</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <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>
+        <widget class="QListWidget" name="m_listFiles">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
          </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QListWidget" name="m_listFiles"/>
-         </item>
-        </layout>
-       </widget>
-      </widget>
-     </item>
-    </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
    </item>
-   <item>
+   <item row="4" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="m_buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
diff --git a/src/librssguard/gui/reusable/networkproxydetails.ui b/src/librssguard/gui/reusable/networkproxydetails.ui
index 5a8894490..1974c1084 100755
--- a/src/librssguard/gui/reusable/networkproxydetails.ui
+++ b/src/librssguard/gui/reusable/networkproxydetails.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>507</width>
-    <height>257</height>
+    <height>325</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -142,19 +142,6 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2">
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/librssguard/gui/settings/settingsbrowsermail.ui b/src/librssguard/gui/settings/settingsbrowsermail.ui
index 6d632b4e3..1946a7470 100644
--- a/src/librssguard/gui/settings/settingsbrowsermail.ui
+++ b/src/librssguard/gui/settings/settingsbrowsermail.ui
@@ -32,8 +32,15 @@
       <attribute name="title">
        <string>External web browser</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout_17">
-       <item row="1" column="0" colspan="2">
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="m_checkOpenLinksInExternal">
+         <property name="text">
+          <string>Always open links from simple internal text browser in external web browser</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="2">
         <widget class="QGroupBox" name="m_grpCustomExternalBrowser">
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -128,12 +135,18 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QCheckBox" name="m_checkOpenLinksInExternal">
-         <property name="text">
-          <string>Always open links from simple internal text browser in external web browser</string>
+       <item row="2" column="0" colspan="2">
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-        </widget>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
        </item>
       </layout>
      </widget>
diff --git a/src/librssguard/gui/settings/settingsdatabase.ui b/src/librssguard/gui/settings/settingsdatabase.ui
index 33b7179b5..aea3c9b31 100644
--- a/src/librssguard/gui/settings/settingsdatabase.ui
+++ b/src/librssguard/gui/settings/settingsdatabase.ui
@@ -23,7 +23,7 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="1" column="0" colspan="2">
+   <item row="0" column="0" colspan="2">
     <widget class="QCheckBox" name="m_checkUseTransactions">
      <property name="toolTip">
       <string>Note that turning this option ON will make saving of new messages FASTER, but it might rarely cause some issues with messages saving.</string>
@@ -33,7 +33,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="m_lblDataStorageWarning">
      <property name="styleSheet">
       <string notr="true">QLabel {
@@ -51,7 +51,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="2" column="0">
     <widget class="QLabel" name="m_lblDatabaseDriver">
      <property name="text">
       <string>Database driver</string>
@@ -61,10 +61,10 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="2" column="1">
     <widget class="QComboBox" name="m_cmbDatabaseDriver"/>
    </item>
-   <item row="5" column="0" colspan="2">
+   <item row="3" column="0" colspan="2">
     <widget class="QStackedWidget" name="m_stackedDatabaseDriver">
      <property name="currentIndex">
       <number>1</number>
@@ -138,6 +138,16 @@ Authors of this application are NOT responsible for lost data.</string>
        <property name="bottomMargin">
         <number>0</number>
        </property>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Hostname</string>
+         </property>
+         <property name="buddy">
+          <cstring>m_txtMysqlHostname</cstring>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="1">
         <layout class="QHBoxLayout" name="horizontalLayout_6">
          <item>
@@ -174,9 +184,26 @@ Authors of this application are NOT responsible for lost data.</string>
          </item>
         </layout>
        </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Working database</string>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="1">
         <widget class="LineEditWithStatus" name="m_txtMysqlDatabase" native="true"/>
        </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Username</string>
+         </property>
+         <property name="buddy">
+          <cstring>m_txtMysqlUsername</cstring>
+         </property>
+        </widget>
+       </item>
        <item row="2" column="1">
         <widget class="LineEditWithStatus" name="m_txtMysqlUsername" native="true"/>
        </item>
@@ -243,48 +270,30 @@ Authors of this application are NOT responsible for lost data.</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_4">
-         <property name="text">
-          <string>Username</string>
-         </property>
-         <property name="buddy">
-          <cstring>m_txtMysqlUsername</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_11">
-         <property name="text">
-          <string>Working database</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Hostname</string>
-         </property>
-         <property name="buddy">
-          <cstring>m_txtMysqlHostname</cstring>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
     </widget>
    </item>
+   <item row="4" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
   <zorder>m_lblDatabaseDriver</zorder>
   <zorder>m_cmbDatabaseDriver</zorder>
   <zorder>m_stackedDatabaseDriver</zorder>
   <zorder>m_checkUseTransactions</zorder>
   <zorder>m_lblDataStorageWarning</zorder>
-  <zorder>label_2</zorder>
-  <zorder>label_11</zorder>
-  <zorder>label_4</zorder>
-  <zorder>label_5</zorder>
-  <zorder>m_lblMysqlInfo</zorder>
+  <zorder>verticalSpacer</zorder>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/librssguard/gui/settings/settingsdownloads.ui b/src/librssguard/gui/settings/settingsdownloads.ui
index 6f92b3301..06ed812ea 100644
--- a/src/librssguard/gui/settings/settingsdownloads.ui
+++ b/src/librssguard/gui/settings/settingsdownloads.ui
@@ -74,6 +74,19 @@
         </item>
        </layout>
       </item>
+      <item row="2" column="0" colspan="2">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.h b/src/librssguard/gui/settings/settingsfeedsmessages.h
index 14efe58de..5ea206c3d 100644
--- a/src/librssguard/gui/settings/settingsfeedsmessages.h
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.h
@@ -28,7 +28,7 @@ class SettingsFeedsMessages : public SettingsPanel {
 };
 
 inline QString SettingsFeedsMessages::title() const {
-  return tr("Feeds & messages");
+  return tr("Feeds & articles");
 }
 
 #endif // SETTINGSFEEDSMESSAGES_H
diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui
index 8eaa2c981..de142f710 100644
--- a/src/librssguard/gui/settings/settingsfeedsmessages.ui
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>788</width>
-    <height>497</height>
+    <height>433</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
@@ -30,53 +30,62 @@
      </property>
      <widget class="QWidget" name="m_tabFeeds">
       <attribute name="title">
-       <string>Feeds &amp;&amp; categories</string>
+       <string>Feeds</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout_2">
        <item row="0" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
-           <property name="text">
-            <string>Download messages for all feeds on application startup with initial delay of</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="TimeSpinBox" name="m_spinStartupUpdateDelay">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>250</width>
-             <height>28</height>
-            </size>
-           </property>
-           <property name="readOnly">
-            <bool>false</bool>
-           </property>
-           <property name="accelerated">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
+         <property name="text">
+          <string>Download messages for all feeds on application startup with initial delay of</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="TimeSpinBox" name="m_spinStartupUpdateDelay">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="readOnly">
+          <bool>false</bool>
+         </property>
+         <property name="accelerated">
+          <bool>true</bool>
+         </property>
+        </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QCheckBox" name="m_checkAutoUpdateNotification">
+        <widget class="QCheckBox" name="m_checkAutoUpdate">
          <property name="text">
-          <string>Enable &quot;auto-download started&quot; notification</string>
+          <string>Auto-download messages for all feeds every</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="TimeSpinBox" name="m_spinAutoUpdateInterval">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="readOnly">
+          <bool>false</bool>
+         </property>
+         <property name="accelerated">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QGroupBox" name="groupBox_6">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="title">
           <string>Feed list font</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_18">
-          <item>
+         <layout class="QFormLayout" name="formLayout_3">
+          <item row="0" column="0">
            <widget class="QLabel" name="m_lblFeedListFont">
             <property name="text">
              <string>Font preview</string>
@@ -86,7 +95,7 @@
             </property>
            </widget>
           </item>
-          <item>
+          <item row="0" column="1">
            <widget class="QPushButton" name="m_btnChangeFeedListFont">
             <property name="text">
              <string>&amp;Change font</string>
@@ -96,118 +105,66 @@
          </layout>
         </widget>
        </item>
-       <item row="5" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_7">
-         <item>
-          <widget class="QLabel" name="label_3">
-           <property name="text">
-            <string>Feed connection timeout</string>
-           </property>
-           <property name="buddy">
-            <cstring>m_spinFeedUpdateTimeout</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="m_spinFeedUpdateTimeout">
-           <property name="toolTip">
-            <string>Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted.</string>
-           </property>
-           <property name="suffix">
-            <string> ms</string>
-           </property>
-           <property name="minimum">
-            <number>100</number>
-           </property>
-           <property name="maximum">
-            <number>120000</number>
-           </property>
-           <property name="singleStep">
-            <number>100</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="m_spinFeedUpdateTimeout">
+         <property name="toolTip">
+          <string>Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted.</string>
+         </property>
+         <property name="suffix">
+          <string> ms</string>
+         </property>
+         <property name="minimum">
+          <number>100</number>
+         </property>
+         <property name="maximum">
+          <number>120000</number>
+         </property>
+         <property name="singleStep">
+          <number>100</number>
+         </property>
+        </widget>
        </item>
        <item row="6" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_9">
-         <item>
-          <widget class="QLabel" name="label_6">
-           <property name="text">
-            <string>Height or rows in feed list (-1 = default height)</string>
-           </property>
-           <property name="buddy">
-            <cstring>m_spinHeightRowsFeeds</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="m_spinHeightRowsFeeds">
-           <property name="minimum">
-            <number>-1</number>
-           </property>
-           <property name="maximum">
-            <number>100</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Height or rows in feed list (-1 = default height)</string>
+         </property>
+         <property name="buddy">
+          <cstring>m_spinHeightRowsFeeds</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QSpinBox" name="m_spinHeightRowsFeeds">
+         <property name="minimum">
+          <number>-1</number>
+         </property>
+         <property name="maximum">
+          <number>100</number>
+         </property>
+        </widget>
        </item>
        <item row="7" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <item>
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string>Message count format in feed list</string>
-           </property>
-           <property name="buddy">
-            <cstring>m_cmbCountsFeedList</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="m_cmbCountsFeedList">
-           <property name="toolTip">
-            <string notr="true"/>
-           </property>
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Message count format in feed list</string>
+         </property>
+         <property name="buddy">
+          <cstring>m_cmbCountsFeedList</cstring>
+         </property>
+        </widget>
        </item>
-       <item row="2" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
-         <item>
-          <widget class="QCheckBox" name="m_checkAutoUpdate">
-           <property name="text">
-            <string>Auto-download messages for all feeds every</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="TimeSpinBox" name="m_spinAutoUpdateInterval">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>250</width>
-             <height>28</height>
-            </size>
-           </property>
-           <property name="readOnly">
-            <bool>false</bool>
-           </property>
-           <property name="accelerated">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
+       <item row="7" column="1">
+        <widget class="QComboBox" name="m_cmbCountsFeedList">
+         <property name="toolTip">
+          <string notr="true"/>
+         </property>
+         <property name="editable">
+          <bool>true</bool>
+         </property>
+        </widget>
        </item>
-       <item row="10" column="0" colspan="2">
+       <item row="8" column="0" colspan="2">
         <widget class="QLabel" name="label_9">
          <property name="font">
           <font>
@@ -238,13 +195,30 @@
          </property>
         </spacer>
        </item>
-       <item row="8" column="0" colspan="2">
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Feed connection timeout</string>
+         </property>
+         <property name="buddy">
+          <cstring>m_spinFeedUpdateTimeout</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0" colspan="2">
         <widget class="QCheckBox" name="m_cbHideCountsIfNoUnread">
          <property name="text">
           <string>Hide message counts if there are no unread messages</string>
          </property>
         </widget>
        </item>
+       <item row="10" column="0" colspan="2">
+        <widget class="QCheckBox" name="m_checkShowTooltips">
+         <property name="text">
+          <string>Display tooltips for feeds and messages</string>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="0" colspan="2">
         <widget class="QCheckBox" name="m_checkAutoUpdateOnlyUnfocused">
          <property name="text">
@@ -252,10 +226,10 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="2">
-        <widget class="QCheckBox" name="m_checkShowTooltips">
+       <item row="2" column="0" colspan="2">
+        <widget class="QCheckBox" name="m_checkAutoUpdateNotification">
          <property name="text">
-          <string>Display tooltips for feeds and messages</string>
+          <string>Enable &quot;auto-download started&quot; notification</string>
          </property>
         </widget>
        </item>
@@ -263,111 +237,90 @@
      </widget>
      <widget class="QWidget" name="m_tabMessages">
       <attribute name="title">
-       <string>Messages</string>
+       <string>Articles</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0">
+       <item row="0" column="0" colspan="2">
         <widget class="QCheckBox" name="m_checkRemoveReadMessagesOnExit">
          <property name="text">
-          <string>Remove all read messages from all feeds on application exit</string>
+          <string>Remove all read articles from all feeds on application exit</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item row="1" column="0" colspan="2">
         <widget class="QCheckBox" name="m_checkDisplayPlaceholders">
          <property name="text">
           <string>Display placeholders to indicate locations of pictures</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="m_checkBringToForegroundAfterMsgOpened">
+       <item row="2" column="0" colspan="2">
+        <widget class="QCheckBox" name="m_checkDisplayFeedIcons">
          <property name="text">
-          <string>Bring application window to front once message is opened in external web browser</string>
+          <string>Display real icons of feeds in list of articles instead of read/unread icons</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="3" column="0" colspan="2">
+        <widget class="QCheckBox" name="m_checkBringToForegroundAfterMsgOpened">
+         <property name="text">
+          <string>Bring application window to front once article is opened in external web browser</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="2">
         <widget class="QCheckBox" name="m_checkKeppMessagesInTheMiddle">
          <property name="text">
-          <string>Keep message selection in the middle of the message list viewport</string>
+          <string>Keep message selection in the middle of the article list viewport</string>
          </property>
         </widget>
        </item>
        <item row="5" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Height or rows in message list (-1 = default height)</string>
-           </property>
-           <property name="buddy">
-            <cstring>m_spinHeightRowsMessages</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="m_spinHeightRowsMessages">
-           <property name="minimum">
-            <number>-1</number>
-           </property>
-           <property name="maximum">
-            <number>100</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Height or rows in article list (-1 = default height)</string>
+         </property>
+         <property name="buddy">
+          <cstring>m_spinHeightRowsMessages</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="m_spinHeightRowsMessages">
+         <property name="minimum">
+          <number>-1</number>
+         </property>
+         <property name="maximum">
+          <number>100</number>
+         </property>
+        </widget>
        </item>
        <item row="6" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Height of image attachments</string>
-           </property>
-           <property name="buddy">
-            <cstring>m_spinHeightImageAttachments</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="m_spinHeightImageAttachments">
-           <property name="minimum">
-            <number>22</number>
-           </property>
-           <property name="maximum">
-            <number>1000</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Height of image attachments</string>
+         </property>
+         <property name="buddy">
+          <cstring>m_spinHeightImageAttachments</cstring>
+         </property>
+        </widget>
        </item>
-       <item row="7" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_10">
-         <item>
-          <widget class="QCheckBox" name="m_checkMessagesDateTimeFormat">
-           <property name="text">
-            <string>Use custom date/time format (overrides format loaded from active localization)</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="m_cmbMessagesDateTimeFormat"/>
-         </item>
-        </layout>
+       <item row="6" column="1">
+        <widget class="QSpinBox" name="m_spinHeightImageAttachments">
+         <property name="minimum">
+          <number>22</number>
+         </property>
+         <property name="maximum">
+          <number>1000</number>
+         </property>
+        </widget>
        </item>
-       <item row="8" column="0">
+       <item row="8" column="0" colspan="2">
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QGroupBox" name="groupBox_5">
            <property name="title">
-            <string>Message list font</string>
+            <string>Article list font</string>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_17">
             <item>
@@ -393,7 +346,7 @@
          <item>
           <widget class="QGroupBox" name="groupBox_4">
            <property name="title">
-            <string>Internal message browser font</string>
+            <string>Article browser font</string>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_16">
             <item>
@@ -416,9 +369,38 @@
            </layout>
           </widget>
          </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </item>
-       <item row="9" column="0" colspan="2">
+       <item row="7" column="0">
+        <widget class="QCheckBox" name="m_checkMessagesDateTimeFormat">
+         <property name="text">
+          <string>Use custom date/time format (overrides format loaded from active localization)</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <widget class="QComboBox" name="m_cmbMessagesDateTimeFormat"/>
+       </item>
+       <item row="10" column="0" colspan="2">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -431,13 +413,6 @@
          </property>
         </spacer>
        </item>
-       <item row="2" column="0">
-        <widget class="QCheckBox" name="m_checkDisplayFeedIcons">
-         <property name="text">
-          <string>Display real icons of feeds in list of messages instead of read/unread icons</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
     </widget>
@@ -455,9 +430,9 @@
   <tabstop>m_tabFeedsMessages</tabstop>
   <tabstop>m_checkUpdateAllFeedsOnStartup</tabstop>
   <tabstop>m_spinStartupUpdateDelay</tabstop>
-  <tabstop>m_checkAutoUpdateNotification</tabstop>
   <tabstop>m_checkAutoUpdate</tabstop>
   <tabstop>m_spinAutoUpdateInterval</tabstop>
+  <tabstop>m_checkAutoUpdateNotification</tabstop>
   <tabstop>m_checkAutoUpdateOnlyUnfocused</tabstop>
   <tabstop>m_btnChangeFeedListFont</tabstop>
   <tabstop>m_spinFeedUpdateTimeout</tabstop>
diff --git a/src/librssguard/gui/settings/settingsgeneral.ui b/src/librssguard/gui/settings/settingsgeneral.ui
index 70aa6b17c..c355e91e1 100644
--- a/src/librssguard/gui/settings/settingsgeneral.ui
+++ b/src/librssguard/gui/settings/settingsgeneral.ui
@@ -44,6 +44,19 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/librssguard/gui/settings/settingsgui.ui b/src/librssguard/gui/settings/settingsgui.ui
index 8cfd083ba..e8cf48268 100644
--- a/src/librssguard/gui/settings/settingsgui.ui
+++ b/src/librssguard/gui/settings/settingsgui.ui
@@ -119,7 +119,7 @@
        <string>Tray area &amp;&amp; notifications</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout_3">
-       <item row="2" column="0" colspan="2">
+       <item row="0" column="0">
         <widget class="QGroupBox" name="m_grpTray">
          <property name="title">
           <string>Tray icon</string>
@@ -169,53 +169,82 @@
          </layout>
         </widget>
        </item>
+       <item row="1" column="0" colspan="2">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="m_tabTabs">
       <attribute name="title">
        <string>Tabs</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout_7">
-       <property name="fieldGrowthPolicy">
-        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-       </property>
-       <item row="1" column="0" colspan="2">
-        <widget class="QCheckBox" name="m_checkNewTabDoubleClick">
-         <property name="text">
-          <string>Open new tabs with left mouse button double-click on tab bar</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="2">
-        <widget class="QCheckBox" name="m_checkHideTabBarIfOneTabVisible">
-         <property name="text">
-          <string>Hide tab bar if just one tab is visible</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" colspan="2">
+      <layout class="QFormLayout" name="formLayout_4">
+       <item row="0" column="0">
         <widget class="QGroupBox" name="m_grbCloseTabs">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="title">
           <string>Close tabs with</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_13">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="m_checkCloseTabsDoubleClick">
-            <property name="text">
-             <string>Left mouse button double-click</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
            <widget class="QCheckBox" name="m_checkCloseTabsMiddleClick">
             <property name="text">
              <string>Middle mouse button single-click</string>
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="m_checkCloseTabsDoubleClick">
+            <property name="text">
+             <string>Left mouse button double-click</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="m_checkNewTabDoubleClick">
+         <property name="text">
+          <string>Open new tabs with left mouse button double-click on tab bar</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QCheckBox" name="m_checkHideTabBarIfOneTabVisible">
+         <property name="text">
+          <string>Hide tab bar if just one tab is visible</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="2">
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="m_tabToolBars">
diff --git a/src/librssguard/services/abstract/gui/formcategorydetails.ui b/src/librssguard/services/abstract/gui/formcategorydetails.ui
index 0794531e8..cf99b996c 100644
--- a/src/librssguard/services/abstract/gui/formcategorydetails.ui
+++ b/src/librssguard/services/abstract/gui/formcategorydetails.ui
@@ -28,7 +28,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="m_lblParentCategory">
        <property name="text">
-        <string>Parent category</string>
+        <string>Parent folder</string>
        </property>
        <property name="buddy">
         <cstring>m_cmbParentCategory</cstring>
diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.ui b/src/librssguard/services/abstract/gui/formfeeddetails.ui
index 04b215008..f1b669854 100644
--- a/src/librssguard/services/abstract/gui/formfeeddetails.ui
+++ b/src/librssguard/services/abstract/gui/formfeeddetails.ui
@@ -21,13 +21,13 @@
      </property>
      <widget class="QWidget" name="tabUpdating">
       <attribute name="title">
-       <string>Auto-downloading of messages</string>
+       <string>Auto-downloading of articles</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
-          <string>Auto-downloading of messages</string>
+          <string>Auto-downloading of articles</string>
          </property>
          <property name="buddy">
           <cstring>m_cmbAutoUpdateType</cstring>
diff --git a/src/librssguard/services/abstract/importantnode.cpp b/src/librssguard/services/abstract/importantnode.cpp
index a5952d4a0..bddb5d3a3 100755
--- a/src/librssguard/services/abstract/importantnode.cpp
+++ b/src/librssguard/services/abstract/importantnode.cpp
@@ -14,8 +14,8 @@ ImportantNode::ImportantNode(RootItem* parent_item) : RootItem(parent_item) {
   setKind(RootItem::Kind::Important);
   setId(ID_IMPORTANT);
   setIcon(qApp->icons()->fromTheme(QSL("mail-mark-important")));
-  setTitle(tr("Important messages"));
-  setDescription(tr("You can find all important messages here."));
+  setTitle(tr("Important articles"));
+  setDescription(tr("You can find all important articles here."));
 }
 
 QList<Message> ImportantNode::undeletedMessages() const {
diff --git a/src/librssguard/services/abstract/unreadnode.cpp b/src/librssguard/services/abstract/unreadnode.cpp
index 1e75d419d..92ec3616f 100755
--- a/src/librssguard/services/abstract/unreadnode.cpp
+++ b/src/librssguard/services/abstract/unreadnode.cpp
@@ -12,8 +12,8 @@ UnreadNode::UnreadNode(RootItem* parent_item) : RootItem(parent_item) {
   setKind(RootItem::Kind::Unread);
   setId(ID_UNREAD);
   setIcon(qApp->icons()->fromTheme(QSL("mail-mark-unread")));
-  setTitle(tr("Unread messages"));
-  setDescription(tr("You can find all unread messages here."));
+  setTitle(tr("Unread articles"));
+  setDescription(tr("You can find all unread articles here."));
 }
 
 QList<Message> UnreadNode::undeletedMessages() const {
diff --git a/src/librssguard/services/feedly/gui/feedlyaccountdetails.ui b/src/librssguard/services/feedly/gui/feedlyaccountdetails.ui
index 50290d681..225ff4dd3 100755
--- a/src/librssguard/services/feedly/gui/feedlyaccountdetails.ui
+++ b/src/librssguard/services/feedly/gui/feedlyaccountdetails.ui
@@ -57,7 +57,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Only download newest X messages per feed</string>
+        <string>Only download newest X articles per feed</string>
        </property>
        <property name="buddy">
         <cstring>m_spinLimitMessages</cstring>
@@ -110,15 +110,12 @@
    <item row="3" column="0" colspan="2">
     <widget class="QCheckBox" name="m_checkDownloadOnlyUnreadMessages">
      <property name="text">
-      <string>Download only unread messages</string>
+      <string>Download unread articles only</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="QLabel" name="m_lblLimitMessagesInfo">
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
@@ -130,18 +127,18 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>LineEditWithStatus</class>
-   <extends>QWidget</extends>
-   <header>lineeditwithstatus.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LabelWithStatus</class>
    <extends>QWidget</extends>
    <header>labelwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LineEditWithStatus</class>
+   <extends>QWidget</extends>
+   <header>lineeditwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>MessageCountSpinBox</class>
    <extends>QSpinBox</extends>
diff --git a/src/librssguard/services/gmail/gui/gmailaccountdetails.ui b/src/librssguard/services/gmail/gui/gmailaccountdetails.ui
index cebbddd10..477427e2b 100644
--- a/src/librssguard/services/gmail/gui/gmailaccountdetails.ui
+++ b/src/librssguard/services/gmail/gui/gmailaccountdetails.ui
@@ -120,7 +120,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Only download newest X messages per feed</string>
+        <string>Only download newest X articles per feed</string>
        </property>
        <property name="buddy">
         <cstring>m_spinLimitMessages</cstring>
@@ -173,25 +173,25 @@
    <item row="2" column="0" colspan="2">
     <widget class="QCheckBox" name="m_cbDownloadOnlyUnreadMessages">
      <property name="text">
-      <string>Download only unread messages</string>
+      <string>Download unread articles only</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>LineEditWithStatus</class>
-   <extends>QWidget</extends>
-   <header>lineeditwithstatus.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LabelWithStatus</class>
    <extends>QWidget</extends>
    <header>labelwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LineEditWithStatus</class>
+   <extends>QWidget</extends>
+   <header>lineeditwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>MessageCountSpinBox</class>
    <extends>QSpinBox</extends>
diff --git a/src/librssguard/services/greader/gui/greaderaccountdetails.ui b/src/librssguard/services/greader/gui/greaderaccountdetails.ui
index 8cf1b842c..6232c3c96 100755
--- a/src/librssguard/services/greader/gui/greaderaccountdetails.ui
+++ b/src/librssguard/services/greader/gui/greaderaccountdetails.ui
@@ -39,7 +39,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Only download newest X messages per feed</string>
+        <string>Only download newest X articles per feed</string>
        </property>
        <property name="buddy">
         <cstring>m_spinLimitMessages</cstring>
@@ -152,25 +152,25 @@
    <item row="4" column="0" colspan="2">
     <widget class="QCheckBox" name="m_cbDownloadOnlyUnreadMessages">
      <property name="text">
-      <string>Download only unread messages</string>
+      <string>Download unread articles only</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>LineEditWithStatus</class>
-   <extends>QWidget</extends>
-   <header>lineeditwithstatus.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LabelWithStatus</class>
    <extends>QWidget</extends>
    <header>labelwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LineEditWithStatus</class>
+   <extends>QWidget</extends>
+   <header>lineeditwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>MessageCountSpinBox</class>
    <extends>QSpinBox</extends>
diff --git a/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.ui b/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.ui
index e43edcc20..906f95eda 100755
--- a/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.ui
+++ b/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.ui
@@ -120,7 +120,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Only download newest X messages per feed</string>
+        <string>Only download newest X articles per feed</string>
        </property>
        <property name="buddy">
         <cstring>m_spinLimitMessages</cstring>
@@ -186,25 +186,25 @@
    <item row="2" column="0" colspan="2">
     <widget class="QCheckBox" name="m_cbDownloadOnlyUnreadMessages">
      <property name="text">
-      <string>Download only unread messages</string>
+      <string>Download unread articles only</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>LineEditWithStatus</class>
-   <extends>QWidget</extends>
-   <header>lineeditwithstatus.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LabelWithStatus</class>
    <extends>QWidget</extends>
    <header>labelwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LineEditWithStatus</class>
+   <extends>QWidget</extends>
+   <header>lineeditwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>MessageCountSpinBox</class>
    <extends>QSpinBox</extends>
diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui
index 48ce29bee..9511f66c1 100755
--- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui
+++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui
@@ -31,7 +31,7 @@
    <item row="1" column="0" colspan="2">
     <widget class="QCheckBox" name="m_checkDownloadOnlyUnreadMessages">
      <property name="text">
-      <string>Download only unread messages</string>
+      <string>Download unread articles only</string>
      </property>
     </widget>
    </item>
@@ -40,7 +40,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Only download newest X messages per feed</string>
+        <string>Only download newest X articles per feed</string>
        </property>
        <property name="buddy">
         <cstring>m_spinLimitMessages</cstring>
@@ -180,18 +180,18 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>LineEditWithStatus</class>
-   <extends>QWidget</extends>
-   <header>lineeditwithstatus.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LabelWithStatus</class>
    <extends>QWidget</extends>
    <header>labelwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LineEditWithStatus</class>
+   <extends>QWidget</extends>
+   <header>lineeditwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>MessageCountSpinBox</class>
    <extends>QSpinBox</extends>
diff --git a/src/librssguard/services/standard/gui/formstandardimportexport.ui b/src/librssguard/services/standard/gui/formstandardimportexport.ui
index dd5314696..720ec2b94 100644
--- a/src/librssguard/services/standard/gui/formstandardimportexport.ui
+++ b/src/librssguard/services/standard/gui/formstandardimportexport.ui
@@ -100,14 +100,14 @@
       <item row="1" column="1">
        <widget class="QPushButton" name="m_btnCheckAllItems">
         <property name="text">
-         <string>&amp;Check all items</string>
+         <string>&amp;Check all feeds</string>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="QPushButton" name="m_btnUncheckAllItems">
         <property name="text">
-         <string>&amp;Uncheck all items</string>
+         <string>&amp;Uncheck all feeds</string>
         </property>
        </widget>
       </item>
@@ -158,7 +158,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Operation results</string>
+      <string>Operation result</string>
      </property>
      <layout class="QFormLayout" name="formLayout_2">
       <property name="leftMargin">
diff --git a/src/librssguard/services/standard/gui/standardfeeddetails.ui b/src/librssguard/services/standard/gui/standardfeeddetails.ui
index 486192617..112b4219c 100755
--- a/src/librssguard/services/standard/gui/standardfeeddetails.ui
+++ b/src/librssguard/services/standard/gui/standardfeeddetails.ui
@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="m_lblParentCategory">
      <property name="text">
-      <string>Parent category</string>
+      <string>Parent folder</string>
      </property>
      <property name="buddy">
       <cstring>m_cmbParentCategory</cstring>
diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui
index 3868546ea..a0ce21e6d 100644
--- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui
+++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui
@@ -44,7 +44,7 @@
    <item row="1" column="0" colspan="2">
     <widget class="QCheckBox" name="m_checkDownloadOnlyUnreadMessages">
      <property name="text">
-      <string>Download only unread messages</string>
+      <string>Download unread articles only</string>
      </property>
     </widget>
    </item>
@@ -53,7 +53,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Only download newest X messages per feed</string>
+        <string>Only download newest X articles per feed</string>
        </property>
        <property name="buddy">
         <cstring>m_spinLimitMessages</cstring>
@@ -234,18 +234,18 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>LineEditWithStatus</class>
-   <extends>QWidget</extends>
-   <header>lineeditwithstatus.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LabelWithStatus</class>
    <extends>QWidget</extends>
    <header>labelwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LineEditWithStatus</class>
+   <extends>QWidget</extends>
+   <header>lineeditwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>MessageCountSpinBox</class>
    <extends>QSpinBox</extends>
diff --git a/src/librssguard/services/tt-rss/gui/ttrssfeeddetails.ui b/src/librssguard/services/tt-rss/gui/ttrssfeeddetails.ui
index 1f318bc5d..6e3c75e55 100755
--- a/src/librssguard/services/tt-rss/gui/ttrssfeeddetails.ui
+++ b/src/librssguard/services/tt-rss/gui/ttrssfeeddetails.ui
@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="m_lblParentCategory">
      <property name="text">
-      <string>Parent category</string>
+      <string>Parent folder</string>
      </property>
      <property name="buddy">
       <cstring>m_cmbParentCategory</cstring>