diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/icons/model.png b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/icons/model.png
new file mode 100644
index 000000000..dcddb66ff
Binary files /dev/null and b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/icons/model.png differ
diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/icons/model@2x.png b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/icons/model@2x.png
new file mode 100644
index 000000000..d59a5f9e6
Binary files /dev/null and b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/icons/model@2x.png differ
diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps
index 39fcb0891..b812a013b 100644
--- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps
+++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps
@@ -6,17 +6,19 @@
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
   </languages>
   <imports>
     <import index="slod" ref="r:0fac2319-607e-4342-a163-7b982bbd957e(com.mbeddr.mpsutil.modellisteners.runtime)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
   </imports>
   <registry>
+    <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
+      <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
+        <property id="2756621024541341363" name="file" index="1iqoE4" />
+      </concept>
+    </language>
     <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
       <concept id="481983775135178851" name="jetbrains.mps.lang.plugin.standalone.structure.ApplicationPluginInitBlock" flags="in" index="2uRRBj" />
       <concept id="481983775135178840" name="jetbrains.mps.lang.plugin.standalone.structure.ApplicationPluginDeclaration" flags="ng" index="2uRRBC">
@@ -30,6 +32,7 @@
     <language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect">
       <concept id="3433054418424672374" name="jetbrains.mps.lang.aspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
         <child id="6106419185511570295" name="mainLanguages" index="QG$2i" />
+        <child id="3433054418425083029" name="icon" index="3vqPLo" />
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -211,6 +214,9 @@
       <property role="2V$B1T" value="309e0004-4976-4416-b947-ec02ae4ecef2" />
       <property role="2V$B1Q" value="com.mbeddr.mpsutil.modellisteners" />
     </node>
+    <node concept="1QGGSu" id="1yLcVM11IJk" role="3vqPLo">
+      <property role="1iqoE4" value="${module}/icons/model.png" />
+    </node>
   </node>
 </model>
 
diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/icons/model.png b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/icons/model.png
new file mode 100644
index 000000000..dcddb66ff
Binary files /dev/null and b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/icons/model.png differ
diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/icons/model@2x.png b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/icons/model@2x.png
new file mode 100644
index 000000000..d59a5f9e6
Binary files /dev/null and b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/icons/model@2x.png differ
diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/plugin.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/plugin.mps
index b78cc3b13..8343cbace 100644
--- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/plugin.mps
+++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/plugin.mps
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:9386410a-9bfc-4734-bd77-6b4623a0ab93(de.q60.mps.shadowmodels.transformation.plugin)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports />
   <registry>
+    <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
+      <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
+        <property id="2756621024541341363" name="file" index="1iqoE4" />
+      </concept>
+    </language>
     <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
     </language>
@@ -18,6 +24,7 @@
       <concept id="3433054418424672374" name="jetbrains.mps.lang.aspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
         <child id="6106419185511570295" name="mainLanguages" index="QG$2i" />
         <child id="8222125370833980146" name="devkit" index="TkT64" />
+        <child id="3433054418425083029" name="icon" index="3vqPLo" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -46,6 +53,9 @@
       <property role="T9mpF" value="a2812d5e-a72e-4739-ab3f-d01ec647c5de" />
       <property role="T9mpE" value="de.q60.mps.shadowmodel.devkit" />
     </node>
+    <node concept="1QGGSu" id="1yLcVM11IJk" role="3vqPLo">
+      <property role="1iqoE4" value="${module}/icons/model.png" />
+    </node>
   </node>
   <node concept="2DaZZR" id="6ndA7L_L2I5" />
 </model>
diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/icons/model.png b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/icons/model.png
new file mode 100644
index 000000000..dcddb66ff
Binary files /dev/null and b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/icons/model.png differ
diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/icons/model@2x.png b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/icons/model@2x.png
new file mode 100644
index 000000000..d59a5f9e6
Binary files /dev/null and b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/icons/model@2x.png differ
diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/plugin.mps b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/plugin.mps
index 7edfe3d1e..c2ae26442 100644
--- a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/plugin.mps
+++ b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/plugin.mps
@@ -4,15 +4,23 @@
   <languages>
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
-  <imports />
+  <imports>
+    <import index="l7us" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.icons(MPS.Platform/)" />
+  </imports>
   <registry>
+    <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
+      <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
+        <property id="2756621024541341363" name="file" index="1iqoE4" />
+      </concept>
+    </language>
     <language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect">
       <concept id="3433054418424672374" name="jetbrains.mps.lang.aspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
         <child id="6106419185511570295" name="mainLanguages" index="QG$2i" />
+        <child id="3433054418425083029" name="icon" index="3vqPLo" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -22,7 +30,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -33,6 +41,9 @@
       <property role="2V$B1T" value="2b95e175-4fca-48d9-982b-58c954a32b02" />
       <property role="2V$B1Q" value="de.q60.mps.virtualinterfaces" />
     </node>
+    <node concept="1QGGSu" id="1yLcVM11IJk" role="3vqPLo">
+      <property role="1iqoE4" value="${module}/icons/model.png" />
+    </node>
   </node>
 </model>
 
diff --git a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/icons/model.png b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/icons/model.png
new file mode 100644
index 000000000..dcddb66ff
Binary files /dev/null and b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/icons/model.png differ
diff --git a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/icons/model@2x.png b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/icons/model@2x.png
new file mode 100644
index 000000000..d59a5f9e6
Binary files /dev/null and b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/icons/model@2x.png differ
diff --git a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/plugin.mps b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/plugin.mps
index f860e0695..667b6b092 100644
--- a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/plugin.mps
+++ b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/plugin.mps
@@ -8,8 +8,14 @@
   </languages>
   <imports>
     <import index="od2j" ref="r:19d224b8-fac8-4b19-ae42-e7b119858f3b(de.q60.mps.polymorphicfunctions.runtime)" />
+    <import index="l7us" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.icons(MPS.Platform/)" />
   </imports>
   <registry>
+    <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
+      <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
+        <property id="2756621024541341363" name="file" index="1iqoE4" />
+      </concept>
+    </language>
     <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
       <concept id="481983775135178840" name="jetbrains.mps.lang.plugin.standalone.structure.ApplicationPluginDeclaration" flags="ng" index="2uRRBC">
         <child id="481983775135178843" name="disposeBlock" index="2uRRBF" />
@@ -20,6 +26,7 @@
     <language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect">
       <concept id="3433054418424672374" name="jetbrains.mps.lang.aspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
         <child id="6106419185511570295" name="mainLanguages" index="QG$2i" />
+        <child id="3433054418425083029" name="icon" index="3vqPLo" />
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -46,7 +53,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
     </language>
@@ -57,7 +64,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -69,6 +76,9 @@
       <property role="2V$B1T" value="bc963c22-d419-49b6-8543-ea411eb9d3a1" />
       <property role="2V$B1Q" value="de.q60.mps.polymorphicfunctions" />
     </node>
+    <node concept="1QGGSu" id="1yLcVM11IJk" role="3vqPLo">
+      <property role="1iqoE4" value="${module}/icons/model.png" />
+    </node>
   </node>
   <node concept="2uRRBC" id="6N6zH_i3F_8">
     <property role="TrG5h" value="ApplicationPlugin" />