diff --git a/kcms/icons/iconthemes.cpp b/kcms/icons/iconthemes.cpp
index 1eb95102e..69e8af1e6 100644
--- a/kcms/icons/iconthemes.cpp
+++ b/kcms/icons/iconthemes.cpp
@@ -1,486 +1,491 @@
 /**
  *  Copyright (c) 2000 Antonio Larrosa <larrosa@kde.org>
  *  KDE Frameworks 5 port Copyright (C) 2013 Jonathan Riddell <jr@jriddell.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.
  */
 
 #include "iconthemes.h"
 
 #include <config-runtime.h>
 #include "config.h"
 
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <QFileInfo>
 #include <QLabel>
 #include <QPixmap>
 #include <QVBoxLayout>
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QTreeWidget>
 #include <QPainter>
 #include <QSvgRenderer>
 #include <QLoggingCategory>
 #include <QPushButton>
 #include <QProgressDialog>
 #include <qprogressbar.h>
 #include <QStandardPaths>
 #include <QUrl>
 #include <qtemporaryfile.h>
 #include <QApplication>
 #include <QProcess>
 
 #include <KBuildSycocaProgressDialog>
 #include <KLocalizedString>
 #include <KSharedDataCache>
 #include <KIconTheme>
 #include <KConfig>
 #include <KConfigGroup>
 #include <KSharedConfig>
 #include <KNS3/DownloadDialog>
 #include <KTar>
 
 #include <KMessageBox>
 #include <KIconLoader>
 #include <KIO/Job>
 #include <KIO/DeleteJob>
 #include <KUrlRequesterDialog>
 #include <KJobWidgets>
 #include <KTar>
 
 static const int ThemeNameRole = Qt::UserRole + 1;
 
 Q_LOGGING_CATEGORY(KCM_ICONS, "kcm_icons")
 
 IconThemesConfig::IconThemesConfig(QWidget *parent)
   : KCModule(parent)
 {
   QLoggingCategory::setFilterRules(QStringLiteral("kcm_icons.debug = true"));
   QVBoxLayout *topLayout = new QVBoxLayout(this);
 
   QFrame *m_preview=new QFrame(this);
   m_preview->setMinimumHeight(80);
 
   QHBoxLayout *lh2=new QHBoxLayout( m_preview );
   lh2->setSpacing(0);
   m_previewExec=new QLabel(m_preview);
   m_previewExec->setPixmap(DesktopIcon(QStringLiteral("system-run")));
   m_previewFolder=new QLabel(m_preview);
   m_previewFolder->setPixmap(DesktopIcon(QStringLiteral("folder")));
   m_previewDocument=new QLabel(m_preview);
   m_previewDocument->setPixmap(DesktopIcon(QStringLiteral("document")));
 
   lh2->addStretch(10);
   lh2->addWidget(m_previewExec);
   lh2->addStretch(1);
   lh2->addWidget(m_previewFolder);
   lh2->addStretch(1);
   lh2->addWidget(m_previewDocument);
   lh2->addStretch(10);
 
 
   m_iconThemes=new QTreeWidget(this/*"IconThemeList"*/);
   QStringList columns;
   columns.append(i18n("Name"));
   columns.append(i18n("Description"));
   m_iconThemes->setHeaderLabels(columns);
   m_iconThemes->setAllColumnsShowFocus( true );
   m_iconThemes->setRootIsDecorated(false);
   m_iconThemes->setSortingEnabled(true);
   m_iconThemes->sortByColumn(0, Qt::AscendingOrder);
   connect(m_iconThemes, &QTreeWidget::currentItemChanged, this, &IconThemesConfig::themeSelected);
 
   QPushButton *installButton=new QPushButton( QIcon::fromTheme(QStringLiteral("document-import")), i18n("Install from File"), this);
   installButton->setObjectName( QStringLiteral("InstallNewTheme" ));
   installButton->setToolTip(i18n("Install a theme archive file you already have locally"));
   installButton->setWhatsThis(i18n("If you already have a theme archive locally, this button will unpack it and make it available for KDE applications"));
   connect(installButton, &QPushButton::clicked, this, &IconThemesConfig::installNewTheme);
 
   QPushButton *newButton=new QPushButton( QIcon::fromTheme(QStringLiteral("get-hot-new-stuff")), i18n("Get new Theme"), this);
   newButton->setObjectName( QStringLiteral("GetNewTheme" ));
   newButton->setToolTip(i18n("Get new themes from the Internet"));
   newButton->setWhatsThis(i18n("You need to be connected to the Internet to use this action. A dialog will display a list of themes from the http://www.kde.org website. Clicking the Install button associated with a theme will install this theme locally."));
   connect(newButton, &QPushButton::clicked, this, &IconThemesConfig::getNewTheme);
 
   m_removeButton=new QPushButton( QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Remove Theme"), this);
   m_removeButton->setObjectName( QStringLiteral("RemoveTheme" ));
   m_removeButton->setToolTip(i18n("Remove the selected theme from your disk"));
   m_removeButton->setWhatsThis(i18n("This will remove the selected theme from your disk."));
   connect(m_removeButton, &QPushButton::clicked, this, &IconThemesConfig::removeSelectedTheme);
 
   topLayout->addWidget(m_preview);
   topLayout->addWidget(m_iconThemes);
   QHBoxLayout *lg = new QHBoxLayout();
   lg->addWidget(newButton);
   lg->addWidget(installButton);
   lg->addStretch(0);
   lg->addWidget(m_removeButton);
   topLayout->addLayout(lg);
 
   loadThemes();
 
   m_defaultTheme=iconThemeItem(KIconTheme::current());
   if (m_defaultTheme)
     m_iconThemes->setCurrentItem(m_defaultTheme);
   updateRemoveButton();
 
   m_iconThemes->setFocus();
 }
 
 IconThemesConfig::~IconThemesConfig()
 {
 }
 
 QTreeWidgetItem *IconThemesConfig::iconThemeItem(const QString &name)
 {
   for (int i = 0; i < m_iconThemes->topLevelItemCount(); ++i)
     if (m_iconThemes->topLevelItem(i)->data(0, ThemeNameRole).toString()==name)
       return m_iconThemes->topLevelItem(i);
 
   return 0L;
 }
 
 void IconThemesConfig::loadThemes()
 {
   m_iconThemes->clear();
   const QStringList themelist(KIconTheme::list());
   QString name;
   QString tname;
   QStringList::const_iterator it;
   QMap <QString, QString> themeNames;
   qCDebug(KCM_ICONS) << "Theme list:" << themelist << "<<"; // this is empty when I run it - jr
   for (it=themelist.constBegin(); it != themelist.constEnd(); ++it)
   {
     KIconTheme icontheme(*it);
     if (!icontheme.isValid()) qCDebug(KCM_ICONS) << "not a valid theme" << *it;
     if (icontheme.isHidden()) continue;
 
     name=icontheme.name();
     tname=name;
 
  //  Just in case we have duplicated icon theme names on separate directories
     for (int i = 2; themeNames.find(tname) != themeNames.end(); ++i)
         tname=QStringLiteral("%1-%2").arg(name).arg(i);
 
     QTreeWidgetItem *newitem = new QTreeWidgetItem();
     newitem->setText(0, name);
     newitem->setText(1, icontheme.description());
     newitem->setData(0, ThemeNameRole, *it);
     m_iconThemes->addTopLevelItem(newitem);
 
     themeNames.insert(name, *it);
   }
   m_iconThemes->resizeColumnToContents(0);
 }
 
 void IconThemesConfig::installNewTheme()
 {
   QUrl themeURL = KUrlRequesterDialog::getUrl(QUrl(), this, i18n("Drag or Type Theme URL"));
   if (themeURL.url().isEmpty()) return;
 
   qCDebug(KCM_ICONS) << themeURL;
   QTemporaryFile file;
   // themeTmpFile contains the name of the downloaded file
 
   KJob* job = KIO::storedGet(themeURL);
   KJobWidgets::setWindow(job, this);
   if (!file.open()) {
     KMessageBox::sorry(this, i18n("Unable to create a temporary file."));
     return;
   } else if (!job->exec()) {
     QString sorryText;
     if (themeURL.isLocalFile())
        sorryText = i18n("Unable to find the icon theme archive %1.",
                         themeURL.toString());
     else
        sorryText = i18n("Unable to download the icon theme archive;\n"
                         "please check that address %1 is correct.",
                         themeURL.toString());
     KMessageBox::sorry(this, sorryText);
     return;
   }
 
   QStringList themesNames = findThemeDirs(file.fileName());
   if (themesNames.isEmpty()) {
     QString invalidArch(i18n("The file is not a valid icon theme archive."));
     KMessageBox::error(this, invalidArch);
     return;
   }
 
   if (!installThemes(themesNames, file.fileName())) {
     //FIXME: make me able to know what is wrong....
     // QStringList instead of bool?
     QString somethingWrong =
         i18n("A problem occurred during the installation process; "
              "however, most of the themes in the archive have been installed");
     KMessageBox::error(this, somethingWrong);
   }
 
   KIconLoader::global()->newIconLoader();
   loadThemes();
 
   QTreeWidgetItem *item=iconThemeItem(KIconTheme::current());
   if (item)
     m_iconThemes->setCurrentItem(item);
   updateRemoveButton();
 }
 
 bool IconThemesConfig::installThemes(const QStringList &themes, const QString &archiveName)
 {
   bool everythingOk = true;
   QString localThemesDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/icons/") + "./");
 
   QProgressDialog progressDiag(this);
   progressDiag.setLabelText(i18n("Installing icon themes..."));
   progressDiag.setModal(true);
   progressDiag.setAutoClose(true);
   progressDiag.setRange(0, themes.count());
   progressDiag.show();
 
   KTar archive(archiveName);
   archive.open(QIODevice::ReadOnly);
   qApp->processEvents();
 
   const KArchiveDirectory* rootDir = archive.directory();
 
   KArchiveDirectory* currentTheme;
   for (QStringList::ConstIterator it = themes.begin();
        it != themes.end();
        ++it) {
     progressDiag.setLabelText(
         i18n("<qt>Installing <strong>%1</strong> theme</qt>",
          *it));
     qApp->processEvents();
 
     if (progressDiag.wasCanceled())
       break;
 
     currentTheme = dynamic_cast<KArchiveDirectory*>(
                      const_cast<KArchiveEntry*>(
                        rootDir->entry(*it)));
     if (currentTheme == NULL) {
       // we tell back that something went wrong, but try to install as much
       // as possible
       everythingOk = false;
       continue;
     }
 
     currentTheme->copyTo(localThemesDir + *it);
     progressDiag.setValue(progressDiag.value()+1);
   }
 
   archive.close();
   return everythingOk;
 }
 
 QStringList IconThemesConfig::findThemeDirs(const QString &archiveName)
 {
   QStringList foundThemes;
 
   KTar archive(archiveName);
   archive.open(QIODevice::ReadOnly);
   const KArchiveDirectory* themeDir = archive.directory();
 
   KArchiveEntry* possibleDir = 0L;
   KArchiveDirectory* subDir = 0L;
 
   // iterate all the dirs looking for an index.theme or index.desktop file
   QStringList entries = themeDir->entries();
   for (QStringList::const_iterator it = entries.constBegin();
        it != entries.constEnd();
        ++it) {
     possibleDir = const_cast<KArchiveEntry*>(themeDir->entry(*it));
     if (possibleDir->isDirectory()) {
       subDir = dynamic_cast<KArchiveDirectory*>( possibleDir );
       if (subDir && (subDir->entry(QStringLiteral("index.theme")) != NULL ||
                      subDir->entry(QStringLiteral("index.desktop")) != NULL))
         foundThemes.append(subDir->name());
     }
   }
 
   archive.close();
   return foundThemes;
 }
 
 void IconThemesConfig::getNewTheme()
 {
   KNS3::DownloadDialog dialog(QStringLiteral("icons.knsrc"), this);
   dialog.exec();
   if (!dialog.changedEntries().isEmpty()) {
     // reload the display icontheme items
     KIconLoader::global()->newIconLoader();
     loadThemes();
     QTreeWidgetItem *item=iconThemeItem(KIconTheme::current());
     if (item)
         m_iconThemes->setCurrentItem(item);
     updateRemoveButton();
     load();
   }
 }
 
 void IconThemesConfig::removeSelectedTheme()
 {
   QTreeWidgetItem *selected = m_iconThemes->currentItem();
   if (!selected)
      return;
 
   QString question=i18n("<qt>Are you sure you want to remove the "
         "<strong>%1</strong> icon theme?<br />"
         "<br />"
         "This will delete the files installed by this theme.</qt>",
 	selected->text(0));
 
   bool deletingCurrentTheme=(selected==iconThemeItem(KIconTheme::current()));
 
   int r=KMessageBox::warningContinueCancel(this,question,i18n("Confirmation"),KStandardGuiItem::del());
   if (r!=KMessageBox::Continue) return;
 
   KIconTheme icontheme(selected->data(0, ThemeNameRole).toString());
 
   // delete the index file before the async KIO::del so loadThemes() will
   // ignore that dir.
   unlink(QFile::encodeName(icontheme.dir()+"/index.theme").data());
   unlink(QFile::encodeName(icontheme.dir()+"/index.desktop").data());
   KIO::del(QUrl( icontheme.dir() ));
 
   KIconLoader::global()->newIconLoader();
 
   loadThemes();
 
   QTreeWidgetItem *item=0L;
   //Fallback to the default if we've deleted the current theme
   if (!deletingCurrentTheme)
      item=iconThemeItem(KIconTheme::current());
   if (!item)
      item=iconThemeItem(KIconTheme::defaultThemeName());
 
   if (item)
     m_iconThemes->setCurrentItem(item);
   updateRemoveButton();
 
   if (deletingCurrentTheme) // Change the configuration
     save();
 }
 
 void IconThemesConfig::updateRemoveButton()
 {
   QTreeWidgetItem *selected = m_iconThemes->currentItem();
   bool enabled = false;
   if (selected)
   {
     QString selectedtheme = selected->data(0, ThemeNameRole).toString();
     KIconTheme icontheme(selectedtheme);
     QFileInfo fi(icontheme.dir());
     enabled = fi.isWritable();
     // Don't let users remove the current theme.
     if (selectedtheme == KIconTheme::current() ||
         selectedtheme == KIconTheme::defaultThemeName())
       enabled = false;
   }
   m_removeButton->setEnabled(enabled);
 }
 
 void loadPreview(QLabel *label, KIconTheme& icontheme, const QStringList& iconnames)
 {
+    const qreal dpr = label->devicePixelRatioF();
+
     //Given the icontheme loads a preview of an icon (several names are allowed for old theme standards) into the pixmap of the given label
-    const int size = qMin(48, icontheme.defaultSize(KIconLoader::Desktop));
+    const int size = qMin(48, icontheme.defaultSize(KIconLoader::Desktop)) * dpr;
     QSvgRenderer renderer;
     foreach(const QString &iconthemename, QStringList() << icontheme.internalName() << icontheme.inherits()) {
       foreach(const QString &name, iconnames) {
         //load the icon image
         QString path = KIconTheme(iconthemename).iconPath(QStringLiteral("%1.png").arg(name), size, KIconLoader::MatchBest);
         if (path != QString()) {
-            label->setPixmap(QPixmap(path).scaled(size, size));
+            QPixmap pixmap(path);
+            pixmap.setDevicePixelRatio(dpr);
+            label->setPixmap(pixmap.scaled(size, size));
             return;
         }
         //could not find the .png, try loading the .svg or .svgz
         path = KIconTheme(iconthemename).iconPath(QStringLiteral("%1.svg").arg(name), size, KIconLoader::MatchBest);
         if( path == QString() ) {
             path = KIconTheme(iconthemename).iconPath(QStringLiteral("%1.svgz").arg(name), size, KIconLoader::MatchBest);
             if( path == QString() ) {
                 continue;
             }
         }
         if (renderer.load(path)) {
-            QPixmap pix(size, size);
-            pix.fill(label->palette().color(QPalette::Background));
+            QPixmap pix(size * dpr, size * dpr);
+            pix.setDevicePixelRatio(dpr);
+            pix.fill(QColor(Qt::transparent));
             QPainter p(&pix);
             p.setViewport(0, 0, size, size);
             renderer.render(&p);
             label->setPixmap(pix.scaled(size, size));
             return;
         }
       }
     }
     label->setPixmap(QPixmap());
 }
 
 void IconThemesConfig::themeSelected(QTreeWidgetItem *item)
 {
   if (!item) return;
 
   QString dirName(item->data(0, ThemeNameRole).toString());
   KIconTheme icontheme(dirName);
   if (!icontheme.isValid()) qCDebug(KCM_ICONS) << "notvalid\n";
 
   updateRemoveButton();
 
   loadPreview(m_previewExec,     icontheme, QStringList() << QStringLiteral("system-run") << QStringLiteral("exec"));
   loadPreview(m_previewFolder,   icontheme, QStringList() << QStringLiteral("folder"));
   loadPreview(m_previewDocument, icontheme, QStringList() << QStringLiteral("document") << QStringLiteral("text-x-generic"));
 
   emit changed(true);
   m_bChanged = true;
 }
 
 void IconThemesConfig::load()
 {
   m_defaultTheme=iconThemeItem(KIconTheme::current());
   if (m_defaultTheme)
     m_iconThemes->setCurrentItem(m_defaultTheme);
   emit changed(false);
   m_bChanged = false;
 }
 
 void IconThemesConfig::save()
 {
   if (!m_bChanged)
      return;
   QTreeWidgetItem *selected = m_iconThemes->currentItem();
   if (!selected)
      return;
 
   QProcess::startDetached(CMAKE_INSTALL_FULL_LIBEXECDIR "/plasma-changeicons", {selected->data(0, ThemeNameRole).toString()});
 
   emit changed(false);
 
   m_bChanged = false;
   m_removeButton->setEnabled(false);
 }
 
 void IconThemesConfig::defaults()
 {
   if (m_iconThemes->currentItem()==m_defaultTheme) return;
 
   if (m_defaultTheme)
     m_iconThemes->setCurrentItem(m_defaultTheme);
   updateRemoveButton();
 
   emit changed(true);
   m_bChanged = true;
 }