diff --git a/core/smb4kshare.cpp b/core/smb4kshare.cpp
index 96ee81e..40164a1 100644
--- a/core/smb4kshare.cpp
+++ b/core/smb4kshare.cpp
@@ -1,666 +1,699 @@
 /***************************************************************************
     Smb4K's container class for information about a share.
                              -------------------
     begin                : Mo Jan 28 2008
     copyright            : (C) 2008-2019 by Alexander Reinholdt
     email                : alexander.reinholdt@kdemail.net
  ***************************************************************************/
 
 /***************************************************************************
  *   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, Suite 500, Boston,*
  *   MA 02110-1335, USA                                                    *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
 // application specific includes
 #include "smb4kshare.h"
 #include "smb4kauthinfo.h"
 
 // Qt include
 #include <QDir>
 #include <QUrl>
 
 // KDE includes
 #define TRANSLATION_DOMAIN "smb4k-core"
 #include <KI18n/KLocalizedString>
 #include <KIOCore/KIO/Global>
 #include <KIconThemes/KIconLoader>
 #include <KIOCore/KMountPoint>
+#include "kiconthemes_version.h"
 
 
 class Smb4KSharePrivate
 {
   public:
     QString workgroup;
     QString comment;
     QHostAddress ip;
     QString path;
     bool inaccessible;
     bool foreign;
     KUser user;
     KUserGroup group;
     qulonglong totalSpace;
     qulonglong freeSpace;
     qulonglong usedSpace;
     bool mounted;
     QString filesystem;
     Smb4KGlobal::ShareType shareType;
 };
 
 
 Smb4KShare::Smb4KShare(const QString &host, const QString &name)
 : Smb4KBasicNetworkItem(Share), d(new Smb4KSharePrivate)
 {
   d->inaccessible = false;
   d->foreign      = false;
   d->filesystem   = QString();
   d->user         = KUser(KUser::UseRealUserID);
   d->group        = KUserGroup(KUser::UseRealUserID);
   d->totalSpace   = -1;
   d->freeSpace    = -1;
   d->usedSpace    = -1;
   d->mounted      = false;
   d->shareType    = FileShare;
   setHostName(host);
   setShareName(name);
   setShareIcon();
 }
 
 
 Smb4KShare::Smb4KShare(const QUrl &url)
 : Smb4KBasicNetworkItem(Share), d(new Smb4KSharePrivate)
 {
   //
   // Set the private variables
   // 
   d->inaccessible = false;
   d->foreign      = false;
   d->filesystem   = QString();
   d->user         = KUser(KUser::UseRealUserID);
   d->group        = KUserGroup(KUser::UseRealUserID);
   d->totalSpace   = -1;
   d->freeSpace    = -1;
   d->usedSpace    = -1;
   d->mounted      = false;
   d->shareType    = FileShare;
   
   //
   // Set the URL
   // 
   *pUrl = url;
     
   //
   // Set the icon
   // 
   setShareIcon();
 }
 
 
 Smb4KShare::Smb4KShare(const Smb4KShare &s)
 : Smb4KBasicNetworkItem(Share), d(new Smb4KSharePrivate)
 {
   //
   // Copy the private variables
   // 
   *d = *s.d;
 
   //
   // Set the icon if necessary
   // 
   if (pIcon->isNull())
   {
     setShareIcon();
   }
 }
 
 
 
 Smb4KShare::Smb4KShare()
 : Smb4KBasicNetworkItem(Share), d(new Smb4KSharePrivate)
 {
   //
   // Set the private variables
   // 
   d->inaccessible = false;
   d->foreign      = false;
   d->filesystem   = QString();
   d->user         = KUser(KUser::UseRealUserID);
   d->group        = KUserGroup(KUser::UseRealUserID);
   d->totalSpace   = -1;
   d->freeSpace    = -1;
   d->usedSpace    = -1;
   d->mounted      = false;
   d->shareType    = FileShare;
   
   //
   // Set the URL
   //
   pUrl->setScheme("smb");
   
   //
   // Set the icon
   // 
   setShareIcon();
 }
 
 
 Smb4KShare::~Smb4KShare()
 {
 }
 
 
 void Smb4KShare::setShareName(const QString &name)
 {
   if (name.startsWith('/'))
   {
     pUrl->setPath(name.trimmed());
   }
   else
   {
     pUrl->setPath('/'+name.trimmed());
   }
   
   pUrl->setScheme("smb");
 }
 
 
 QString Smb4KShare::shareName() const
 {
   return pUrl->path().remove('/');
 }
 
 
 void Smb4KShare::setHostName(const QString &hostName)
 {
   pUrl->setHost(hostName.trimmed());
   pUrl->setScheme("smb");
 }
 
 
 QString Smb4KShare::hostName() const
 {
   return pUrl->host().toUpper();
 }
 
 
 QUrl Smb4KShare::homeUrl() const
 {
   QUrl u;
   
   if (isHomesShare() && !pUrl->userName().isEmpty())
   {
     u = *pUrl;
     u.setPath('/'+pUrl->userName(), QUrl::TolerantMode);
   }
   
   return u;
 }
 
 
 QString Smb4KShare::displayString(bool showHomesShare) const
 {
   if (showHomesShare && isHomesShare())
   {
     return i18n("%1 on %2", homeUrl().path().remove('/'), hostName());
   }
   
   return i18n("%1 on %2", shareName(), hostName());
 }
 
 
 void Smb4KShare::setWorkgroupName(const QString &workgroup)
 {
   d->workgroup = workgroup;
 }
 
 
 QString Smb4KShare::workgroupName() const
 {
   return d->workgroup;
 }
 
 
 void Smb4KShare::setShareType(Smb4KGlobal::ShareType type)
 {
   d->shareType = type;
   setShareIcon();
 }
 
 
 Smb4KGlobal::ShareType Smb4KShare::shareType() const
 {
   return d->shareType;
 }
 
 
 QString Smb4KShare::shareTypeString() const
 {
   QString typeString;
   
   switch (d->shareType)
   {
     case FileShare:
     {
       typeString = i18n("Disk");
       break;
     }
     case PrinterShare:
     {
       typeString = i18n("Printer");
       break;
     }
     case IpcShare:
     {
       typeString = i18n("IPC");
       break;
     }
     default:
     {
       break;
     }
   }
   
   return typeString;
 }
 
 
 void Smb4KShare::setComment(const QString &comment)
 {
   d->comment = comment;
 }
 
 
 QString Smb4KShare::comment() const
 {
   return d->comment;
 }
 
 
 void Smb4KShare::setHostIpAddress(const QString &ip)
 {
   d->ip.setAddress(ip);
 }
 
 
 void Smb4KShare::setHostIpAddress(const QHostAddress& address)
 {
   if (!address.isNull() && address.protocol() != QAbstractSocket::UnknownNetworkLayerProtocol)
   {
     d->ip = address;
   }
 }
 
 
 QString Smb4KShare::hostIpAddress() const
 {
   return d->ip.toString();
 }
 
 
 bool Smb4KShare::hasHostIpAddress() const
 {
   return !d->ip.isNull();
 }
 
 
 bool Smb4KShare::isHidden() const
 {
   return pUrl->path().endsWith('$');
 }
 
 
 bool Smb4KShare::isPrinter() const
 {
   return (d->shareType == PrinterShare);
 }
 
 
 void Smb4KShare::setPath(const QString &mountpoint)
 {
   d->path = mountpoint;
 }
 
 
 QString Smb4KShare::path() const
 {
   return d->path;
 }
 
 
 QString Smb4KShare::canonicalPath() const
 {
   return (d->inaccessible ? d->path : QDir(d->path).canonicalPath());
 }
 
 
 void Smb4KShare::setInaccessible(bool in)
 {
   d->inaccessible = in;
   setShareIcon();
 }
 
 
 bool Smb4KShare::isInaccessible() const
 {
   return (d->mounted && d->inaccessible);
 }
 
 
 void Smb4KShare::setForeign(bool foreign)
 {
   d->foreign = foreign;
   setShareIcon();
 }
 
 
 bool Smb4KShare::isForeign() const
 {
   return (d->mounted && d->foreign);
 }
 
 
 QString Smb4KShare::fileSystemString() const
 {
   if (!path().isEmpty() && d->filesystem.isEmpty())
   {
     KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath(path());
     d->filesystem = mp->mountType().toUpper();
   }
   
   return d->filesystem;
 }
 
 
 void Smb4KShare::setUser(const KUser &user)
 {
   d->user = user;
 }
 
 
 KUser Smb4KShare::user() const
 {
   return d->user;
 }
 
 
 void Smb4KShare::setGroup(const KUserGroup &group)
 {
   d->group = group;
 }
 
 
 KUserGroup Smb4KShare::group() const
 {
   return d->group;
 }
 
 
 void Smb4KShare::setMounted(bool mounted)
 {
   if (!isPrinter())
   {
     d->mounted = mounted;
     setShareIcon();
   }
 }
 
 
 bool Smb4KShare::isMounted() const
 {
   return d->mounted;
 }
 
 
 void Smb4KShare::setTotalDiskSpace(qulonglong size)
 {
   d->totalSpace = size;
 }
 
 
 qulonglong Smb4KShare::totalDiskSpace() const
 {
   return d->totalSpace;
 }
 
 
 QString Smb4KShare::totalDiskSpaceString() const
 {
   return KIO::convertSize(d->totalSpace);
 }
 
 
 void Smb4KShare::setFreeDiskSpace(qulonglong size)
 {
   d->freeSpace = size;
 }
 
 
 qulonglong Smb4KShare::freeDiskSpace() const
 {
   return d->freeSpace;
 }
 
 
 QString Smb4KShare::freeDiskSpaceString() const
 {
   return KIO::convertSize(d->freeSpace);
 }
 
 
 void Smb4KShare::setUsedDiskSpace(qulonglong size)
 {
   d->usedSpace = size;
 }
 
 
 qulonglong Smb4KShare::usedDiskSpace() const
 {
   return d->usedSpace;
 }
 
 
 QString Smb4KShare::usedDiskSpaceString() const
 {
   return KIO::convertSize(d->usedSpace);
 }
 
 
 qreal Smb4KShare::diskUsage() const
 {
   qreal used(usedDiskSpace());
   qreal total(totalDiskSpace());
 
   if (total > 0)
   {
     return used * 100 / total;
   }
   
   return 0;
 }
 
 
 QString Smb4KShare::diskUsageString() const
 {
   return QString("%1 %").arg(diskUsage(), 0, 'f', 1);
 }
 
 
 void Smb4KShare::setMountData(Smb4KShare *share)
 {
   Q_ASSERT(share);
 
   if (QString::compare(url().toString(QUrl::RemoveUserInfo|QUrl::RemovePort), 
                        share->url().toString(QUrl::RemoveUserInfo|QUrl::RemovePort), Qt::CaseInsensitive) == 0 &&
       (share->workgroupName().isEmpty() || QString::compare(workgroupName(), share->workgroupName(), Qt::CaseInsensitive) == 0))
   {
     d->path         = share->path();
     d->inaccessible = share->isInaccessible();
     d->foreign      = share->isForeign();
     d->user         = share->user();
     d->group        = share->group();
     d->totalSpace   = share->totalDiskSpace();
     d->freeSpace    = share->freeDiskSpace();
     d->usedSpace    = share->usedDiskSpace();
     d->mounted      = share->isMounted();
     d->shareType    = share->shareType();
     setShareIcon();
   }
 }
 
 
 void Smb4KShare::resetMountData()
 {
   d->path.clear();
   d->inaccessible = false;
   d->foreign      = false;
   d->user         = KUser(KUser::UseRealUserID);
   d->group        = KUserGroup(KUser::UseRealUserID);
   d->totalSpace   = -1;
   d->freeSpace    = -1;
   d->usedSpace    = -1;
   d->mounted      = false;
   d->shareType    = FileShare;
   setShareIcon();
 }
 
 
 bool Smb4KShare::isHomesShare() const
 {
   return pUrl->path().endsWith(QLatin1String("homes"));
 }
 
 
 void Smb4KShare::setPort(int port)
 {
   pUrl->setPort(port);
 }
 
 
 int Smb4KShare::port() const
 {
   return pUrl->port();
 }
 
 
 void Smb4KShare::setAuthInfo(Smb4KAuthInfo *authInfo)
 {
   // Avoid that the login is overwritten with an empty 
   // string if we have a homes share.
   if (!isHomesShare() || !authInfo->userName().isEmpty())
   {
     pUrl->setUserName(authInfo->userName());
     pUrl->setPassword(authInfo->password());
   }
 }
 
 
 void Smb4KShare::setLogin(const QString &login)
 {
   // Avoid that the login is overwritten with an empty 
   // string if we have a homes share.
   if (!isHomesShare() || !login.isEmpty())
   {
     pUrl->setUserName(login);
   }
 }
 
 
 QString Smb4KShare::login() const
 {
   return pUrl->userName();
 }
 
 
 void Smb4KShare::setPassword(const QString &passwd)
 {
   // Avoid that the password is overwritten with an empty 
   // string if we have a homes share.
   if (!isHomesShare() || !passwd.isEmpty())
   {
     pUrl->setPassword(passwd);
   }
 }
 
 
 QString Smb4KShare::password() const
 {
   return pUrl->password();
 }
 
 
+#if KICONTHEMES_VERSION < QT_VERSION_CHECK(5,52,0)
 void Smb4KShare::setShareIcon()
 {
-  // 
-  // We have three base icons: 
-  // - remote folder
-  // - locked folder
-  // - printer
-  //
   if (!isPrinter())
   {
     // Overlays
     QStringList overlays;
     
     if (isMounted())
     {
       overlays << "emblem-mounted";
     }
     else
     {
       overlays << "";
     }
 
     if (isForeign())
     {
       overlays << "emblem-warning";
     }
 
     if (!isInaccessible())
     {
       *pIcon = KDE::icon("folder-network", overlays);
     }
     else
     {
       *pIcon = KDE::icon("folder-locked", overlays);
     }
   }
   else
   {
     *pIcon = KDE::icon("printer");
   }
 }
+#else
+void Smb4KShare::setShareIcon()
+{
+  if (!isPrinter())
+  {
+    // Overlays
+    QStringList overlays;
+    
+    if (isMounted())
+    {
+      if (isForeign())
+      {
+        overlays << "emblem-warning";
+      }
+      else
+      {
+        overlays << "";
+      }
+      
+      overlays << "emblem-mounted";
+    }
+
+    if (!isInaccessible())
+    {
+      *pIcon = KDE::icon("folder-network", overlays);
+    }
+    else
+    {
+      *pIcon = KDE::icon("folder-locked", overlays);
+    }
+  }
+  else
+  {
+    *pIcon = KDE::icon("printer");
+  }
+}
+#endif
 
 
 void Smb4KShare::update(Smb4KShare* share)
 {
   if (QString::compare(workgroupName(), share->workgroupName(), Qt::CaseInsensitive) == 0 &&
       (QString::compare(url().toString(QUrl::RemoveUserInfo|QUrl::RemovePort),
                         share->url().toString(QUrl::RemoveUserInfo|QUrl::RemovePort),
                         Qt::CaseInsensitive) == 0 ||
        QString::compare(homeUrl().toString(QUrl::RemoveUserInfo|QUrl::RemovePort),
                         share->homeUrl().toString(QUrl::RemoveUserInfo|QUrl::RemovePort),
                         Qt::CaseInsensitive) == 0))
   {
     *pUrl = share->url();
     setMountData(share);
     setShareType(share->shareType());
     setComment(share->comment());
     setHostIpAddress(share->hostIpAddress());
   }
 }