diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp
index 84587b9c4..2a5a0579b 100644
--- a/src/libs/ifc/xml/vabstractpattern.cpp
+++ b/src/libs/ifc/xml/vabstractpattern.cpp
@@ -952,14 +952,9 @@ QString VAbstractPattern::GetImageExtension() const
 //---------------------------------------------------------------------------------------------------------------------
 void VAbstractPattern::SetImage(const QString &text, const QString &extension)
 {
-    CheckTagExists(TagImage);
-    setTagText(TagImage, text);
-    QDomNodeList list = elementsByTagName(TagImage);
-    for (int i=0; i < list.size(); ++i)
-    {
-        QDomElement dom = list.at(i).toElement();
-        dom.setAttribute(AttrExtension, extension);
-    }
+    QDomElement imageElement = CheckTagExists(TagImage);
+    setTagText(imageElement, text);
+    CheckTagExists(TagImage).setAttribute(AttrExtension, extension);
     modified = true;
     emit patternChanged(false);
 }
@@ -968,12 +963,7 @@ void VAbstractPattern::SetImage(const QString &text, const QString &extension)
 void VAbstractPattern::DeleteImage()
 {
     QDomElement pattern = documentElement();
-    const QDomNodeList images = this->elementsByTagName(TagImage);
-    for (int i=0; i<images.count(); ++i)
-    {
-        QDomNode image = images.at(i);
-        pattern.removeChild(image);
-    }
+    pattern.removeChild(CheckTagExists(TagImage));
     modified = true;
     emit patternChanged(false);
 }
diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp
index 59215996b..3605e8335 100644
--- a/src/libs/ifc/xml/vdomdocument.cpp
+++ b/src/libs/ifc/xml/vdomdocument.cpp
@@ -698,24 +698,30 @@ bool VDomDocument::setTagText(const QString &tag, const QString &text)
         if (domNode.isNull() == false && domNode.isElement())
         {
             const QDomElement domElement = domNode.toElement();
-            if (domElement.isNull() == false)
-            {
-                QDomElement parent = domElement.parentNode().toElement();
-                QDomElement newTag = createElement(tag);
-                if (not text.isEmpty())
-                {
-                    const QDomText newTagText = createTextNode(text);
-                    newTag.appendChild(newTagText);
-                }
-
-                parent.replaceChild(newTag, domElement);
-                return true;
-            }
+            setTagText(domElement, text);
         }
     }
     return false;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+bool VDomDocument::setTagText(const QDomElement &domElement, const QString &text)
+{
+    if (domElement.isNull() == false)
+    {
+        QDomElement parent = domElement.parentNode().toElement();
+        QDomElement newTag = createElement(domElement.tagName());
+        if (not text.isEmpty())
+        {
+            const QDomText newTagText = createTextNode(text);
+            newTag.appendChild(newTagText);
+        }
+        parent.replaceChild(newTag, domElement);
+        return true;
+    }
+    return false;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief RemoveAllChildren remove all children from file.
diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h
index 538bdabcd..4972d7796 100644
--- a/src/libs/ifc/xml/vdomdocument.h
+++ b/src/libs/ifc/xml/vdomdocument.h
@@ -115,6 +115,7 @@ public:
 
 protected:
     bool           setTagText(const QString &tag, const QString &text);
+    bool           setTagText(const QDomElement &domElement, const QString &text);
     QString        UniqueTagText(const QString &tagName, const QString &defVal = QString()) const;
 
     void           TestUniqueId() const;