diff --git a/artwork/bat/bat.png b/artwork/bat/bat.png
new file mode 100644
index 0000000..90a1f06
Binary files /dev/null and b/artwork/bat/bat.png differ
diff --git a/artwork/bat/bat@2x.png b/artwork/bat/bat@2x.png
new file mode 100644
index 0000000..751b4a0
Binary files /dev/null and b/artwork/bat/bat@2x.png differ
diff --git a/artwork/clojure/clojure.png b/artwork/clojure/clojure.png
new file mode 100644
index 0000000..dd40823
Binary files /dev/null and b/artwork/clojure/clojure.png differ
diff --git a/artwork/clojure/clojure@2x.png b/artwork/clojure/clojure@2x.png
new file mode 100644
index 0000000..7a4d7a0
Binary files /dev/null and b/artwork/clojure/clojure@2x.png differ
diff --git a/artwork/rust/rust.png b/artwork/rust/rust.png
new file mode 100644
index 0000000..ca96bb4
Binary files /dev/null and b/artwork/rust/rust.png differ
diff --git a/artwork/rust/rust@2x.png b/artwork/rust/rust@2x.png
new file mode 100644
index 0000000..36b3e76
Binary files /dev/null and b/artwork/rust/rust@2x.png differ
diff --git a/de.agilantis.language_pack/build.properties b/de.agilantis.language_pack/build.properties
index ee4aecc..8ad51cb 100644
--- a/de.agilantis.language_pack/build.properties
+++ b/de.agilantis.language_pack/build.properties
@@ -1,4 +1,2 @@
 bin.includes = META-INF/,\
-               lngeditor@2x.png,\
-               lngeditor.png,\
                plugin.xml
diff --git a/de.agilantis.language_pack/lngeditor.png b/de.agilantis.language_pack/lngeditor.png
deleted file mode 100644
index 59f1be7..0000000
Binary files a/de.agilantis.language_pack/lngeditor.png and /dev/null differ
diff --git a/de.agilantis.language_pack/lngeditor@2x.png b/de.agilantis.language_pack/lngeditor@2x.png
deleted file mode 100644
index 622aed5..0000000
Binary files a/de.agilantis.language_pack/lngeditor@2x.png and /dev/null differ
diff --git a/info.xml b/info.xml
index dba4ca5..7aef58d 100644
--- a/info.xml
+++ b/info.xml
@@ -17,10 +17,10 @@ https://en.wikipedia.org/w/api.php?action=query&format=xml&prop=pageprops&ppprop
  -->
 <info>
     <extension id="bat">
-        <language name="Batch" better-name="Batch File" wikidata="Q479833"/>
+        <language name="Batch" better-name="Batch File" wikidata="Q479833" icon="bat.png"/>
     </extension>
     <extension id="clojure">
-        <language name="Clojure" wikidata="Q51798"/>
+        <language name="Clojure" wikidata="Q51798" icon="clojure.png"/>
     </extension>
     <extension id="coffeescript">
         <language name="CoffeeScript" wikidata="Q1106819"/>
@@ -175,7 +175,7 @@ https://en.wikipedia.org/w/api.php?action=query&format=xml&prop=pageprops&ppprop
         <language name="Ruby" wikidata="Q161053" issues="syntax highlighting broken"/>
     </extension>
     <extension id="rust">
-        <language name="Rust" wikidata="Q575650"/>
+        <language name="Rust" wikidata="Q575650" icon="rust.png"/>
     </extension>
     <extension id="scss">
         <language name="SCSS" wikidata="Q1572865"/>
diff --git a/pom.xml b/pom.xml
index 2913ca7..ed59cb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,7 @@
                                                 <param name="base-url"
                                                     expression="https://raw.githubusercontent.com/@{dir}@{extension}"/>
                                                 <param name="info-file" expression="${project.basedir}/../info.xml"/>
+                                                <param name="icons-dir" expression="${project.basedir}/../artwork/@{extension}"/>
                                             </xslt>
                                             <subant inheritall="yes" inheritrefs="yes">
                                                 <fileset file="${project.build.directory}/generated_temp/@{extension}/build.xml"/>
diff --git a/transform_to_extension_build.xsl b/transform_to_extension_build.xsl
index c803fb6..f690e3b 100644
--- a/transform_to_extension_build.xsl
+++ b/transform_to_extension_build.xsl
@@ -6,6 +6,7 @@
     <xsl:param name="extension"/>
     <xsl:param name="base-url"/>
     <xsl:param name="info-file"/>
+    <xsl:param name="icons-dir"/>
 
     <!-- Wikidata link query -->
     <xsl:variable name="wikidata-link-query"
@@ -84,6 +85,12 @@
                                 <xsl:text>&lt;/href></xsl:text>
                             </xsl:attribute>
                         </echo>
+                        <xsl:if test="$language-info/@icon">
+                            <mkdir dir="${{project.build.directory}}/generated/${{extension}}"/>
+                            <copy todir="${{project.build.directory}}/generated/${{extension}}">
+                                <fileset dir="{$icons-dir}" includes="*.png"/>
+                            </copy>
+                        </xsl:if>
                     </xsl:if>
                 </xsl:for-each>
 
diff --git a/transform_to_plugin_snippet.xsl b/transform_to_plugin_snippet.xsl
index d964167..40643ee 100644
--- a/transform_to_plugin_snippet.xsl
+++ b/transform_to_plugin_snippet.xsl
@@ -112,11 +112,19 @@
                 </xsl:if>
 
                 <!-- editor icons -->
-                <extension point="org.eclipse.ui.genericeditor.icons">
-                    <xsl:for-each select="exsl:node-set($languages)/o">
-                        <icon contentType="lng.{e[@name='id']/@string}" icon="lngeditor.png"/>
-                    </xsl:for-each>
+                <xsl:if test="document($info-file)/info/extension[@id=$extension]/language/@icon">
+                    <extension point="org.eclipse.ui.genericeditor.icons">
+                        <xsl:for-each select="exsl:node-set($languages)/o">
+                            <xsl:variable name="language-name" select="a[@name='aliases']/v[1]/@string"/>
+                            <xsl:if test="document($info-file)/info/extension[@id=$extension]
+                                              /language[@name = $language-name]/@icon">
+                                <icon contentType="lng.{e[@name='id']/@string}"
+                                    icon="{$extension}/{document($info-file)/info/extension[@id=$extension]
+                                                            /language[@name = $language-name]/@icon}"/>
+                            </xsl:if>
+                        </xsl:for-each>
                 </extension>
+                </xsl:if>
 
             </xsl:if>