diff --git a/src/librssguard/gui/messagepreviewer.cpp b/src/librssguard/gui/messagepreviewer.cpp
index 714497ce7..c8f5bca6a 100644
--- a/src/librssguard/gui/messagepreviewer.cpp
+++ b/src/librssguard/gui/messagepreviewer.cpp
@@ -107,10 +107,9 @@ void MessagePreviewer::hideToolbar() {
   m_toolBar->setVisible(false);
 }
 
-void MessagePreviewer::loadUrl(const QString &url) {
+void MessagePreviewer::loadUrl(const QString& url) {
 #if defined(USE_WEBENGINE)
   m_txtMessage->loadUrl(url);
-
 #else
   m_txtMessage->loadUrl(url);
 #endif
@@ -255,7 +254,9 @@ void MessagePreviewer::updateLabels(bool only_clear) {
       btn_label->setIcon(Label::generateIcon(label->color()));
       btn_label->setAutoRaise(false);
       btn_label->setText(QSL(" ") + label->title());
-      btn_label->setToolButtonStyle(Qt::ToolButtonStyle::ToolButtonTextBesideIcon);
+      btn_label->setToolButtonStyle(Qt::ToolButtonStyle(qApp->settings()->value(GROUP(GUI),
+                                                                                SETTING(GUI::ToolbarStyle)).toInt()));
+      btn_label->setToolTip(label->title());
       btn_label->setChecked(DatabaseQueries::isLabelAssignedToMessage(database, label, m_message));
 
       QAction* act_label = m_toolBar->addWidget(btn_label);
diff --git a/src/librssguard/gui/settings/settingsnodejs.ui b/src/librssguard/gui/settings/settingsnodejs.ui
index d2f8e25e8..52c0cd0d1 100644
--- a/src/librssguard/gui/settings/settingsnodejs.ui
+++ b/src/librssguard/gui/settings/settingsnodejs.ui
@@ -41,7 +41,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>&amp;Browse...</string>
+        <string>&amp;Browse</string>
        </property>
       </widget>
      </item>
@@ -71,7 +71,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>&amp;Browse...</string>
+        <string>&amp;Browse</string>
        </property>
       </widget>
      </item>
@@ -101,7 +101,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>&amp;Browse...</string>
+        <string>&amp;Browse</string>
        </property>
       </widget>
      </item>
diff --git a/src/librssguard/services/tt-rss/gui/formttrssnote.ui b/src/librssguard/services/tt-rss/gui/formttrssnote.ui
index 91a453834..e84325232 100644
--- a/src/librssguard/services/tt-rss/gui/formttrssnote.ui
+++ b/src/librssguard/services/tt-rss/gui/formttrssnote.ui
@@ -10,9 +10,6 @@
     <height>340</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label">