diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 0903c0555b..bc7905c527 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -34,7 +34,15 @@ Item
             Button
             {
                 text: model.name
-                iconSource: UM.Theme.getIcon(model.icon);
+                iconSource:
+                {
+                    var result = UM.Theme.getIcon(model.icon)
+                    if(result == "")
+                    {
+                        return model.location + "/" + model.icon
+                    }
+                    return result
+                }
 
                 checkable: true;
                 checked: model.active;