diff --git a/applets/systemtray/package/contents/config/config.qml b/applets/systemtray/package/contents/config/config.qml
index 2ce4e73db..e6eeac327 100644
--- a/applets/systemtray/package/contents/config/config.qml
+++ b/applets/systemtray/package/contents/config/config.qml
@@ -1,30 +1,35 @@
 /***************************************************************************
  *   Copyright 2013 by Sebastian Kügler <sebas@kde.org>                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
 import QtQuick 2.0
 
 import org.kde.plasma.configuration 2.0
 
 ConfigModel {
+    ConfigCategory {
+         name: i18n("General")
+         icon: "plasma"
+         source: "ConfigGeneral.qml"
+    }
     ConfigCategory {
          name: i18n("Entries")
          icon: "preferences-desktop-notification"
          source: "ConfigEntries.qml"
     }
 }
diff --git a/applets/systemtray/package/contents/config/main.xml b/applets/systemtray/package/contents/config/main.xml
index e550afcfc..90c10719e 100644
--- a/applets/systemtray/package/contents/config/main.xml
+++ b/applets/systemtray/package/contents/config/main.xml
@@ -1,39 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile name=""/>
 
   <group name="General">
     <entry name="extraItems" type="StringList">
       <label>All plasmoid items that are explicitly enabled in the systray. It's a comma-separated string list of plasmoid plugin ids.</label>
       <default></default>
     </entry>
     <entry name="hiddenItems" type="StringList">
       <label>All items that are hidden, forced always in the popup. It's a comma-separated string list of unique identifiers that are either plasmoid plugin ids or StatusNotifier ids.</label>
       <default></default>
     </entry>
     <entry name="shownItems" type="StringList">
       <label>All items that are shown. It's a comma-separated string list of unique identifiers that are either plasmoid plugin ids or StatusNotifier ids.</label>
       <default></default>
     </entry>
     <entry name="showAllItems" type="bool">
         <label>If true, all systray entries will be always in the main area, outside the popup.</label>
         <default>false</default>
     </entry>
     <entry name="knownItems" type="StringList" hidden="true">
       <default></default>
     </entry>
+    <entry name="scaleWithPanel" type="Bool">
+      <label>If true, icons will be scales to fit panel.</label>
+      <default>false</default>
+    </entry>
+    <entry name="maximumIconSize" type="Bool">
+      <label>If true, icons will remain smaller than the selected maximum icon size, arranged in rows or columns.</label>
+      <default>true</default>
+    </entry>
     <entry name="iconSize" type="Int">
       <label>Default icon size for the systray icons, it's an enum which values mean, Small, SmallMedium, Medium, Large, Huge, Enormous respectively. On low DPI systems they correspond to 16, 22, 32, 48, 64, 128 pixels. On high DPI systems those values would be scaled up, depending on the DPI.</label>
       <default>1</default>
     </entry>
     <entry name="pin" type="Bool">
       <label>Whether the popup should remain open when another window is activated</label>
       <default>false</default>
     </entry>
   </group>
 
 </kcfg>
 
diff --git a/applets/systemtray/package/contents/ui/ConfigGeneral.qml b/applets/systemtray/package/contents/ui/ConfigGeneral.qml
new file mode 100644
index 000000000..d78c1a47a
--- /dev/null
+++ b/applets/systemtray/package/contents/ui/ConfigGeneral.qml
@@ -0,0 +1,71 @@
+/***************************************************************************
+ *   Copyright (C) 2020 Konrad Materka <materka@gmail.com>                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
+ ***************************************************************************/
+
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as QtControls
+import QtQuick.Layouts 1.14 as QtLayouts
+import org.kde.kirigami 2.13 as Kirigami
+
+Item {
+
+    property alias cfg_scaleWithPanel: scalesWithPanelRadio.checked
+    property alias cfg_maximumIconSize: maximumIconSizeRadio.checked
+    property alias cfg_iconSize: iconSizeComboBox.currentIndex
+
+    Kirigami.FormLayout {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        QtLayouts.ColumnLayout {
+            Kirigami.FormData.label: i18n("Icon size:")
+            Kirigami.FormData.buddyFor: scalesWithPanelRadio
+
+            QtControls.RadioButton {
+                id: scalesWithPanelRadio
+                text: i18n("Scales with panel")
+
+                QtControls.ToolTip {
+                    text: i18n("If set, icons will be scaled to fit panel.")
+                }
+
+                onCheckedChanged: {
+                    iconSizeComboBox.currentIndex = 5
+                }
+            }
+
+            QtControls.RadioButton {
+                id: maximumIconSizeRadio
+                text: i18n("Maximum icon size:")
+                QtControls.ToolTip {
+                    text: i18n("If set, icons will remain smaller than the selected maximum icon size, arranged in rows or columns.")
+                }
+            }
+
+            QtControls.ComboBox {
+                id: iconSizeComboBox
+                enabled: maximumIconSizeRadio.checked
+
+                Kirigami.FormData.label: i18n("Maximum icon size:")
+
+                model: [i18n("Very Small"), i18n("Small"), i18n("Medium"), i18n("Large"), i18n("Huge"), i18n("Enormous")]
+            }
+        }
+    }
+
+}