diff --git a/src/librssguard/core/feedsproxymodel.cpp b/src/librssguard/core/feedsproxymodel.cpp
index d2a9caae1..61573185c 100644
--- a/src/librssguard/core/feedsproxymodel.cpp
+++ b/src/librssguard/core/feedsproxymodel.cpp
@@ -13,11 +13,18 @@
 FeedsProxyModel::FeedsProxyModel(FeedsModel* source_model, QObject* parent)
   : QSortFilterProxyModel(parent), m_sourceModel(source_model), m_selectedItem(nullptr), m_showUnreadOnly(false) {
   setObjectName(QSL("FeedsProxyModel"));
+
   setSortRole(Qt::ItemDataRole::EditRole);
   setSortCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
+
+#if QT_VERSION >= 0x050A00 // Qt >= 5.10.0
+  setRecursiveFilteringEnabled(true);
+#endif
+
   setFilterCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
   setFilterKeyColumn(-1);
   setFilterRole(Qt::ItemDataRole::EditRole);
+
   setDynamicSortFilter(true);
   setSourceModel(m_sourceModel);
 
diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h
index 0c41fe21f..3fcf4c828 100755
--- a/src/librssguard/definitions/definitions.h
+++ b/src/librssguard/definitions/definitions.h
@@ -77,7 +77,7 @@
 #define HIGHLIGHTER_ACTION_NAME               "highlighter"
 #define SPACER_ACTION_NAME                    "spacer"
 #define SEPARATOR_ACTION_NAME                 "separator"
-#define FILTER_WIDTH                          150
+#define FILTER_WIDTH                          125
 #define FILTER_RIGHT_MARGIN                   5
 #define FEEDS_VIEW_INDENTATION                10
 #define MIME_TYPE_ITEM_POINTER                "rssguard/itempointer"
diff --git a/src/librssguard/gui/baselineedit.h b/src/librssguard/gui/baselineedit.h
index ae3d3c34c..2c1bc2572 100644
--- a/src/librssguard/gui/baselineedit.h
+++ b/src/librssguard/gui/baselineedit.h
@@ -9,8 +9,6 @@ class BaseLineEdit : public QLineEdit {
   Q_OBJECT
 
   public:
-
-    // Constructors and destructors.
     explicit BaseLineEdit(QWidget* parent = nullptr);
     virtual ~BaseLineEdit() = default;
 
diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp
index c7c5d0ec0..d493fd468 100755
--- a/src/librssguard/gui/dialogs/formmain.cpp
+++ b/src/librssguard/gui/dialogs/formmain.cpp
@@ -12,16 +12,16 @@
 #include "gui/dialogs/formsettings.h"
 #include "gui/dialogs/formupdate.h"
 #include "gui/feedmessageviewer.h"
-#include "gui/feedstoolbar.h"
 #include "gui/feedsview.h"
 #include "gui/messagebox.h"
 #include "gui/messagepreviewer.h"
-#include "gui/messagestoolbar.h"
 #include "gui/messagesview.h"
 #include "gui/plaintoolbutton.h"
-#include "gui/statusbar.h"
 #include "gui/systemtrayicon.h"
 #include "gui/tabbar.h"
+#include "gui/toolbars/feedstoolbar.h"
+#include "gui/toolbars/messagestoolbar.h"
+#include "gui/toolbars/statusbar.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/feedreader.h"
 #include "miscellaneous/iconfactory.h"
diff --git a/src/librssguard/gui/feedmessageviewer.cpp b/src/librssguard/gui/feedmessageviewer.cpp
index dd0165724..6b6f54336 100644
--- a/src/librssguard/gui/feedmessageviewer.cpp
+++ b/src/librssguard/gui/feedmessageviewer.cpp
@@ -10,14 +10,14 @@
 #include "exceptions/applicationexception.h"
 #include "gui/dialogs/formdatabasecleanup.h"
 #include "gui/dialogs/formmain.h"
-#include "gui/feedstoolbar.h"
 #include "gui/feedsview.h"
 #include "gui/messagebox.h"
 #include "gui/messagepreviewer.h"
-#include "gui/messagestoolbar.h"
 #include "gui/messagesview.h"
-#include "gui/statusbar.h"
 #include "gui/systemtrayicon.h"
+#include "gui/toolbars/feedstoolbar.h"
+#include "gui/toolbars/messagestoolbar.h"
+#include "gui/toolbars/statusbar.h"
 #include "miscellaneous/feedreader.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/mutex.h"
@@ -215,6 +215,7 @@ void FeedMessageViewer::displayMessage(const Message& message, RootItem* root) {
 void FeedMessageViewer::createConnections() {
   // Filtering & searching.
   connect(m_toolBarMessages, &MessagesToolBar::messageSearchPatternChanged, m_messagesView, &MessagesView::searchMessages);
+  connect(m_toolBarFeeds, &FeedsToolBar::feedsFilterPatternChanged, m_feedsView, &FeedsView::filterItems);
   connect(m_toolBarMessages, &MessagesToolBar::messageFilterChanged, m_messagesView, &MessagesView::filterMessages);
 
   connect(m_messagesView, &MessagesView::currentMessageRemoved, m_messagesBrowser, &MessagePreviewer::clear);
diff --git a/src/librssguard/gui/feedstoolbar.h b/src/librssguard/gui/feedstoolbar.h
deleted file mode 100644
index 53c2aeaee..000000000
--- a/src/librssguard/gui/feedstoolbar.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// For license of this file, see <project-root-folder>/LICENSE.md.
-
-#ifndef FEEDSTOOLBAR_H
-#define FEEDSTOOLBAR_H
-
-#include "gui/basetoolbar.h"
-
-class FeedsToolBar : public BaseToolBar {
-  Q_OBJECT
-
-  public:
-    explicit FeedsToolBar(const QString& title, QWidget* parent = nullptr);
-
-    QList<QAction*> availableActions() const;
-    QList<QAction*> activatedActions() const;
-    void saveAndSetActions(const QStringList& actions);
-
-    QList<QAction*> convertActions(const QStringList& actions);
-    void loadSpecificActions(const QList<QAction*>& actions, bool initial_load = false);
-
-    QStringList defaultActions() const;
-    QStringList savedActions() const;
-};
-
-#endif // FEEDSTOOLBAR_H
diff --git a/src/librssguard/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp
index 877230a03..09a257e38 100755
--- a/src/librssguard/gui/feedsview.cpp
+++ b/src/librssguard/gui/feedsview.cpp
@@ -496,6 +496,18 @@ void FeedsView::switchVisibility() {
   setVisible(!isVisible());
 }
 
+void FeedsView::filterItems(const QString& pattern) {
+#if QT_VERSION < 0x050C00 // Qt < 5.12.0
+  m_proxyModel->setFilterRegExp(pattern);
+#else
+  m_proxyModel->setFilterRegularExpression(pattern);
+#endif
+
+  if (!pattern.simplified().isEmpty()) {
+    expandAll();
+  }
+}
+
 void FeedsView::drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const {
   if (!rootIsDecorated()) {
     painter->save();
diff --git a/src/librssguard/gui/feedsview.h b/src/librssguard/gui/feedsview.h
index 33cb6214a..2bd7c0ab3 100755
--- a/src/librssguard/gui/feedsview.h
+++ b/src/librssguard/gui/feedsview.h
@@ -75,6 +75,8 @@ class RSSGUARD_DLLSPEC FeedsView : public QTreeView {
     // Switches visibility of the widget.
     void switchVisibility();
 
+    void filterItems(const QString& pattern);
+
   signals:
     void itemSelected(RootItem* item);
     void requestViewNextUnreadMessage();
diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp
index a09781c17..8f61bd3f0 100644
--- a/src/librssguard/gui/messagesview.cpp
+++ b/src/librssguard/gui/messagesview.cpp
@@ -580,7 +580,7 @@ void MessagesView::selectNextUnreadItem() {
 }
 
 void MessagesView::searchMessages(const QString& pattern) {
-#if QT_VERSION_MAJOR <= 5
+#if QT_VERSION < 0x050C00 // Qt < 5.12.0
   m_proxyModel->setFilterRegExp(pattern);
 #else
   m_proxyModel->setFilterRegularExpression(pattern);
diff --git a/src/librssguard/gui/settings/settingsgui.cpp b/src/librssguard/gui/settings/settingsgui.cpp
index 16e1bec94..68f70c990 100755
--- a/src/librssguard/gui/settings/settingsgui.cpp
+++ b/src/librssguard/gui/settings/settingsgui.cpp
@@ -5,11 +5,11 @@
 #include "core/feedsmodel.h"
 #include "gui/dialogs/formmain.h"
 #include "gui/feedmessageviewer.h"
-#include "gui/feedstoolbar.h"
-#include "gui/messagestoolbar.h"
-#include "gui/statusbar.h"
 #include "gui/systemtrayicon.h"
 #include "gui/tabwidget.h"
+#include "gui/toolbars/feedstoolbar.h"
+#include "gui/toolbars/messagestoolbar.h"
+#include "gui/toolbars/statusbar.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/settings.h"
@@ -36,6 +36,7 @@ SettingsGui::SettingsGui(Settings* settings, QWidget* parent) : SettingsPanel(se
   m_ui->m_treeSkins->header()->setSectionResizeMode(1, QHeaderView::ResizeMode::ResizeToContents);
   m_ui->m_treeSkins->header()->setSectionResizeMode(2, QHeaderView::ResizeMode::ResizeToContents);
   m_ui->m_treeSkins->header()->setSectionResizeMode(3, QHeaderView::ResizeMode::ResizeToContents);
+
   connect(m_ui->m_cmbIconTheme, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &SettingsGui::requireRestart);
   connect(m_ui->m_cmbIconTheme, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
           &SettingsGui::dirtifySettings);
diff --git a/src/librssguard/gui/basetoolbar.cpp b/src/librssguard/gui/toolbars/basetoolbar.cpp
old mode 100644
new mode 100755
similarity index 95%
rename from src/librssguard/gui/basetoolbar.cpp
rename to src/librssguard/gui/toolbars/basetoolbar.cpp
index 089b095ab..88044c950
--- a/src/librssguard/gui/basetoolbar.cpp
+++ b/src/librssguard/gui/toolbars/basetoolbar.cpp
@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/basetoolbar.h"
+#include "gui/toolbars/basetoolbar.h"
 
 #include "definitions/definitions.h"
 #include "gui/dialogs/formmain.h"
diff --git a/src/librssguard/gui/basetoolbar.h b/src/librssguard/gui/toolbars/basetoolbar.h
old mode 100644
new mode 100755
similarity index 100%
rename from src/librssguard/gui/basetoolbar.h
rename to src/librssguard/gui/toolbars/basetoolbar.h
diff --git a/src/librssguard/gui/feedstoolbar.cpp b/src/librssguard/gui/toolbars/feedstoolbar.cpp
old mode 100644
new mode 100755
similarity index 71%
rename from src/librssguard/gui/feedstoolbar.cpp
rename to src/librssguard/gui/toolbars/feedstoolbar.cpp
index 350f7b217..25ff90cea
--- a/src/librssguard/gui/feedstoolbar.cpp
+++ b/src/librssguard/gui/toolbars/feedstoolbar.cpp
@@ -1,7 +1,8 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/feedstoolbar.h"
+#include "gui/toolbars/feedstoolbar.h"
 
+#include "gui/baselineedit.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/settings.h"
@@ -14,10 +15,16 @@ FeedsToolBar::FeedsToolBar(const QString& title, QWidget* parent) : BaseToolBar(
 
   margins.setRight(margins.right() + FILTER_RIGHT_MARGIN);
   setContentsMargins(margins);
+
+  initializeSearchBox();
 }
 
 QList<QAction*> FeedsToolBar::availableActions() const {
-  return qApp->userActions();
+  QList<QAction*> available_actions = qApp->userActions();
+
+  available_actions.append(m_actionSearchMessages);
+
+  return available_actions;
 }
 
 QList<QAction*> FeedsToolBar::activatedActions() const {
@@ -27,6 +34,11 @@ QList<QAction*> FeedsToolBar::activatedActions() const {
 void FeedsToolBar::saveAndSetActions(const QStringList& actions) {
   qApp->settings()->setValue(GROUP(GUI), GUI::FeedsToolbarActions, actions.join(QSL(",")));
   loadSpecificActions(convertActions(actions));
+
+  // If user hidden search messages box, then remove the filter.
+  if (!activatedActions().contains(m_actionSearchMessages)) {
+    m_txtSearchMessages->clear();
+  }
 }
 
 QList<QAction*> FeedsToolBar::convertActions(const QStringList& actions) {
@@ -48,6 +60,10 @@ QList<QAction*> FeedsToolBar::convertActions(const QStringList& actions) {
       act->setSeparator(true);
       spec_actions.append(act);
     }
+    else if (action_name == SEARCH_BOX_ACTION_NAME) {
+      // Add search box.
+      spec_actions.append(m_actionSearchMessages);
+    }
     else if (action_name == SPACER_ACTION_NAME) {
       // Add new spacer.
       auto* spacer = new QWidget(this);
@@ -94,3 +110,19 @@ QStringList FeedsToolBar::savedActions() const {
                                                                                      QString::SplitBehavior::SkipEmptyParts);
 #endif
 }
+
+void FeedsToolBar::initializeSearchBox() {
+  m_txtSearchMessages = new BaseLineEdit(this);
+  m_txtSearchMessages->setFixedWidth(FILTER_WIDTH);
+  m_txtSearchMessages->setPlaceholderText(tr("Search feeds"));
+
+  // Setup wrapping action for search box.
+  m_actionSearchMessages = new QWidgetAction(this);
+
+  m_actionSearchMessages->setDefaultWidget(m_txtSearchMessages);
+  m_actionSearchMessages->setIcon(qApp->icons()->fromTheme(QSL("system-search")));
+  m_actionSearchMessages->setProperty("type", SEARCH_BOX_ACTION_NAME);
+  m_actionSearchMessages->setProperty("name", tr("Feeds search box"));
+
+  connect(m_txtSearchMessages, &BaseLineEdit::textChanged, this, &FeedsToolBar::feedsFilterPatternChanged);
+}
diff --git a/src/librssguard/gui/toolbars/feedstoolbar.h b/src/librssguard/gui/toolbars/feedstoolbar.h
new file mode 100755
index 000000000..b8b587c22
--- /dev/null
+++ b/src/librssguard/gui/toolbars/feedstoolbar.h
@@ -0,0 +1,36 @@
+// For license of this file, see <project-root-folder>/LICENSE.md.
+
+#ifndef FEEDSTOOLBAR_H
+#define FEEDSTOOLBAR_H
+
+#include "gui/toolbars/basetoolbar.h"
+
+class BaseLineEdit;
+class QWidgetAction;
+
+class FeedsToolBar : public BaseToolBar {
+  Q_OBJECT
+
+  public:
+    explicit FeedsToolBar(const QString& title, QWidget* parent = nullptr);
+
+    virtual QList<QAction*> availableActions() const;
+    virtual QList<QAction*> activatedActions() const;
+    virtual void saveAndSetActions(const QStringList& actions);
+    virtual QList<QAction*> convertActions(const QStringList& actions);
+    virtual void loadSpecificActions(const QList<QAction*>& actions, bool initial_load = false);
+    virtual QStringList defaultActions() const;
+    virtual QStringList savedActions() const;
+
+  signals:
+    void feedsFilterPatternChanged(const QString& pattern);
+
+  private:
+    void initializeSearchBox();
+
+  private:
+    BaseLineEdit* m_txtSearchMessages;
+    QWidgetAction* m_actionSearchMessages;
+};
+
+#endif // FEEDSTOOLBAR_H
diff --git a/src/librssguard/gui/messagestoolbar.cpp b/src/librssguard/gui/toolbars/messagestoolbar.cpp
old mode 100644
new mode 100755
similarity index 98%
rename from src/librssguard/gui/messagestoolbar.cpp
rename to src/librssguard/gui/toolbars/messagestoolbar.cpp
index 01156e758..be360dd29
--- a/src/librssguard/gui/messagestoolbar.cpp
+++ b/src/librssguard/gui/toolbars/messagestoolbar.cpp
@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/messagestoolbar.h"
+#include "gui/toolbars/messagestoolbar.h"
 
 #include "definitions/definitions.h"
 #include "gui/baselineedit.h"
@@ -11,8 +11,7 @@
 #include <QToolButton>
 #include <QWidgetAction>
 
-MessagesToolBar::MessagesToolBar(const QString& title, QWidget* parent)
-  : BaseToolBar(title, parent) {
+MessagesToolBar::MessagesToolBar(const QString& title, QWidget* parent) : BaseToolBar(title, parent) {
   initializeSearchBox();
   initializeHighlighter();
 }
@@ -22,6 +21,7 @@ QList<QAction*> MessagesToolBar::availableActions() const {
 
   available_actions.append(m_actionSearchMessages);
   available_actions.append(m_actionMessageHighlighter);
+
   return available_actions;
 }
 
diff --git a/src/librssguard/gui/messagestoolbar.h b/src/librssguard/gui/toolbars/messagestoolbar.h
old mode 100644
new mode 100755
similarity index 89%
rename from src/librssguard/gui/messagestoolbar.h
rename to src/librssguard/gui/toolbars/messagestoolbar.h
index a8a52a0ae..f379700bd
--- a/src/librssguard/gui/messagestoolbar.h
+++ b/src/librssguard/gui/toolbars/messagestoolbar.h
@@ -3,7 +3,7 @@
 #ifndef NEWSTOOLBAR_H
 #define NEWSTOOLBAR_H
 
-#include "gui/basetoolbar.h"
+#include "gui/toolbars/basetoolbar.h"
 
 #include "core/messagesmodel.h"
 
@@ -18,8 +18,6 @@ class MessagesToolBar : public BaseToolBar {
   public:
     explicit MessagesToolBar(const QString& title, QWidget* parent = nullptr);
 
-    BaseLineEdit* searchLineEdit();
-
     virtual QList<QAction*> availableActions() const;
     virtual QList<QAction*> activatedActions() const;
     virtual void saveAndSetActions(const QStringList& actions);
@@ -47,8 +45,4 @@ class MessagesToolBar : public BaseToolBar {
     BaseLineEdit* m_txtSearchMessages;
 };
 
-inline BaseLineEdit* MessagesToolBar::searchLineEdit() {
-  return m_txtSearchMessages;
-}
-
 #endif // NEWSTOOLBAR_H
diff --git a/src/librssguard/gui/statusbar.cpp b/src/librssguard/gui/toolbars/statusbar.cpp
old mode 100644
new mode 100755
similarity index 99%
rename from src/librssguard/gui/statusbar.cpp
rename to src/librssguard/gui/toolbars/statusbar.cpp
index 65a77b5f1..919389478
--- a/src/librssguard/gui/statusbar.cpp
+++ b/src/librssguard/gui/toolbars/statusbar.cpp
@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/statusbar.h"
+#include "gui/toolbars/statusbar.h"
 
 #include "gui/dialogs/formmain.h"
 #include "gui/plaintoolbutton.h"
diff --git a/src/librssguard/gui/statusbar.h b/src/librssguard/gui/toolbars/statusbar.h
old mode 100644
new mode 100755
similarity index 67%
rename from src/librssguard/gui/statusbar.h
rename to src/librssguard/gui/toolbars/statusbar.h
index 98069f282..3e7cebfe5
--- a/src/librssguard/gui/statusbar.h
+++ b/src/librssguard/gui/toolbars/statusbar.h
@@ -5,7 +5,7 @@
 
 #include <QStatusBar>
 
-#include "gui/basetoolbar.h"
+#include "gui/toolbars/basetoolbar.h"
 
 class QProgressBar;
 class QLabel;
@@ -18,13 +18,13 @@ class StatusBar : public QStatusBar, public BaseBar {
     explicit StatusBar(QWidget* parent = nullptr);
     virtual ~StatusBar();
 
-    QList<QAction*> availableActions() const;
-    QList<QAction*> activatedActions() const;
-    void saveAndSetActions(const QStringList& actions);
-    QStringList defaultActions() const;
-    QStringList savedActions() const;
-    QList<QAction*> convertActions(const QStringList& actions);
-    void loadSpecificActions(const QList<QAction*>& actions, bool initial_load = false);
+    virtual QList<QAction*> availableActions() const;
+    virtual QList<QAction*> activatedActions() const;
+    virtual void saveAndSetActions(const QStringList& actions);
+    virtual QStringList defaultActions() const;
+    virtual QStringList savedActions() const;
+    virtual QList<QAction*> convertActions(const QStringList& actions);
+    virtual void loadSpecificActions(const QList<QAction*>& actions, bool initial_load = false);
 
   public slots:
     void showProgressFeeds(int progress, const QString& label);
diff --git a/src/librssguard/gui/toolbareditor.cpp b/src/librssguard/gui/toolbars/toolbareditor.cpp
old mode 100644
new mode 100755
similarity index 99%
rename from src/librssguard/gui/toolbareditor.cpp
rename to src/librssguard/gui/toolbars/toolbareditor.cpp
index 2f6b7747d..4f777caa8
--- a/src/librssguard/gui/toolbareditor.cpp
+++ b/src/librssguard/gui/toolbars/toolbareditor.cpp
@@ -1,9 +1,9 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/toolbareditor.h"
+#include "gui/toolbars/toolbareditor.h"
 
-#include "gui/basetoolbar.h"
 #include "gui/dialogs/formmain.h"
+#include "gui/toolbars/basetoolbar.h"
 
 #include <QKeyEvent>
 
diff --git a/src/librssguard/gui/toolbareditor.h b/src/librssguard/gui/toolbars/toolbareditor.h
old mode 100644
new mode 100755
similarity index 100%
rename from src/librssguard/gui/toolbareditor.h
rename to src/librssguard/gui/toolbars/toolbareditor.h
diff --git a/src/librssguard/gui/toolbareditor.ui b/src/librssguard/gui/toolbars/toolbareditor.ui
old mode 100644
new mode 100755
similarity index 100%
rename from src/librssguard/gui/toolbareditor.ui
rename to src/librssguard/gui/toolbars/toolbareditor.ui
diff --git a/src/librssguard/librssguard.pro b/src/librssguard/librssguard.pro
index bf79b75c1..f42a89996 100644
--- a/src/librssguard/librssguard.pro
+++ b/src/librssguard/librssguard.pro
@@ -61,7 +61,7 @@ HEADERS += core/feeddownloader.h \
            exceptions/networkexception.h \
            exceptions/scriptexception.h \
            gui/baselineedit.h \
-           gui/basetoolbar.h \
+           gui/toolbars/basetoolbar.h \
            gui/colortoolbutton.h \
            gui/comboboxwithstatus.h \
            gui/dialogs/formabout.h \
@@ -76,7 +76,7 @@ HEADERS += core/feeddownloader.h \
            gui/dialogs/formupdate.h \
            gui/edittableview.h \
            gui/feedmessageviewer.h \
-           gui/feedstoolbar.h \
+           gui/toolbars/feedstoolbar.h \
            gui/feedsview.h \
            gui/guiutilities.h \
            gui/labelsmenu.h \
@@ -85,7 +85,7 @@ HEADERS += core/feeddownloader.h \
            gui/messagebox.h \
            gui/messagecountspinbox.h \
            gui/messagepreviewer.h \
-           gui/messagestoolbar.h \
+           gui/toolbars/messagestoolbar.h \
            gui/messagesview.h \
            gui/networkproxydetails.h \
            gui/newspaperpreviewer.h \
@@ -102,14 +102,14 @@ HEADERS += core/feeddownloader.h \
            gui/settings/settingspanel.h \
            gui/settings/settingsshortcuts.h \
            gui/squeezelabel.h \
-           gui/statusbar.h \
+           gui/toolbars/statusbar.h \
            gui/styleditemdelegatewithoutfocus.h \
            gui/systemtrayicon.h \
            gui/tabbar.h \
            gui/tabcontent.h \
            gui/tabwidget.h \
            gui/timespinbox.h \
-           gui/toolbareditor.h \
+           gui/toolbars/toolbareditor.h \
            gui/treeviewcolumnsmenu.h \
            gui/widgetwithstatus.h \
            miscellaneous/application.h \
@@ -239,7 +239,7 @@ SOURCES += core/feeddownloader.cpp \
            exceptions/networkexception.cpp \
            exceptions/scriptexception.cpp \
            gui/baselineedit.cpp \
-           gui/basetoolbar.cpp \
+           gui/toolbars/basetoolbar.cpp \
            gui/colortoolbutton.cpp \
            gui/comboboxwithstatus.cpp \
            gui/dialogs/formabout.cpp \
@@ -254,7 +254,7 @@ SOURCES += core/feeddownloader.cpp \
            gui/dialogs/formupdate.cpp \
            gui/edittableview.cpp \
            gui/feedmessageviewer.cpp \
-           gui/feedstoolbar.cpp \
+           gui/toolbars/feedstoolbar.cpp \
            gui/feedsview.cpp \
            gui/guiutilities.cpp \
            gui/labelsmenu.cpp \
@@ -263,7 +263,7 @@ SOURCES += core/feeddownloader.cpp \
            gui/messagebox.cpp \
            gui/messagecountspinbox.cpp \
            gui/messagepreviewer.cpp \
-           gui/messagestoolbar.cpp \
+           gui/toolbars/messagestoolbar.cpp \
            gui/messagesview.cpp \
            gui/networkproxydetails.cpp \
            gui/newspaperpreviewer.cpp \
@@ -280,14 +280,14 @@ SOURCES += core/feeddownloader.cpp \
            gui/settings/settingspanel.cpp \
            gui/settings/settingsshortcuts.cpp \
            gui/squeezelabel.cpp \
-           gui/statusbar.cpp \
+           gui/toolbars/statusbar.cpp \
            gui/styleditemdelegatewithoutfocus.cpp \
            gui/systemtrayicon.cpp \
            gui/tabbar.cpp \
            gui/tabcontent.cpp \
            gui/tabwidget.cpp \
            gui/timespinbox.cpp \
-           gui/toolbareditor.cpp \
+           gui/toolbars/toolbareditor.cpp \
            gui/treeviewcolumnsmenu.cpp \
            gui/widgetwithstatus.cpp \
            miscellaneous/application.cpp \
@@ -405,7 +405,7 @@ FORMS += gui/dialogs/formabout.ui \
          gui/settings/settingsgui.ui \
          gui/settings/settingslocalization.ui \
          gui/settings/settingsshortcuts.ui \
-         gui/toolbareditor.ui \
+         gui/toolbars/toolbareditor.ui \
          network-web/downloaditem.ui \
          network-web/downloadmanager.ui \
          services/abstract/gui/authenticationdetails.ui \
@@ -502,6 +502,7 @@ HEADERS  += $$files(3rd-party/sc/*.h, false)
 INCLUDEPATH +=  $$PWD/. \
                 $$PWD/gui \
                 $$PWD/gui/dialogs \
+                $$PWD/gui/toolbars \
                 $$PWD/dynamic-shortcuts
 
 TRANSLATIONS += $$files($$PWD/../../localization/rssguard_*.ts, false) \
diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp
index 90ac4ff9c..6f0adb4d1 100755
--- a/src/librssguard/miscellaneous/application.cpp
+++ b/src/librssguard/miscellaneous/application.cpp
@@ -10,7 +10,7 @@
 #include "gui/feedmessageviewer.h"
 #include "gui/feedsview.h"
 #include "gui/messagebox.h"
-#include "gui/statusbar.h"
+#include "gui/toolbars/statusbar.h"
 #include "miscellaneous/feedreader.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/iofactory.h"
diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp
index c8f89c531..e523b3b9d 100755
--- a/src/librssguard/miscellaneous/settings.cpp
+++ b/src/librssguard/miscellaneous/settings.cpp
@@ -133,7 +133,7 @@ DKEY GUI::HeightRowFeeds = "height_row_feeds";
 DVALUE(int) GUI::HeightRowFeedsDef = -1;
 
 DKEY GUI::FeedsToolbarActions = "feeds_toolbar";
-DVALUE(char*) GUI::FeedsToolbarActionsDef = "m_actionUpdateAllItems,m_actionStopRunningItemsUpdate,m_actionMarkAllItemsRead";
+DVALUE(char*) GUI::FeedsToolbarActionsDef = "m_actionUpdateAllItems,m_actionStopRunningItemsUpdate,m_actionMarkAllItemsRead,spacer,search";
 
 DKEY GUI::StatusbarActions = "status_bar";
 DVALUE(char*) GUI::StatusbarActionsDef =