diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 76af129c5..ae1bbedb6 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -2,6 +2,7 @@
 —————
 
 Added:
+▪ Toolbar editor now uses iconified tool buttons.
 ▪ Double mouse click on feed or recycle bin items in feeds list now opens all messages of the item in newspaper mode.
 ▪ Columns in message list can be hidden/shown/reordered with context menu. (issue #115)
 ▪ Auto-update notification is now switchable. (issue #119)
diff --git a/src/gui/toolbareditor.cpp b/src/gui/toolbareditor.cpp
index 245f7aea6..683cc9dbc 100755
--- a/src/gui/toolbareditor.cpp
+++ b/src/gui/toolbareditor.cpp
@@ -43,6 +43,14 @@ ToolBarEditor::ToolBarEditor(QWidget *parent)
   connect(m_ui->m_listAvailableActions, &QListWidget::itemDoubleClicked, this, &ToolBarEditor::addSelectedAction);
 
   m_ui->m_listActivatedActions->installEventFilter(this);
+
+  m_ui->m_btnInsertSeparator->setIcon(qApp->icons()->fromTheme(QSL("insert-object")));
+  m_ui->m_btnInsertSpacer->setIcon(qApp->icons()->fromTheme(QSL("go-jump")));
+  m_ui->m_btnAddSelectedAction->setIcon(qApp->icons()->fromTheme(QSL("back")));
+  m_ui->m_btnDeleteAllActions->setIcon(qApp->icons()->fromTheme(QSL("application-exit")));
+  m_ui->m_btnDeleteSelectedAction->setIcon(qApp->icons()->fromTheme(QSL("forward")));
+  m_ui->m_btnMoveActionDown->setIcon(qApp->icons()->fromTheme(QSL("down")));
+  m_ui->m_btnMoveActionUp->setIcon(qApp->icons()->fromTheme(QSL("up")));
 }
 
 ToolBarEditor::~ToolBarEditor() {
diff --git a/src/gui/toolbareditor.ui b/src/gui/toolbareditor.ui
old mode 100644
new mode 100755
index d05f0601e..147e8f275
--- a/src/gui/toolbareditor.ui
+++ b/src/gui/toolbareditor.ui
@@ -65,17 +65,32 @@
    <item row="1" column="1">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QPushButton" name="m_btnMoveActionUp">
-       <property name="text">
+      <widget class="QToolButton" name="m_btnMoveActionUp">
+       <property name="toolTip">
         <string>Move action up</string>
        </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="m_btnMoveActionDown">
-       <property name="text">
+      <widget class="QToolButton" name="m_btnMoveActionDown">
+       <property name="toolTip">
         <string>Move action down</string>
        </property>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -86,23 +101,28 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="m_btnInsertSeparator">
-       <property name="text">
+      <widget class="QToolButton" name="m_btnInsertSeparator">
+       <property name="toolTip">
         <string>Insert separator</string>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="m_btnInsertSpacer">
-       <property name="text">
-        <string>Insert spacer</string>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="m_btnAddSelectedAction">
-       <property name="text">
-        <string>Add selected action</string>
+      <widget class="QToolButton" name="m_btnInsertSpacer">
+       <property name="toolTip">
+        <string>Insert spacer</string>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -114,17 +134,42 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="m_btnDeleteSelectedAction">
-       <property name="text">
-        <string>Delete selected action</string>
+      <widget class="QToolButton" name="m_btnAddSelectedAction">
+       <property name="toolTip">
+        <string>Add selected action</string>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="m_btnDeleteAllActions">
-       <property name="text">
+      <widget class="QToolButton" name="m_btnDeleteSelectedAction">
+       <property name="toolTip">
+        <string>Delete selected action</string>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="m_btnDeleteAllActions">
+       <property name="toolTip">
         <string>Delete all actions</string>
        </property>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -166,6 +211,17 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>m_listActivatedActions</tabstop>
+  <tabstop>m_listAvailableActions</tabstop>
+  <tabstop>m_btnMoveActionUp</tabstop>
+  <tabstop>m_btnMoveActionDown</tabstop>
+  <tabstop>m_btnInsertSeparator</tabstop>
+  <tabstop>m_btnInsertSpacer</tabstop>
+  <tabstop>m_btnAddSelectedAction</tabstop>
+  <tabstop>m_btnDeleteSelectedAction</tabstop>
+  <tabstop>m_btnDeleteAllActions</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>