Index: src/core/global.cpp
===================================================================
--- src/core/global.cpp
+++ src/core/global.cpp
@@ -372,9 +372,17 @@
     const QString mimeTypeIcon = mt.iconName();
     QString i = mimeTypeIcon;
 
-    // check whether it's a xdg location (e.g. Pictures folder)
-    if (url.isLocalFile() && mt.inherits(QLatin1String("inode/directory"))) {
-        i = KIOPrivate::iconForStandardPath(url.toLocalFile());
+    if (mt.inherits(QLatin1String("inode/directory"))) {
+        // Check to see if the folder has a custom icon
+        QString customIcon = iconFromDirectoryFile(url.toLocalFile());
+        if (!customIcon.isEmpty()) {
+            return customIcon;
+        }
+
+        // Check to see if it's an xdg location (e.g. Pictures folder)
+        if (url.isLocalFile()) {
+            i = KIOPrivate::iconForStandardPath(url.toLocalFile());
+        }
     }
 
     // if we don't find an icon, maybe we can use the one for the protocol