diff --git a/declarativeimports/plasmacomponents/qml/IconLoader.qml b/declarativeimports/plasmacomponents/qml/IconLoader.qml
index 62718b845..8e9862a03 100644
--- a/declarativeimports/plasmacomponents/qml/IconLoader.qml
+++ b/declarativeimports/plasmacomponents/qml/IconLoader.qml
@@ -34,7 +34,11 @@ Item {
             valid = false
         }
 
-        svgIcon.imagePath = "icons/"+root.source.split("-")[0]
+        svgIcon.imagePath = "toolbar-icons/"+root.source.split("-")[0]
+        if (!svgIcon.isValid() || !svgIcon.hasElement(root.source)) {
+            svgIcon.imagePath = "icons/"+root.source.split("-")[0]
+        }
+
         if (svgIcon.isValid() && svgIcon.hasElement(root.source)) {
             imageLoader.sourceComponent = svgComponent
         } else if (root.source.indexOf(".") == -1 && root.source.indexOf(":") == -1) {