diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp
index ddd2f0c4d..22a60a259 100644
--- a/soliduiserver/soliduiserver.cpp
+++ b/soliduiserver/soliduiserver.cpp
@@ -1,173 +1,173 @@
 /* This file is part of the KDE Project
    Copyright (c) 2005 Jean-Remy Falleri <jr.falleri@laposte.net>
    Copyright (c) 2005-2007 Kevin Ottens <ervin@kde.org>
    Copyright (c) 2007 Alexis Ménard <darktears31@gmail.com>
    Copyright (c) 2011, 2014 Lukas Tinkl <ltinkl@redhat.com>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    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 "soliduiserver.h"
 #include "config-X11.h"
 
 #include <QDebug>
 #include <QDBusInterface>
 #include <QDBusReply>
 #include <QIcon>
 
 #include <KPluginFactory>
 #include <KLocalizedString>
 #include <KUserTimestamp>
 
 #include <kwindowsystem.h>
 #include <kpassworddialog.h>
 #include <kwallet.h>
 
 // solid specific includes
 #include <solid/devicenotifier.h>
 #include <solid/device.h>
 #include <solid/deviceinterface.h>
 #include <solid/predicate.h>
 #include <solid/storagevolume.h>
 
 K_PLUGIN_CLASS_WITH_JSON(SolidUiServer, "soliduiserver.json")
 
 SolidUiServer::SolidUiServer(QObject* parent, const QList<QVariant>&)
     : KDEDModule(parent)
 {
 }
 
 SolidUiServer::~SolidUiServer()
 {
 }
 
 void SolidUiServer::showPassphraseDialog(const QString &udi,
                                          const QString &returnService, const QString &returnObject,
                                          uint wId, const QString &appId)
 {
     if (m_idToPassphraseDialog.contains(returnService+':'+udi)) {
         KPasswordDialog *dialog = m_idToPassphraseDialog[returnService+':'+udi];
         dialog->activateWindow();
         return;
     }
 
     Solid::Device device(udi);
 
     KPasswordDialog *dialog = new KPasswordDialog(nullptr, KPasswordDialog::ShowKeepPassword);
 
     QString label = device.vendor();
     if (!label.isEmpty()) label+=' ';
     label+= device.product();
 
     dialog->setPrompt(i18n("'%1' needs a password to be accessed. Please enter a password.", label));
-    dialog->setPixmap(QIcon::fromTheme(device.icon()).pixmap(64, 64));
+    dialog->setIcon(QIcon::fromTheme(device.icon()));
     dialog->setProperty("soliduiserver.udi", udi);
     dialog->setProperty("soliduiserver.returnService", returnService);
     dialog->setProperty("soliduiserver.returnObject", returnObject);
 
     QString uuid;
     if (device.is<Solid::StorageVolume>())
         uuid = device.as<Solid::StorageVolume>()->uuid();
 
     // read the password from wallet and prefill it to the dialog
     if (!uuid.isEmpty()) {
         dialog->setProperty("soliduiserver.uuid", uuid);
 
         KWallet::Wallet * wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet(), (WId) wId);
         const QString folderName = QString::fromLatin1("SolidLuks");
         if (wallet && wallet->hasFolder(folderName)) {
             wallet->setFolder(folderName);
             QString savedPassword;
             if (wallet->readPassword(uuid, savedPassword) == 0) {
                 dialog->setKeepPassword(true);
                 dialog->setPassword(savedPassword);
             }
             wallet->closeWallet(wallet->walletName(), false);
         }
         delete wallet;
     }
 
 
     connect(dialog, &KPasswordDialog::gotPassword, this, &SolidUiServer::onPassphraseDialogCompleted);
     connect(dialog, &KPasswordDialog::rejected, this, &SolidUiServer::onPassphraseDialogRejected);
 
     m_idToPassphraseDialog[returnService+':'+udi] = dialog;
 
     reparentDialog(dialog, (WId)wId, appId, true);
     dialog->show();
 }
 
 void SolidUiServer::onPassphraseDialogCompleted(const QString &pass, bool keep)
 {
     KPasswordDialog *dialog = qobject_cast<KPasswordDialog*>(sender());
 
     if (dialog) {
         QString returnService = dialog->property("soliduiserver.returnService").toString();
         QString returnObject = dialog->property("soliduiserver.returnObject").toString();
         QDBusInterface returnIface(returnService, returnObject);
 
         QDBusReply<void> reply = returnIface.call(QStringLiteral("passphraseReply"), pass);
 
         QString udi = dialog->property("soliduiserver.udi").toString();
         m_idToPassphraseDialog.remove(returnService+':'+udi);
 
         if (!reply.isValid()) {
             qWarning() << "Impossible to send the passphrase to the application, D-Bus said: "
                        << reply.error().name() << ", " << reply.error().message() << endl;
             return;  // don't save into wallet if an error occurs
         }
 
         if (keep)  { // save the password into the wallet
             KWallet::Wallet * wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet(), 0);
             if (wallet) {
                 const QString folderName = QString::fromLatin1("SolidLuks");
                 const QString uuid = dialog->property("soliduiserver.uuid").toString();
                 if (!wallet->hasFolder(folderName))
                     wallet->createFolder(folderName);
                 if (wallet->setFolder(folderName))
                     wallet->writePassword(uuid, pass);
                 wallet->closeWallet(wallet->walletName(), false);
                 delete wallet;
             }
         }
     }
 }
 
 void SolidUiServer::onPassphraseDialogRejected()
 {
     onPassphraseDialogCompleted(QString(), false);
 }
 
 void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appId, bool modal)
 {
     Q_UNUSED(appId);
     // Code borrowed from kwalletd
 
     KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent
 
 #if HAVE_X11
     if (modal) {
         KWindowSystem::setState(dialog->winId(), NET::Modal);
     } else {
         KWindowSystem::clearState(dialog->winId(), NET::Modal);
     }
 #endif
 
     // allow dialog activation even if it interrupts, better than trying hacks
     // with keeping the dialog on top or on all desktops
     KUserTimestamp::updateUserTimestamp();
 }
 
 #include "soliduiserver.moc"