diff --git a/applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp b/applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp
index 0110ba6fb..c45191d02 100644
--- a/applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp
+++ b/applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp
@@ -1,266 +1,271 @@
 /******************************************************************************
 *   Copyright 2013 Sebastian Kügler <sebas@kde.org>                           *
 *                                                                             *
 *   This library is free software; you can redistribute it and/or             *
 *   modify it under the terms of the GNU Library General Public               *
 *   License as published by the Free Software Foundation; either              *
 *   version 2 of the License, or (at your option) any later version.          *
 *                                                                             *
 *   This library 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          *
 *   Library General Public License for more details.                          *
 *                                                                             *
 *   You should have received a copy of the GNU Library General Public License *
 *   along with this library; see the file COPYING.LIB.  If not, write to      *
 *   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,      *
 *   Boston, MA 02110-1301, USA.                                               *
 *******************************************************************************/
 
 #include "statusnotifiertest.h"
 #include "pumpjob.h"
 
 #include <QDebug>
 #include <kservice.h>
 #include <kplugininfo.h>
 #include <kplugintrader.h>
 
 #include <qcommandlineparser.h>
 
 #include <KLocalizedString>
 #include <KStatusNotifierItem>
 
 #include <QStringList>
 #include <QTimer>
 
 #include <QPushButton>
 #include <QMenu>
 
 
 static QTextStream cout(stdout);
 
 class StatusNotifierTestPrivate {
 public:
     QString pluginName;
     QTimer* timer;
     int interval = 1500;
     QStringList loglines;
 
     KStatusNotifierItem* systemNotifier;
     PumpJob *job;
 
 };
 
 StatusNotifierTest::StatusNotifierTest(QWidget* parent) :
     QDialog(parent)
 {
     d = new StatusNotifierTestPrivate;
     d->job = nullptr;
 
     init();
 
     setupUi(this);
     connect(updateButton, &QPushButton::clicked, this, &StatusNotifierTest::updateNotifier);
     connect(jobEnabledCheck, &QCheckBox::toggled, this, &StatusNotifierTest::enableJob);
     updateUi();
+    iconName->setText(QStringLiteral("plasma"));
     show();
     raise();
     log(QStringLiteral("started"));
 }
 
 void StatusNotifierTest::init()
 {
     d->systemNotifier = new KStatusNotifierItem(this);
     //d->systemNotifier->setCategory(KStatusNotifierItem::SystemServices);
     //d->systemNotifier->setCategory(KStatusNotifierItem::Hardware);
     d->systemNotifier->setCategory(KStatusNotifierItem::Communications);
     d->systemNotifier->setIconByName(QStringLiteral("plasma"));
     d->systemNotifier->setStatus(KStatusNotifierItem::Active);
     d->systemNotifier->setToolTipTitle(i18nc("tooltip title", "System Service Item"));
     d->systemNotifier->setTitle(i18nc("title", "StatusNotifierTest"));
     d->systemNotifier->setToolTipSubTitle(i18nc("tooltip subtitle", "Some explanation from the beach."));
 
     connect(d->systemNotifier, &KStatusNotifierItem::activateRequested,
             this, &StatusNotifierTest::activateRequested);
     connect(d->systemNotifier, &KStatusNotifierItem::secondaryActivateRequested,
             this, &StatusNotifierTest::secondaryActivateRequested);
     connect(d->systemNotifier, &KStatusNotifierItem::scrollRequested,
             this, &StatusNotifierTest::scrollRequested);
 
     auto menu = new QMenu(this);
     menu->addAction(QIcon::fromTheme(QStringLiteral("document-edit")), QStringLiteral("action 1"));
     menu->addAction(QIcon::fromTheme(QStringLiteral("mail-send")), QStringLiteral("action 2"));
     auto subMenu = new QMenu(this);
     subMenu->setTitle(QStringLiteral("Sub Menu"));
     subMenu->addAction(QStringLiteral("subaction1"));
     subMenu->addAction(QStringLiteral("subaction2"));
     menu->addMenu(subMenu);
 
     d->systemNotifier->setContextMenu(menu);
 }
 
 StatusNotifierTest::~StatusNotifierTest()
 {
     delete d;
 }
 
 void StatusNotifierTest::log(const QString& msg)
 {
     qDebug() << "msg: " << msg;
     d->loglines.prepend(msg);
 
 
     logEdit->setText(d->loglines.join('\n'));
 }
 
 void StatusNotifierTest::updateUi()
 {
     if (!d->systemNotifier) {
         return;
     }
     statusActive->setChecked(d->systemNotifier->status() == KStatusNotifierItem::Active);
     statusPassive->setChecked(d->systemNotifier->status() == KStatusNotifierItem::Passive);
     statusNeedsAttention->setChecked(d->systemNotifier->status() == KStatusNotifierItem::NeedsAttention);
 
     statusActive->setEnabled(!statusAuto->isChecked());
     statusPassive->setEnabled(!statusAuto->isChecked());
     statusNeedsAttention->setEnabled(!statusAuto->isChecked());
 
-    iconName->setText(d->systemNotifier->iconName());
     tooltipText->setText(d->systemNotifier->toolTipTitle());
     tooltipSubtext->setText(d->systemNotifier->toolTipSubTitle());
 
 }
 
 void StatusNotifierTest::updateNotifier()
 {
     //log("update");
     if (!enabledCheck->isChecked()) {
         delete d->systemNotifier;
         d->systemNotifier = nullptr;
         return;
     } else {
         if (!d->systemNotifier) {
             init();
         }
     }
 
 
     if (!d->systemNotifier) {
         return;
     }
     if (statusAuto->isChecked()) {
         d->timer->start();
     } else {
         d->timer->stop();
     }
 
     KStatusNotifierItem::ItemStatus s = KStatusNotifierItem::Passive;
     if (statusActive->isChecked()) {
         s = KStatusNotifierItem::Active;
     } else if (statusNeedsAttention->isChecked()) {
         s = KStatusNotifierItem::NeedsAttention;
     }
     d->systemNotifier->setStatus(s);
 
-    d->systemNotifier->setIconByName(iconName->text());
+    iconPixmapCheckbox->isChecked() ? d->systemNotifier->setIconByPixmap(QIcon::fromTheme(iconName->text()))
+        : d->systemNotifier->setIconByName(iconName->text());
+    overlayIconPixmapCheckbox->isChecked() ?  d->systemNotifier->setOverlayIconByPixmap(QIcon::fromTheme(overlayIconName->text()))
+        : d->systemNotifier->setOverlayIconByName(overlayIconName->text());
+    attentionIconPixmapCheckbox->isChecked() ? d->systemNotifier->setAttentionIconByPixmap(QIcon::fromTheme(attentionIconName->text()))
+        :  d->systemNotifier->setAttentionIconByName(attentionIconName->text());
 
     d->systemNotifier->setToolTip(iconName->text(), tooltipText->text(), tooltipSubtext->text());
 
     updateUi();
 }
 
 
 
 int StatusNotifierTest::runMain()
 {
     d->timer = new QTimer(this);
     connect(d->timer, &QTimer::timeout, this, &StatusNotifierTest::timeout);
     d->timer->setInterval(d->interval);
     //d->timer->start();
     return 0;
 }
 
 void StatusNotifierTest::timeout()
 {
     if (!d->systemNotifier) {
         return;
     }
 
     if (d->systemNotifier->status() == KStatusNotifierItem::Passive) {
         d->systemNotifier->setStatus(KStatusNotifierItem::Active);
         qDebug() << " Now Active";
     } else if (d->systemNotifier->status() == KStatusNotifierItem::Active) {
         d->systemNotifier->setStatus(KStatusNotifierItem::NeedsAttention);
         qDebug() << " Now NeedsAttention";
     } else if (d->systemNotifier->status() == KStatusNotifierItem::NeedsAttention) {
         d->systemNotifier->setStatus(KStatusNotifierItem::Passive);
         qDebug() << " Now passive";
     }
     updateUi();
 }
 
 void StatusNotifierTest::activateRequested(bool active, const QPoint& pos)
 {
     Q_UNUSED(active);
     Q_UNUSED(pos);
     log(QStringLiteral("Activated"));
 }
 
 void StatusNotifierTest::secondaryActivateRequested(const QPoint& pos)
 {
     Q_UNUSED(pos);
     log(QStringLiteral("secondaryActivateRequested"));
 }
 
 
 void StatusNotifierTest::scrollRequested(int delta, Qt::Orientation orientation)
 {
     ///QString msg  = QString("Scrolled " << " by: ");
     //+     //QString msg  = QString("Scrolled " + ((orientation == Qt::Horizontal) ? "Horizontally" : "Vertically") + " by: " //+ QString::number(delta));
     QString msg(QStringLiteral("Scrolled by "));
     msg.append(QString::number(delta));
     msg.append((orientation == Qt::Horizontal) ? " Horizontally" : " Vertically");
     log(msg);
 }
 
 
 // Jobs
 
 void StatusNotifierTest::enableJob(bool enable)
 {
     qDebug() << "Job enabled." << enable;
     if (enable) {
         d->job = new PumpJob(speedSlider->value());
         //QObject::connect(d->job, &KJob::percent, this, &StatusNotifierTest::setJobProgress);
         QObject::connect(d->job, SIGNAL(percent(KJob*, unsigned long)), this, SLOT(setJobProgress(KJob*, unsigned long)));
         QObject::connect(d->job, &KJob::result, this, &StatusNotifierTest::result);
         //d->job->start(); // KIO autostarts jobs
     } else {
         if (d->job) {
             d->timer->stop();
             jobEnabledCheck->setChecked(Qt::Unchecked);
             d->job->kill();
         }
     }
 }
 
 void StatusNotifierTest::setJobProgress(KJob *j, unsigned long v)
 {
     Q_UNUSED(j)
     jobProgressBar->setValue(v);
 }
 
 void StatusNotifierTest::result(KJob* job)
 {
     if (job->error()) {
         qDebug() << "Job Error:" << job->errorText() << job->errorString();
     } else {
         qDebug() << "Job finished successfully.";
     }
     jobEnabledCheck->setCheckState(Qt::Unchecked);
 }
 
 
 #include "moc_statusnotifiertest.cpp"
 
diff --git a/applets/systemtray/tests/statusnotifier/statusnotifiertest.ui b/applets/systemtray/tests/statusnotifier/statusnotifiertest.ui
index 758cf256a..6fac8c56a 100644
--- a/applets/systemtray/tests/statusnotifier/statusnotifiertest.ui
+++ b/applets/systemtray/tests/statusnotifier/statusnotifiertest.ui
@@ -1,223 +1,283 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>StatusNotifierTest</class>
  <widget class="QDialog" name="StatusNotifierTest">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>434</width>
-    <height>572</height>
+    <width>471</width>
+    <height>692</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>100</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Stat&amp;usNotifier Testap</string>
   </property>
   <property name="windowIcon">
    <iconset theme="plasma">
-    <normaloff/>
-   </iconset>
+    <normaloff>.</normaloff>.</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <item>
     <widget class="QTabWidget" name="JobTab">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>Stat&amp;us Notifier</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout">
        <property name="verticalSpacing">
         <number>0</number>
        </property>
        <item row="0" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Log&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QTextEdit" name="logEdit">
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>120</height>
           </size>
          </property>
          <property name="readOnly">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
           <string>&lt;b&gt;Status&lt;/b&gt;</string>
          </property>
         </widget>
        </item>
        <item row="3" column="1">
         <widget class="QCheckBox" name="enabledCheck">
          <property name="text">
           <string>Enabled</string>
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="4" column="1">
         <widget class="QCheckBox" name="statusAuto">
          <property name="text">
           <string>Automatic</string>
          </property>
         </widget>
        </item>
        <item row="5" column="1">
         <widget class="QRadioButton" name="statusPassive">
          <property name="text">
           <string>Passive</string>
          </property>
         </widget>
        </item>
        <item row="6" column="1">
         <widget class="QRadioButton" name="statusActive">
          <property name="text">
           <string>Ac&amp;tive</string>
          </property>
         </widget>
        </item>
        <item row="7" column="1">
         <widget class="QRadioButton" name="statusNeedsAttention">
          <property name="text">
           <string>&amp;NeedsAttention</string>
          </property>
         </widget>
        </item>
        <item row="8" column="0">
         <widget class="QLabel" name="label_3">
          <property name="text">
           <string>&lt;b&gt;Icon&lt;/b&gt;</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="1">
-        <widget class="QLineEdit" name="iconName"/>
-       </item>
-       <item row="10" column="0">
+       <item row="9" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>&lt;b&gt;ToolTip&lt;/b&gt;</string>
          </property>
         </widget>
        </item>
        <item row="11" column="1">
         <widget class="QLineEdit" name="tooltipText"/>
        </item>
        <item row="12" column="1">
         <widget class="QLineEdit" name="tooltipSubtext"/>
        </item>
-       <item row="14" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout"/>
-       </item>
        <item row="13" column="1">
         <widget class="QPushButton" name="updateButton">
          <property name="text">
           <string>Update</string>
          </property>
         </widget>
        </item>
+       <item row="8" column="1">
+        <layout class="QFormLayout" name="iconsLayout">
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>Icon</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_9">
+           <property name="text">
+            <string>AttentionIcon</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="label_10">
+           <property name="text">
+            <string>OverlayIcon</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <layout class="QHBoxLayout" name="iconLayout">
+           <item>
+            <widget class="QLineEdit" name="iconName"/>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="iconPixmapCheckbox">
+             <property name="text">
+              <string>Use Pixmap</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="1">
+          <layout class="QHBoxLayout" name="attentionIconLayout">
+           <item>
+            <widget class="QLineEdit" name="attentionIconName"/>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="attentionIconPixmapCheckbox">
+             <property name="text">
+              <string>Use Pixmap</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="3" column="1">
+          <layout class="QHBoxLayout" name="overlayIconLayout">
+           <item>
+            <widget class="QLineEdit" name="overlayIconName"/>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="overlayIconPixmapCheckbox">
+             <property name="text">
+              <string>Use Pixmap</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>&amp;Jobs</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout_2">
        <property name="verticalSpacing">
         <number>0</number>
        </property>
        <item row="0" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>&lt;b&gt;Job Control&lt;/b&gt;</string>
          </property>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
           <string>&lt;b&gt;Progress&lt;/b&gt;</string>
          </property>
         </widget>
        </item>
        <item row="6" column="1">
         <widget class="QProgressBar" name="jobProgressBar">
          <property name="value">
           <number>0</number>
          </property>
         </widget>
        </item>
        <item row="7" column="0">
         <widget class="QLabel" name="label_7">
          <property name="text">
           <string>&lt;b&gt;Naming&lt;/b&gt;</string>
          </property>
         </widget>
        </item>
        <item row="8" column="1">
         <widget class="QLineEdit" name="nameText"/>
        </item>
        <item row="10" column="1">
         <widget class="QLineEdit" name="subText"/>
        </item>
        <item row="2" column="1">
         <widget class="QSlider" name="speedSlider">
          <property name="minimum">
           <number>1</number>
          </property>
          <property name="maximum">
           <number>10</number>
          </property>
          <property name="pageStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>5</number>
          </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="tickPosition">
           <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
           <number>1</number>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QCheckBox" name="jobEnabledCheck">
          <property name="text">
           <string>Job Started</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>