diff --git a/src/librssguard/gui/dialogs/formsettings.cpp b/src/librssguard/gui/dialogs/formsettings.cpp
index 2685b5f01..5b55fc713 100644
--- a/src/librssguard/gui/dialogs/formsettings.cpp
+++ b/src/librssguard/gui/dialogs/formsettings.cpp
@@ -19,6 +19,9 @@
 #include "gui/settings/settingsnotifications.h"
 #include "gui/settings/settingsshortcuts.h"
 
+#include <QPainter>
+#include <QScrollBar>
+
 FormSettings::FormSettings(QWidget& parent)
   : QDialog(&parent), m_settings(*qApp->settings()) {
   m_ui.setupUi(this);
@@ -131,16 +134,33 @@ void FormSettings::cancelSettings() {
   }
 }
 
+class Scr : public QScrollBar {
+  public:
+    explicit Scr(QWidget* parent) : QScrollBar(parent) {}
+
+  protected:
+    virtual void paintEvent(QPaintEvent* event) {
+      QScrollBar::paintEvent(event);
+
+      QPainter p(this);
+
+      p.setPen(QPen(Qt::GlobalColor::gray, 0.7));
+
+      p.drawRect(rect().marginsRemoved(QMargins(0, 0, 1, 1)));
+    }
+
+};
+
 void FormSettings::addSettingsPanel(SettingsPanel* panel) {
   m_ui.m_listSettings->addItem(panel->title());
   m_panels.append(panel);
 
   QScrollArea* scr = new QScrollArea(m_ui.m_stackedSettings);
 
+  //scr->setHorizontalScrollBar(new Scr(scr));
+  //scr->setVerticalScrollBar(new Scr(scr));
   scr->setWidgetResizable(true);
-  scr->setFrameShape(QFrame::Shape::NoFrame);
-
-  //panel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+  scr->setFrameShape(QFrame::Shape::Box);
   scr->setWidget(panel);
 
   m_ui.m_stackedSettings->addWidget(scr);
diff --git a/src/librssguard/gui/feedmessageviewer.cpp b/src/librssguard/gui/feedmessageviewer.cpp
index 195a75b3c..5c7343fb7 100644
--- a/src/librssguard/gui/feedmessageviewer.cpp
+++ b/src/librssguard/gui/feedmessageviewer.cpp
@@ -50,8 +50,6 @@ FeedMessageViewer::FeedMessageViewer(QWidget* parent) : TabContent(parent), m_to
   m_messagesBrowser(new MessagePreviewer(false, this)) {
   initialize();
   initializeViews();
-
-  //loadMessageViewerFonts();
   createConnections();
 }
 
diff --git a/src/librssguard/gui/messagebrowser.cpp b/src/librssguard/gui/messagebrowser.cpp
index 75ff5b40e..6eb333f4d 100644
--- a/src/librssguard/gui/messagebrowser.cpp
+++ b/src/librssguard/gui/messagebrowser.cpp
@@ -104,10 +104,14 @@ MessageBrowser::MessageBrowser(bool should_resize_to_fit, QWidget* parent)
   reloadFontSettings();
 }
 
-void MessageBrowser::clear() {
+void MessageBrowser::clear(bool also_hide) {
   m_txtBrowser->clear();
   m_pictures.clear();
   m_searchWidget->hide();
+
+  if (also_hide) {
+    hide();
+  }
 }
 
 QString MessageBrowser::prepareHtmlForMessage(const Message& message) {
diff --git a/src/librssguard/gui/messagebrowser.h b/src/librssguard/gui/messagebrowser.h
index 91f328286..38e8ed603 100644
--- a/src/librssguard/gui/messagebrowser.h
+++ b/src/librssguard/gui/messagebrowser.h
@@ -26,7 +26,7 @@ class MessageBrowser : public QWidget {
 
   public slots:
     void setVerticalScrollBarPosition(double pos);
-    void clear();
+    void clear(bool also_hide);
     void reloadFontSettings();
     void loadMessage(const Message& message, RootItem* root);
 
diff --git a/src/librssguard/gui/messagepreviewer.cpp b/src/librssguard/gui/messagepreviewer.cpp
index da33e99ee..30e60982f 100644
--- a/src/librssguard/gui/messagepreviewer.cpp
+++ b/src/librssguard/gui/messagepreviewer.cpp
@@ -70,8 +70,6 @@ MessagePreviewer::MessagePreviewer(bool should_resize_to_fit, QWidget* parent)
 
   createConnections();
   m_actionSwitchImportance->setCheckable(true);
-
-  //reloadFontSettings();
   clear();
 }
 
@@ -99,9 +97,8 @@ WebBrowser* MessagePreviewer::webBrowser() const {
 
 void MessagePreviewer::clear() {
   updateLabels(true);
-  m_txtMessage->clear();
+  m_txtMessage->clear(false);
   hide();
-
   m_root.clear();
   m_message = Message();
 }
diff --git a/src/librssguard/gui/settings/settingsbrowsermail.ui b/src/librssguard/gui/settings/settingsbrowsermail.ui
index f7b08cc53..9c68b56f2 100644
--- a/src/librssguard/gui/settings/settingsbrowsermail.ui
+++ b/src/librssguard/gui/settings/settingsbrowsermail.ui
@@ -11,18 +11,6 @@
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
-   <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="QTabWidget" name="m_tabBrowserProxy">
      <property name="currentIndex">
diff --git a/src/librssguard/gui/settings/settingsdatabase.ui b/src/librssguard/gui/settings/settingsdatabase.ui
index f4aa1e841..8ce64d3af 100644
--- a/src/librssguard/gui/settings/settingsdatabase.ui
+++ b/src/librssguard/gui/settings/settingsdatabase.ui
@@ -11,18 +11,6 @@
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
-   <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 row="0" column="0" colspan="2">
     <widget class="QCheckBox" name="m_checkUseTransactions">
      <property name="toolTip">
diff --git a/src/librssguard/gui/settings/settingsdownloads.ui b/src/librssguard/gui/settings/settingsdownloads.ui
index a4460a073..e5f17212f 100644
--- a/src/librssguard/gui/settings/settingsdownloads.ui
+++ b/src/librssguard/gui/settings/settingsdownloads.ui
@@ -11,18 +11,6 @@
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
-   <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 row="0" column="0">
     <widget class="QCheckBox" name="m_checkOpenManagerWhenDownloadStarts">
      <property name="text">
diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui
index 73343ca1a..3160b80b1 100644
--- a/src/librssguard/gui/settings/settingsfeedsmessages.ui
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui
@@ -11,18 +11,6 @@
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
-   <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="QTabWidget" name="m_tabFeedsMessages">
      <property name="currentIndex">
diff --git a/src/librssguard/gui/settings/settingsgeneral.ui b/src/librssguard/gui/settings/settingsgeneral.ui
index f1ae15204..ee8570772 100644
--- a/src/librssguard/gui/settings/settingsgeneral.ui
+++ b/src/librssguard/gui/settings/settingsgeneral.ui
@@ -10,19 +10,7 @@
     <height>148</height>
    </rect>
   </property>
-  <layout class="QFormLayout" name="formLayout">
-   <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>
+  <layout class="QFormLayout">
    <item row="0" column="0">
     <widget class="QCheckBox" name="m_checkAutostart">
      <property name="text">
diff --git a/src/librssguard/gui/settings/settingsgui.ui b/src/librssguard/gui/settings/settingsgui.ui
index 51285e011..7d6894651 100644
--- a/src/librssguard/gui/settings/settingsgui.ui
+++ b/src/librssguard/gui/settings/settingsgui.ui
@@ -17,18 +17,6 @@
    </sizepolicy>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
-   <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="QTabWidget" name="m_tabUi">
      <property name="currentIndex">
diff --git a/src/librssguard/gui/settings/settingslocalization.ui b/src/librssguard/gui/settings/settingslocalization.ui
index 831ae7df8..0b0517d06 100644
--- a/src/librssguard/gui/settings/settingslocalization.ui
+++ b/src/librssguard/gui/settings/settingslocalization.ui
@@ -11,18 +11,6 @@
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
-   <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="QTreeWidget" name="m_treeLanguages">
      <property name="editTriggers">
diff --git a/src/librssguard/gui/settings/settingsnotifications.ui b/src/librssguard/gui/settings/settingsnotifications.ui
index d5bbdd8f4..62e35b2e6 100644
--- a/src/librssguard/gui/settings/settingsnotifications.ui
+++ b/src/librssguard/gui/settings/settingsnotifications.ui
@@ -11,18 +11,6 @@
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
-   <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 row="1" column="0" colspan="2">
     <widget class="QCheckBox" name="m_checkEnableNotifications">
      <property name="text">
diff --git a/src/librssguard/gui/settings/settingsshortcuts.ui b/src/librssguard/gui/settings/settingsshortcuts.ui
index b4e7001c4..e4b6b4e80 100644
--- a/src/librssguard/gui/settings/settingsshortcuts.ui
+++ b/src/librssguard/gui/settings/settingsshortcuts.ui
@@ -11,18 +11,6 @@
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
-   <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="QScrollArea" name="m_scrollShortcuts">
      <property name="frameShape">
@@ -36,8 +24,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>785</width>
-        <height>526</height>
+        <width>767</width>
+        <height>508</height>
        </rect>
       </property>
       <layout class="QHBoxLayout" name="horizontalLayout_4">
diff --git a/src/librssguard/gui/webbrowser.cpp b/src/librssguard/gui/webbrowser.cpp
index a0ca74bc8..61a61e84b 100644
--- a/src/librssguard/gui/webbrowser.cpp
+++ b/src/librssguard/gui/webbrowser.cpp
@@ -136,10 +136,13 @@ void WebBrowser::resetZoom() {
   m_webView->resetWebPageZoom(true);
 }
 
-void WebBrowser::clear() {
+void WebBrowser::clear(bool also_hide) {
   m_webView->clear();
   m_messages.clear();
-  hide();
+
+  if (also_hide) {
+    hide();
+  }
 }
 
 void WebBrowser::loadUrl(const QString& url) {
diff --git a/src/librssguard/gui/webbrowser.h b/src/librssguard/gui/webbrowser.h
index b496d2965..7855111f7 100644
--- a/src/librssguard/gui/webbrowser.h
+++ b/src/librssguard/gui/webbrowser.h
@@ -44,7 +44,7 @@ class WebBrowser : public TabContent {
     void decreaseZoom();
     void resetZoom();
 
-    void clear();
+    void clear(bool also_hide);
     void loadUrl(const QString& url);
     void loadUrl(const QUrl& url);
     void loadMessages(const QList<Message>& messages, RootItem* root);