diff --git a/plugins/xpath/intellij.xpath.iml b/plugins/xpath/intellij.xpath.iml
index 6f30a86fd65f..ba1dbad30da2 100644
--- a/plugins/xpath/intellij.xpath.iml
+++ b/plugins/xpath/intellij.xpath.iml
@@ -7,6 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/xpath-lang/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/xpath-view/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/xpath-lang/gen" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/xpath-lang/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java b/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java
index 16142e4ffef1..48b52cadb38f 100644
--- a/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java
+++ b/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package icons;
 
 import com.intellij.openapi.util.IconLoader;
@@ -18,7 +19,6 @@ public class XpathIcons {
   public static final Icon Function = load("/icons/function.png"); // 18x18
   public static final Icon Namespace = load("/icons/namespace.png"); // 21x21
   public static final Icon Template = load("/icons/template.png"); // 18x18
-  public static final Icon Xml = load("/icons/xml.png"); // 16x16
   public static final Icon Xpath = load("/icons/xpath.png"); // 12x16
   public static final Icon Xslt_filetype_overlay = load("/icons/xslt-filetype-overlay.png"); // 11x16
   public static final Icon Xslt = load("/icons/xslt.png"); // 16x16
diff --git a/plugins/xpath/xpath-lang/src/icons/association.png b/plugins/xpath/xpath-lang/resources/icons/association.png
similarity index 100%
rename from plugins/xpath/xpath-lang/src/icons/association.png
rename to plugins/xpath/xpath-lang/resources/icons/association.png
diff --git a/plugins/xpath/xpath-lang/src/icons/association_small.png b/plugins/xpath/xpath-lang/resources/icons/association_small.png
similarity index 100%
rename from plugins/xpath/xpath-lang/src/icons/association_small.png
rename to plugins/xpath/xpath-lang/resources/icons/association_small.png
diff --git a/plugins/xpath/xpath-lang/src/icons/function.png b/plugins/xpath/xpath-lang/resources/icons/function.png
similarity index 100%
rename from plugins/xpath/xpath-lang/src/icons/function.png
rename to plugins/xpath/xpath-lang/resources/icons/function.png
diff --git a/plugins/xpath/xpath-lang/src/icons/namespace.png b/plugins/xpath/xpath-lang/resources/icons/namespace.png
similarity index 100%
rename from plugins/xpath/xpath-lang/src/icons/namespace.png
rename to plugins/xpath/xpath-lang/resources/icons/namespace.png
diff --git a/plugins/xpath/xpath-lang/src/icons/template.png b/plugins/xpath/xpath-lang/resources/icons/template.png
similarity index 100%
rename from plugins/xpath/xpath-lang/src/icons/template.png
rename to plugins/xpath/xpath-lang/resources/icons/template.png
diff --git a/plugins/xpath/xpath-lang/src/icons/xpath.png b/plugins/xpath/xpath-lang/resources/icons/xpath.png
similarity index 100%
rename from plugins/xpath/xpath-lang/src/icons/xpath.png
rename to plugins/xpath/xpath-lang/resources/icons/xpath.png
diff --git a/plugins/xpath/xpath-lang/src/icons/xslt-filetype-overlay.png b/plugins/xpath/xpath-lang/resources/icons/xslt-filetype-overlay.png
similarity index 100%
rename from plugins/xpath/xpath-lang/src/icons/xslt-filetype-overlay.png
rename to plugins/xpath/xpath-lang/resources/icons/xslt-filetype-overlay.png
diff --git a/plugins/xpath/xpath-lang/src/icons/xslt.png b/plugins/xpath/xpath-lang/resources/icons/xslt.png
similarity index 100%
rename from plugins/xpath/xpath-lang/src/icons/xslt.png
rename to plugins/xpath/xpath-lang/resources/icons/xslt.png