diff --git a/declarativeimports/core/iconitem.cpp b/declarativeimports/core/iconitem.cpp
index 6f21d780e..fa0562214 100644
--- a/declarativeimports/core/iconitem.cpp
+++ b/declarativeimports/core/iconitem.cpp
@@ -87,13 +87,13 @@ void IconItem::setSource(const QVariant &source)
         m_svgIcon->setImagePath("toolbar-icons/" + source.toString().split("-").first());
 
         //try as a svg normal icon (like systray)
-        if (!m_svgIcon->isValid()) {
+        if (!m_svgIcon->isValid() || !m_svgIcon->hasElement(m_source.toString())) {
             m_svgIcon->setImagePath("icons/" + source.toString().split("-").first());
         }
         m_svgIcon->setContainsMultipleImages(true);
 
         //success?
-        if (m_svgIcon->isValid()) {
+        if (m_svgIcon->isValid() && m_svgIcon->hasElement(m_source.toString())) {
             m_icon = QIcon();
 
         //ok, svg not available