diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd
index 1f6ef0b6cb9..2ff15e160d3 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd
@@ -21,6 +21,7 @@
     <dependency reexport="false">67506b1e-43ad-47fe-a8e6-bc7837e9e11f(com.mbeddr.mpsutil.editingGuide)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">cc99dce1-49f3-4392-8dbf-e22ca47bd0af(org.modelix.model.api)</dependency>
+    <dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -52,6 +53,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
     <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
     <module reference="44ce4404-473f-43bf-a54c-40d7c6f01639(com.mbeddr.editingGuide)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/play.png b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/play.png
deleted file mode 100644
index 70e8629a85f..00000000000
Binary files a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/play.png and /dev/null differ
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task.svg b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task.svg
new file mode 100644
index 00000000000..b8d70b2cc68
--- /dev/null
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00002 14.0528C7.85812 14.0579 7.71386 14.0118 7.60895 13.9027C5.58951 11.8023 3.28756 12.6215 2.00294 13.3773C1.59499 13.6173 1 13.3303 1 12.857V3.4695C1 3.18531 1.15288 2.92515 1.4121 2.80867C2.56151 2.29219 5.85864 1.09521 8.00003 3.20167C10.1414 1.09521 13.4385 2.29219 14.5879 2.80867C14.8472 2.92515 15 3.18531 15 3.4695V12.857C15 13.3303 14.4051 13.6173 13.9971 13.3773C12.7125 12.6215 10.4105 11.8023 8.3911 13.9027C8.28619 14.0118 8.14193 14.0579 8.00002 14.0528ZM7.50002 4.13097C6.72801 3.22897 5.71886 2.96682 4.674 3.00316C3.61873 3.03987 2.60818 3.38648 2 3.64328V12.2424C2.67243 11.9094 3.53429 11.6052 4.49327 11.5696C5.47659 11.5331 6.51628 11.7821 7.50002 12.4869V4.13097ZM8.50002 12.4869C9.48377 11.7821 10.5235 11.5331 11.5068 11.5696C12.4658 11.6052 13.3276 11.9094 14 12.2424V3.64328C13.3919 3.38648 12.3813 3.03987 11.326 3.00316C10.2812 2.96682 9.27204 3.22897 8.50002 4.13097V12.4869Z" fill="#6C707E"/>
+</svg>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task_dark.svg b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task_dark.svg
new file mode 100644
index 00000000000..a65806c27bd
--- /dev/null
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task_dark.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00002 14.0528C7.85812 14.0579 7.71386 14.0118 7.60895 13.9027C5.58951 11.8023 3.28756 12.6215 2.00294 13.3773C1.59499 13.6173 1 13.3303 1 12.857V3.4695C1 3.18531 1.15288 2.92515 1.4121 2.80867C2.56151 2.29219 5.85864 1.09521 8.00003 3.20167C10.1414 1.09521 13.4385 2.29219 14.5879 2.80867C14.8472 2.92515 15 3.18531 15 3.4695V12.857C15 13.3303 14.4051 13.6173 13.9971 13.3773C12.7125 12.6215 10.4105 11.8023 8.3911 13.9027C8.28619 14.0118 8.14193 14.0579 8.00002 14.0528ZM7.50002 4.13097C6.72801 3.22897 5.71886 2.96682 4.674 3.00316C3.61873 3.03987 2.60818 3.38648 2 3.64328V12.2424C2.67243 11.9094 3.53429 11.6052 4.49327 11.5696C5.47659 11.5331 6.51628 11.7821 7.50002 12.4869V4.13097ZM8.50002 12.4869C9.48377 11.7821 10.5235 11.5331 11.5068 11.5696C12.4658 11.6052 13.3276 11.9094 14 12.2424V3.64328C13.3919 3.38648 12.3813 3.03987 11.326 3.00316C10.2812 2.96682 9.27204 3.22897 8.50002 4.13097V12.4869Z" fill="#CED0D6"/>
+</svg>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps
index 81f3cb72e80..67ceab2ab21 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps
@@ -30,6 +30,8 @@
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="v18h" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:kotlin(MPS.IDEA/)" />
     <import index="ksrs" ref="cc99dce1-49f3-4392-8dbf-e22ca47bd0af/java:kotlin.coroutines(org.modelix.model.api/)" />
+    <import index="jz16" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:icons(MPS.ThirdParty/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
   </imports>
@@ -68,7 +70,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -97,7 +99,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -168,7 +170,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -188,7 +190,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
@@ -215,7 +217,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -246,7 +248,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -769,12 +771,12 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
       <node concept="1oajcY" id="2QDtwSqDi2V" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="2QDtwSqDi2W" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/play.png" />
+    <node concept="1QGGSu" id="frftTv53d3" role="3Uehp1">
+      <property role="1iqoE4" value="${module}/icons/task.svg" />
     </node>
   </node>
   <node concept="sE7Ow" id="2NmTaRWDjVL">
-    <property role="TrG5h" value="openUserGUide" />
+    <property role="TrG5h" value="openUserGuide" />
     <property role="2uzpH1" value="mbeddr User Guide" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2NmTaRWDjZk" role="tncku">
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
index d02eb944c43..0828e9ea40f 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
@@ -11300,21 +11300,6 @@
         </node>
       </node>
     </node>
-    <node concept="398rNT" id="7eF9rfAuDUw" role="1l3spd">
-      <property role="TrG5h" value="mbeddr.analyses" />
-      <node concept="398BVA" id="7eF9rfAuDUx" role="398pKh">
-        <ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
-        <node concept="2Ry0Ak" id="7eF9rfAuDUy" role="iGT6I">
-          <property role="2Ry0Am" value="code" />
-          <node concept="2Ry0Ak" id="7eF9rfAuDUz" role="2Ry0An">
-            <property role="2Ry0Am" value="languages" />
-            <node concept="2Ry0Ak" id="7eF9rfAuDU$" role="2Ry0An">
-              <property role="2Ry0Am" value="com.mbeddr.analyses" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="398rNT" id="4MR$$QmqomQ" role="1l3spd">
       <property role="TrG5h" value="artifacts.root" />
     </node>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index 6ed7244cb11..2c7dde32312 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -302,13 +302,13 @@
       <node concept="m$_yC" id="64SK4bcNVGq" role="m$_yJ">
         <ref role="m$_y1" node="DnqfiuSO_Q" resolve="com.mbeddr.mpsutil.compare" />
       </node>
+      <node concept="m$_yC" id="4wBLq3Y5yV5" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
+      </node>
       <node concept="2iUeEo" id="7yAshxDtnaX" role="2iVFfd">
         <property role="2iUeEt" value="mbeddr" />
         <property role="2iUeEu" value="http://mbeddr.com" />
       </node>
-      <node concept="m$_yC" id="4wBLq3Y5yV5" role="m$_yJ">
-        <ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
-      </node>
       <node concept="m$_yC" id="2DDNE2eaR2F" role="m$_yJ">
         <ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
       </node>
@@ -2349,6 +2349,34 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
+        <node concept="1BupzO" id="4PRpvcZJNb5" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4PRpvcZJNb6" role="1HemKq">
+            <node concept="398BVA" id="4PRpvcZJNaQ" role="3LXTmr">
+              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
+              <node concept="2Ry0Ak" id="4PRpvcZJNaR" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="4PRpvcZJNaS" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.plantuml" />
+                  <node concept="2Ry0Ak" id="4PRpvcZJNaT" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="4PRpvcZJNaU" role="2Ry0An">
+                      <property role="2Ry0Am" value="pluginSolution" />
+                      <node concept="2Ry0Ak" id="4PRpvcZJNaV" role="2Ry0An">
+                        <property role="2Ry0Am" value="models" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4PRpvcZJNb7" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
         <node concept="1SiIV0" id="1dlPbo9VJHT" role="3bR37C">
           <node concept="1BurEX" id="1dlPbo9VJHU" role="1SiIV1">
             <node concept="398BVA" id="1dlPbo9VJHC" role="1BurEY">
@@ -2410,34 +2438,6 @@
             <ref role="3bR37D" to="90a9:2sSK94l$Dwp" resolve="de.itemis.stubs.xml" />
           </node>
         </node>
-        <node concept="1BupzO" id="4PRpvcZJNb5" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="4PRpvcZJNb6" role="1HemKq">
-            <node concept="398BVA" id="4PRpvcZJNaQ" role="3LXTmr">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="4PRpvcZJNaR" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="4PRpvcZJNaS" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.plantuml" />
-                  <node concept="2Ry0Ak" id="4PRpvcZJNaT" role="2Ry0An">
-                    <property role="2Ry0Am" value="solutions" />
-                    <node concept="2Ry0Ak" id="4PRpvcZJNaU" role="2Ry0An">
-                      <property role="2Ry0Am" value="pluginSolution" />
-                      <node concept="2Ry0Ak" id="4PRpvcZJNaV" role="2Ry0An">
-                        <property role="2Ry0Am" value="models" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="4PRpvcZJNb7" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="2N1CSrzSKpi" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7486,6 +7486,28 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
+        <node concept="1BupzO" id="4PRpvcZJNsP" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4PRpvcZJNsQ" role="1HemKq">
+            <node concept="398BVA" id="4PRpvcZJNsE" role="3LXTmr">
+              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
+              <node concept="2Ry0Ak" id="4PRpvcZJNsF" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="4PRpvcZJNsG" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.httpsupport.rt" />
+                  <node concept="2Ry0Ak" id="4PRpvcZJNsH" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4PRpvcZJNsR" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
         <node concept="1SiIV0" id="1dlPbo9VJTw" role="3bR37C">
           <node concept="1BurEX" id="1dlPbo9VJTx" role="1SiIV1">
             <node concept="398BVA" id="1dlPbo9VJTj" role="1BurEY">
@@ -7524,28 +7546,6 @@
             </node>
           </node>
         </node>
-        <node concept="1BupzO" id="4PRpvcZJNsP" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="4PRpvcZJNsQ" role="1HemKq">
-            <node concept="398BVA" id="4PRpvcZJNsE" role="3LXTmr">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="4PRpvcZJNsF" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="4PRpvcZJNsG" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.httpsupport.rt" />
-                  <node concept="2Ry0Ak" id="4PRpvcZJNsH" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="4PRpvcZJNsR" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="2N1CSrzsvbI" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -11618,6 +11618,11 @@
               </node>
             </node>
           </node>
+          <node concept="1SiIV0" id="1k8mMQapuLg" role="3bR37C">
+            <node concept="3bR9La" id="1k8mMQapuLh" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="7Hbe8h75E73" role="3bR37C">
           <node concept="3bR9La" id="7Hbe8h75E74" role="1SiIV1">
@@ -11867,11 +11872,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2hC83VQr5x" role="3bR37C">
-          <node concept="3bR9La" id="2hC83VQr5y" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
-          </node>
-        </node>
         <node concept="1BupzO" id="4PRpvcZJNIA" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -11894,6 +11894,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="2hC83VQr5x" role="3bR37C">
+          <node concept="3bR9La" id="2hC83VQr5y" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="3quoVcnGzl$" role="3989C9">
@@ -13007,6 +13012,44 @@
             <ref role="3bR37D" to="ffeo:1xb0AuwN7WS" resolve="JUnit" />
           </node>
         </node>
+        <node concept="1BupzO" id="4PRpvcZJNQx" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4PRpvcZJNQy" role="1HemKq">
+            <node concept="398BVA" id="4PRpvcZJNQm" role="3LXTmr">
+              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
+              <node concept="2Ry0Ak" id="4PRpvcZJNQn" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="4PRpvcZJNQo" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mockito" />
+                  <node concept="2Ry0Ak" id="4PRpvcZJNQp" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4PRpvcZJNQz" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="59cfP9ua2O$" role="3bR31x">
+          <node concept="3LXTmp" id="59cfP9ua2O_" role="3rtmxm">
+            <node concept="3qWCbU" id="59cfP9ua2OA" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="59cfP9ua2OB" role="3LXTmr">
+              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
+              <node concept="2Ry0Ak" id="59cfP9ua2OC" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="59cfP9ua2OD" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mockito" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="1SiIV0" id="1dlPbo9VK9P" role="3bR37C">
           <node concept="1BurEX" id="1dlPbo9VK9Q" role="1SiIV1">
             <node concept="398BVA" id="1dlPbo9VK9C" role="1BurEY">
@@ -13083,44 +13126,6 @@
             </node>
           </node>
         </node>
-        <node concept="1BupzO" id="4PRpvcZJNQx" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="4PRpvcZJNQy" role="1HemKq">
-            <node concept="398BVA" id="4PRpvcZJNQm" role="3LXTmr">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="4PRpvcZJNQn" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="4PRpvcZJNQo" role="2Ry0An">
-                  <property role="2Ry0Am" value="org.mockito" />
-                  <node concept="2Ry0Ak" id="4PRpvcZJNQp" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="4PRpvcZJNQz" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
-        <node concept="3rtmxn" id="59cfP9ua2O$" role="3bR31x">
-          <node concept="3LXTmp" id="59cfP9ua2O_" role="3rtmxm">
-            <node concept="3qWCbU" id="59cfP9ua2OA" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="398BVA" id="59cfP9ua2OB" role="3LXTmr">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="59cfP9ua2OC" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="59cfP9ua2OD" role="2Ry0An">
-                  <property role="2Ry0Am" value="org.mockito" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2G$12M" id="3quoVcnF8Rx" role="3989C9">
@@ -18833,6 +18838,28 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
           </node>
         </node>
+        <node concept="1BupzO" id="4PRpvcZJO4S" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4PRpvcZJO4T" role="1HemKq">
+            <node concept="398BVA" id="4PRpvcZJO4H" role="3LXTmr">
+              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
+              <node concept="2Ry0Ak" id="4PRpvcZJO4I" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="4PRpvcZJO4J" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.jfreechart.runtime" />
+                  <node concept="2Ry0Ak" id="4PRpvcZJO4K" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4PRpvcZJO4U" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
         <node concept="1SiIV0" id="1dlPbo9VKv3" role="3bR37C">
           <node concept="1BurEX" id="1dlPbo9VKv4" role="1SiIV1">
             <node concept="398BVA" id="1dlPbo9VKuQ" role="1BurEY">
@@ -18871,28 +18898,6 @@
             </node>
           </node>
         </node>
-        <node concept="1BupzO" id="4PRpvcZJO4S" role="3bR31x">
-          <property role="3ZfqAx" value="models" />
-          <property role="1Hdu6h" value="true" />
-          <property role="1HemKv" value="true" />
-          <node concept="3LXTmp" id="4PRpvcZJO4T" role="1HemKq">
-            <node concept="398BVA" id="4PRpvcZJO4H" role="3LXTmr">
-              <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
-              <node concept="2Ry0Ak" id="4PRpvcZJO4I" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="4PRpvcZJO4J" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.jfreechart.runtime" />
-                  <node concept="2Ry0Ak" id="4PRpvcZJO4K" role="2Ry0An">
-                    <property role="2Ry0Am" value="models" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3qWCbU" id="4PRpvcZJO4U" role="3LXTna">
-              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="7uOgiTapi$" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -19792,11 +19797,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1Alud3KWJdb" role="3bR37C">
-          <node concept="3bR9La" id="1Alud3KWJdc" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="1BupzO" id="4PRpvcZJO9z" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -19819,6 +19819,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="1Alud3KWJdb" role="3bR37C">
+          <node concept="3bR9La" id="1Alud3KWJdc" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
         <node concept="1SiIV0" id="1Alud3KWJdd" role="3bR37C">
           <node concept="3bR9La" id="1Alud3KWJde" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
@@ -19860,6 +19865,9 @@
       <node concept="m$_yC" id="NMVW79y25B" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
       </node>
+      <node concept="m$_yC" id="75qFqB425iF" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
+      </node>
       <node concept="3_J27D" id="NMVW79y25C" role="m_cZH">
         <node concept="3Mxwew" id="NMVW79y25D" role="3MwsjC">
           <property role="3MwjfP" value="com.mbeddr.mpsutil.json" />
@@ -19869,9 +19877,6 @@
         <property role="2iUeEt" value="mbeddr" />
         <property role="2iUeEu" value="http://mbeddr.com" />
       </node>
-      <node concept="m$_yC" id="75qFqB425iF" role="m$_yJ">
-        <ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
-      </node>
     </node>
     <node concept="2G$12M" id="48qh2gYg815" role="3989C9">
       <property role="TrG5h" value="com.mbeddr.core.codereview" />
@@ -20141,6 +20146,12 @@
         <ref role="398BVh" node="3AVJcIMlF95" resolve="artifacts.sl-all" />
       </node>
     </node>
+    <node concept="2sgV4H" id="1vIw1eCEpNB" role="1l3spa">
+      <ref role="1l3spb" node="4SMNYR2Zjjf" resolve="com.mbeddr.mpsutil.actionsfilter" />
+      <node concept="398BVA" id="1vIw1eCEpNC" role="2JcizS">
+        <ref role="398BVh" node="1vIw1eCEqqR" resolve="artifacts.actionsfilter" />
+      </node>
+    </node>
     <node concept="1l3spV" id="3AVJcIMlF9x" role="1l3spN">
       <node concept="L2wRC" id="3ZcHznn7Bvt" role="39821P">
         <ref role="L2wRA" node="7Pr7tifzlku" resolve="com.mbeddr.platform" />
@@ -20691,12 +20702,6 @@
               <ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
               <node concept="2Ry0Ak" id="6VdWf6S5EOM" role="iGT6I">
                 <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="6VdWf6S5EOR" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.mpsutil.genericactions" />
-                  <node concept="2Ry0Ak" id="6VdWf6S5EOW" role="2Ry0An">
-                    <property role="2Ry0Am" value="icons" />
-                  </node>
-                </node>
               </node>
             </node>
           </node>
@@ -20951,6 +20956,9 @@
       <node concept="m$_yC" id="3lcj7hzsAhP" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
       </node>
+      <node concept="m$_yC" id="4wBLq3Y5zxU" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
+      </node>
       <node concept="3_J27D" id="3lcj7hzsuXh" role="m$_yQ">
         <node concept="3Mxwew" id="3lcj7hzszbz" role="3MwsjC">
           <property role="3MwjfP" value="com.mbeddr.mpsutil.logicalChild" />
@@ -20973,15 +20981,6 @@
       <node concept="m$f5U" id="3lcj7hzs_XZ" role="m$_yh">
         <ref role="m$f5T" node="3lcj7hzsgVW" resolve="com.mbeddr.mpsutil.logicalChild" />
       </node>
-      <node concept="m$_yC" id="4wBLq3Y5zxU" role="m$_yJ">
-        <ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
-      </node>
-    </node>
-    <node concept="2sgV4H" id="1vIw1eCEpNB" role="1l3spa">
-      <ref role="1l3spb" node="4SMNYR2Zjjf" resolve="com.mbeddr.mpsutil.actionsfilter" />
-      <node concept="398BVA" id="1vIw1eCEpNC" role="2JcizS">
-        <ref role="398BVh" node="1vIw1eCEqqR" resolve="artifacts.actionsfilter" />
-      </node>
     </node>
     <node concept="2G$12M" id="2hNr1jFzOYr" role="3989C9">
       <property role="TrG5h" value="com.mbeddr.mpsutil.checkinHandler" />
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps
index e7939a282fa..8a44dc16063 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps
@@ -19,11 +19,12 @@
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="d244" ref="r:0a882e21-5553-485b-8777-3b0ace5a0d84(com.mbeddr.core.base.pluginSolution.plugin)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
   </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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -64,7 +65,7 @@
       <concept id="1562714432501166197" name="jetbrains.mps.lang.plugin.structure.KeymapChangesDeclaration" flags="ng" index="Zd50a">
         <child id="1562714432501166199" name="shortcutChange" index="Zd508" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -73,7 +74,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -92,6 +93,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -122,7 +126,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -131,7 +135,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -139,7 +143,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -177,7 +181,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -391,8 +395,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="TFjNjjzKQ3" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/check.png" />
+    <node concept="1QGGSu" id="6ghi$I1W7AX" role="3Uehp1">
+      <node concept="10M0yZ" id="6ghi$I1WacR" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="3JD5OqKQTX6">
@@ -560,8 +567,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="3JD5OqKQTYE" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/check.png" />
+    <node concept="1QGGSu" id="6ghi$I1WccG" role="3Uehp1">
+      <node concept="10M0yZ" id="6ghi$I1WdI0" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="7PQduOXsbmi">
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/icons/check.png b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/icons/check.png
deleted file mode 100644
index 5990f9d731a..00000000000
Binary files a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/icons/check.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps
index 26b56f6c2c0..ef0e4a9ca9c 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps
@@ -17,12 +17,13 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="rpdm" ref="r:91453863-abdf-432d-a851-57f349774287(com.mbeddr.cc.var.annotations.behavior)" />
     <import index="d244" ref="r:0a882e21-5553-485b-8777-3b0ace5a0d84(com.mbeddr.core.base.pluginSolution.plugin)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="qdv7" ref="r:1ff3d952-eae5-4d94-b89e-ea3060b11545(com.mbeddr.cc.var.annotations.structure)" implicit="true" />
   </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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -58,7 +59,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -101,7 +102,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -110,7 +111,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -118,7 +119,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
@@ -134,7 +135,7 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -216,8 +217,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="7QrLfqVNtaG" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/check.png" />
+    <node concept="1QGGSu" id="6ghi$I1WfLg" role="3Uehp1">
+      <node concept="10M0yZ" id="6ghi$I1WhbY" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="7TnSnE3by8X">
@@ -258,8 +262,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="7TnSnE3by9m" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/check.png" />
+    <node concept="1QGGSu" id="6ghi$I1W04A" role="3Uehp1">
+      <node concept="10M0yZ" id="6ghi$I1W6I8" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="7TnSnE3byA0">
@@ -300,8 +307,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="7TnSnE3byAp" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/check.png" />
+    <node concept="1QGGSu" id="6ghi$I1Wreg" role="3Uehp1">
+      <node concept="10M0yZ" id="6ghi$I1WsX_" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="7TnSnE3bz3Y">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment.png
deleted file mode 100644
index 5215c710583..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment.svg b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment.svg
new file mode 100644
index 00000000000..20f9922cfc5
--- /dev/null
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment.svg
@@ -0,0 +1,11 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="2.5" width="11" height="11" rx="1.5" stroke="#6C707E"/>
+<rect x="4.5" y="4.5" width="7" height="2" rx="0.5" stroke="#6C707E"/>
+<rect x="4.29999" y="8" width="1.4" height="1.4" rx="0.7" fill="#6C707E"/>
+<rect x="7.29999" y="8" width="1.4" height="1.4" rx="0.7" fill="#6C707E"/>
+<rect x="10.3" y="8" width="1.4" height="1.4" rx="0.7" fill="#6C707E"/>
+<rect x="4.29999" y="10.6001" width="1.4" height="1.4" rx="0.7" fill="#6C707E"/>
+<rect x="7.29999" y="10.6001" width="1.4" height="1.4" rx="0.7" fill="#6C707E"/>
+<rect x="10.3" y="10.6001" width="1.4" height="1.4" rx="0.7" fill="#6C707E"/>
+</svg>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment_dark.svg b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment_dark.svg
new file mode 100644
index 00000000000..07cb209136a
--- /dev/null
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment_dark.svg
@@ -0,0 +1,11 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="2.5" width="11" height="11" rx="1.5" stroke="#CED0D6"/>
+<rect x="4.5" y="4.5" width="7" height="2" rx="0.5" stroke="#CED0D6"/>
+<rect x="4.29999" y="8" width="1.4" height="1.4" rx="0.7" fill="#CED0D6"/>
+<rect x="7.29999" y="8" width="1.4" height="1.4" rx="0.7" fill="#CED0D6"/>
+<rect x="10.3" y="8" width="1.4" height="1.4" rx="0.7" fill="#CED0D6"/>
+<rect x="4.29999" y="10.6001" width="1.4" height="1.4" rx="0.7" fill="#CED0D6"/>
+<rect x="7.29999" y="10.6001" width="1.4" height="1.4" rx="0.7" fill="#CED0D6"/>
+<rect x="10.3" y="10.6001" width="1.4" height="1.4" rx="0.7" fill="#CED0D6"/>
+</svg>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/down.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/down.png
deleted file mode 100644
index e5c9b7e916d..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/down.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/left.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/left.png
deleted file mode 100644
index ab07a3168da..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/left.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/nodelist.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/nodelist.png
deleted file mode 100644
index bcd6ebd1a35..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/nodelist.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/right.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/right.png
deleted file mode 100644
index 582cf6e1c76..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/right.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/up.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/up.png
deleted file mode 100644
index b53238d60b7..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/up.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
index 7fd7fb63c16..080ef74df3a 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
@@ -74,6 +74,7 @@
     <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" />
     <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
   </imports>
   <registry>
     <language id="b8bb702e-43ed-4090-a902-d180d3e5f292" name="de.slisson.mps.conditionalEditor">
@@ -87,7 +88,7 @@
     </language>
     <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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
       <concept id="8974276187400029891" name="jetbrains.mps.lang.resources.structure.IconExpression" flags="nn" index="1QGGTA">
         <child id="8974276187400029893" name="icon" index="1QGGTw" />
@@ -5647,8 +5648,11 @@
               <ref role="3cqZAo" node="CPtprWNoG0" resolve="n" />
             </node>
             <node concept="1QGGTA" id="VuyCfHNr9y" role="37wK5m">
-              <node concept="1QGGSu" id="VuyCfHNr9z" role="1QGGTw">
-                <property role="1iqoE4" value="${module}/icons/up.png" />
+              <node concept="1QGGSu" id="frftTuZdvm" role="1QGGTw">
+                <node concept="10M0yZ" id="frftTuZfzF" role="3xaMm5">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowUp" resolve="ArrowUp" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+                </node>
               </node>
             </node>
           </node>
@@ -5669,14 +5673,17 @@
       <node concept="3Tm1VV" id="CPtprWNBIw" role="1B3o_S" />
       <node concept="3clFbS" id="CPtprWNBIx" role="3clF47">
         <node concept="3clFbF" id="CPtprWNBIy" role="3cqZAp">
-          <node concept="3P9mCS" id="CPtprWNBIz" role="3clFbG">
+          <node concept="3P9mCS" id="frftTv12qa" role="3clFbG">
             <ref role="37wK5l" node="CPtprWNpe6" resolve="createButtonWithIcon" />
-            <node concept="37vLTw" id="CPtprWNBI$" role="37wK5m">
+            <node concept="37vLTw" id="frftTv12qb" role="37wK5m">
               <ref role="3cqZAo" node="CPtprWNBIt" resolve="n" />
             </node>
-            <node concept="1QGGTA" id="VuyCfHNr1e" role="37wK5m">
-              <node concept="1QGGSu" id="VuyCfHNr1f" role="1QGGTw">
-                <property role="1iqoE4" value="${module}/icons/down.png" />
+            <node concept="1QGGTA" id="frftTv12qc" role="37wK5m">
+              <node concept="1QGGSu" id="frftTv12qd" role="1QGGTw">
+                <node concept="10M0yZ" id="frftTv12OJ" role="3xaMm5">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowDown" resolve="ArrowDown" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+                </node>
               </node>
             </node>
           </node>
@@ -5697,14 +5704,17 @@
       <node concept="3Tm1VV" id="CPtprWNBIE" role="1B3o_S" />
       <node concept="3clFbS" id="CPtprWNBIF" role="3clF47">
         <node concept="3clFbF" id="CPtprWNBIG" role="3cqZAp">
-          <node concept="3P9mCS" id="CPtprWNBIH" role="3clFbG">
+          <node concept="3P9mCS" id="frftTv13eb" role="3clFbG">
             <ref role="37wK5l" node="CPtprWNpe6" resolve="createButtonWithIcon" />
-            <node concept="37vLTw" id="CPtprWNBII" role="37wK5m">
+            <node concept="37vLTw" id="frftTv13ec" role="37wK5m">
               <ref role="3cqZAo" node="CPtprWNBIB" resolve="n" />
             </node>
-            <node concept="1QGGTA" id="VuyCfHNquM" role="37wK5m">
-              <node concept="1QGGSu" id="VuyCfHNquN" role="1QGGTw">
-                <property role="1iqoE4" value="${module}/icons/left.png" />
+            <node concept="1QGGTA" id="frftTv13ed" role="37wK5m">
+              <node concept="1QGGSu" id="frftTv13ee" role="1QGGTw">
+                <node concept="10M0yZ" id="frftTv13CL" role="3xaMm5">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowLeft" resolve="ArrowLeft" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+                </node>
               </node>
             </node>
           </node>
@@ -5725,14 +5735,17 @@
       <node concept="3Tm1VV" id="CPtprWNBIQ" role="1B3o_S" />
       <node concept="3clFbS" id="CPtprWNBIR" role="3clF47">
         <node concept="3clFbF" id="CPtprWNBIS" role="3cqZAp">
-          <node concept="3P9mCS" id="CPtprWNBIT" role="3clFbG">
+          <node concept="3P9mCS" id="frftTv142e" role="3clFbG">
             <ref role="37wK5l" node="CPtprWNpe6" resolve="createButtonWithIcon" />
-            <node concept="37vLTw" id="CPtprWNBIU" role="37wK5m">
+            <node concept="37vLTw" id="frftTv142f" role="37wK5m">
               <ref role="3cqZAo" node="CPtprWNBIN" resolve="n" />
             </node>
-            <node concept="1QGGTA" id="VuyCfHNq67" role="37wK5m">
-              <node concept="1QGGSu" id="VuyCfHNqeq" role="1QGGTw">
-                <property role="1iqoE4" value="${module}/icons/right.png" />
+            <node concept="1QGGTA" id="frftTv142g" role="37wK5m">
+              <node concept="1QGGSu" id="frftTv142h" role="1QGGTw">
+                <node concept="10M0yZ" id="frftTv14sP" role="3xaMm5">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowRight" resolve="ArrowRight" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+                </node>
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps
index 9b650fee3f5..89fef44d06f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps
@@ -20,6 +20,7 @@
     <import index="hba4" ref="63e0e566-5131-447e-90e3-12ea330e1a00/r:f5bd2ad9-cd54-4408-b815-07f9f306f074(com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" implicit="true" />
   </imports>
@@ -113,7 +114,7 @@
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
       <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -127,7 +128,7 @@
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1172058436953" name="jetbrains.mps.baseLanguage.structure.LocalStaticMethodCall" flags="nn" index="3$87h9" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -213,7 +214,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1031,7 +1032,7 @@
       <ref role="PrY4T" node="3Y7ywckEJZi" resolve="IKeepAliveInGeneration" />
     </node>
     <node concept="1QGGSu" id="1N5Tah$AM7j" role="rwd14">
-      <property role="1iqoE4" value="${module}/icons/assessment.png" />
+      <property role="1iqoE4" value="${module}/icons/assessment.svg" />
     </node>
   </node>
   <node concept="1TIwiD" id="K292flwCEW">
@@ -1101,7 +1102,7 @@
       <ref role="PrY4T" node="3m8H$lmFM60" resolve="IDocumentable" />
     </node>
     <node concept="1QGGSu" id="1N5Tah$AM7k" role="rwd14">
-      <property role="1iqoE4" value="${module}/icons/assessment.png" />
+      <property role="1iqoE4" value="${module}/icons/assessment.svg" />
     </node>
   </node>
   <node concept="1TIwiD" id="K292flwD4r">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/assessment.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/assessment.png
deleted file mode 100644
index 5215c710583..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/assessment.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/backIcon.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/backIcon.png
deleted file mode 100644
index 4fa47f37895..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/backIcon.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/check.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/check.png
deleted file mode 100644
index 5990f9d731a..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/check.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/fwdIcon.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/fwdIcon.png
deleted file mode 100644
index f926d712d34..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/fwdIcon.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/hints.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/hints.png
deleted file mode 100644
index 34e3f6333d0..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/hints.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/refresh.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/refresh.png
deleted file mode 100644
index 6a43eb963f4..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/refresh.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/screenshot.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/screenshot.png
deleted file mode 100644
index 245a1f37300..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/screenshot.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/search.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/search.png
deleted file mode 100644
index ffa9cffee89..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/search.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/showDocs.gif b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/showDocs.gif
deleted file mode 100644
index 5e719195f9e..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/showDocs.gif and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal.png
deleted file mode 100644
index c77981513a2..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal.svg b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal.svg
new file mode 100644
index 00000000000..e6063b8147d
--- /dev/null
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.5" y="2.5" width="13" height="11" rx="1.5" stroke="#6C707E"/>
+<path d="M4.4799 9.4799L6.4598 7.5L4.4799 5.5201" stroke="#6C707E" stroke-linecap="round"/>
+<path d="M7.5 10.5L10.5 10.5" stroke="#6C707E" stroke-linecap="round"/>
+</svg>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal_dark.svg b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal_dark.svg
new file mode 100644
index 00000000000..c0caab3aac0
--- /dev/null
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/terminal_dark.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.5" y="2.5" width="13" height="11" rx="1.5" stroke="#CED0D6"/>
+<path d="M4.4799 9.4799L6.4598 7.5L4.4799 5.5201" stroke="#CED0D6" stroke-linecap="round"/>
+<path d="M7.5 10.5L10.5 10.5" stroke="#CED0D6" stroke-linecap="round"/>
+</svg>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/tree.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/tree.png
deleted file mode 100644
index 026dd4b72b7..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/tree.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/vis.png b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/vis.png
deleted file mode 100644
index 792b68d3d03..00000000000
Binary files a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/icons/vis.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 61e5e6d2f6c..6b5fad1e69c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -104,16 +104,16 @@
     <import index="zyr2" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.inspector(MPS.Editor/)" />
     <import index="7oz1" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.configuration(MPS.Editor/)" />
     <import index="ykok" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
-    <import index="3pb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.table(MPS.IDEA/)" />
     <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
-    <import index="1njx" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:com.mxgraph.view(de.itemis.mps.editor.diagram.runtime/)" />
     <import index="r3rm" ref="r:7fc96130-6279-4a55-aeeb-422a6879539d(de.itemis.mps.editor.diagram.runtime.jgraph)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" implicit="true" />
   </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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -205,7 +205,7 @@
       <concept id="471625927503601927" name="jetbrains.mps.lang.plugin.structure.NumberToolShortcut" flags="ng" index="15feLf">
         <property id="471625927503601955" name="number" index="15feLF" />
       </concept>
-      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ngI" index="1bYyw_">
+      <concept id="6193305307616715384" name="jetbrains.mps.lang.plugin.structure.ShortcutChange" flags="ng" index="1bYyw_">
         <reference id="6193305307616734326" name="action" index="1bYAoF" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
@@ -217,7 +217,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -276,7 +276,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -368,7 +368,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
@@ -453,7 +453,7 @@
       <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
         <child id="1160998896846" name="condition" index="1gVkn0" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -496,7 +496,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -592,7 +592,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -686,7 +686,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -1162,8 +1162,8 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODULE" resolve="MODULE" />
       <node concept="1oajcY" id="7uLL3Mf2_Qz" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="6wvhQs7nVXo" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/terminal.png" />
+    <node concept="1QGGSu" id="2uR7kGCiKQY" role="3Uehp1">
+      <property role="1iqoE4" value="${module}/icons/terminal.svg" />
     </node>
   </node>
   <node concept="tC5Ba" id="7uLL3Mf2Aq0">
@@ -1351,9 +1351,6 @@
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="7uLL3Mf2Q$g" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="6wvhQs7nVXn" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/terminal.png" />
-    </node>
     <node concept="2ScWuX" id="DMIuLumKtp" role="tmbBb">
       <node concept="3clFbS" id="DMIuLumKtq" role="2VODD2">
         <node concept="3cpWs8" id="3zLCsSzngeO" role="3cqZAp">
@@ -1390,6 +1387,9 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="2uR7kGCiJt7" role="3Uehp1">
+      <property role="1iqoE4" value="${module}/icons/terminal.svg" />
+    </node>
   </node>
   <node concept="312cEu" id="7uLL3Mf2K4X">
     <property role="TrG5h" value="TerminalOpener" />
@@ -2343,12 +2343,15 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="5jGyeU5XRta" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/search.png" />
-    </node>
     <node concept="15feLf" id="5OPKfxQ3lZ8" role="15cTzA">
       <property role="15feLF" value="7" />
     </node>
+    <node concept="1QGGSu" id="MipY_gaLSs" role="1nVCmq">
+      <node concept="10M0yZ" id="MipY_gaOND" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="2HzhasNzNEW">
     <property role="TrG5h" value="SearchViewer" />
@@ -3889,8 +3892,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4ueXZrqt44c" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/search.png" />
+    <node concept="1QGGSu" id="MipY_gaPoV" role="3Uehp1">
+      <node concept="10M0yZ" id="MipY_gaRyn" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2HzhasN$akP">
@@ -6046,9 +6052,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="3jNX2XuMqze" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/assessment.png" />
-    </node>
     <node concept="2ScWuX" id="22q1FPLr_89" role="tmbBb">
       <node concept="3clFbS" id="22q1FPLr_8a" role="2VODD2">
         <node concept="3cpWs8" id="22q1FPLrDiW" role="3cqZAp">
@@ -6080,6 +6083,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="5XU4dCzYtNG" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzYzH_" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Debugger.EvaluateExpression" resolve="EvaluateExpression" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Debugger" resolve="Debugger" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="3jNX2XuMqRP">
     <property role="3GE5qa" value="assessment" />
@@ -6215,9 +6224,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="3slbD0C7$Av" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/check.png" />
-    </node>
     <node concept="2ScWuX" id="3slbD0C7$Aw" role="tmbBb">
       <node concept="3clFbS" id="3slbD0C7$Ax" role="2VODD2">
         <node concept="3clFbF" id="3slbD0C7$Ay" role="3cqZAp">
@@ -6228,6 +6234,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="6ghi$I1WGcA" role="3Uehp1">
+      <node concept="10M0yZ" id="6ghi$I1WHLW" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="5FfxSinVg0H">
     <property role="TrG5h" value="MbeddrMenuHelper" />
@@ -12614,9 +12626,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="2Gn1WTgS$Iy" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/search.png" />
-    </node>
     <node concept="2ScWuX" id="2Gn1WTgS_2H" role="tmbBb">
       <node concept="3clFbS" id="2Gn1WTgS_2I" role="2VODD2">
         <node concept="3clFbF" id="2Gn1WTgS_iH" role="3cqZAp">
@@ -12634,6 +12643,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="MipY_gaSlR" role="3Uehp1">
+      <node concept="10M0yZ" id="MipY_gaUVb" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Search" resolve="Search" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7Q6Q5uyAduY">
     <property role="TrG5h" value="GenericTreeModel" />
@@ -16494,8 +16509,11 @@
       </node>
       <node concept="3Tm1VV" id="3ODAlcN6A$s" role="1B3o_S" />
     </node>
-    <node concept="1QGGSu" id="4WlWim9o0gH" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/tree.png" />
+    <node concept="1QGGSu" id="1MQpRKewwvP" role="1nVCmq">
+      <node concept="10M0yZ" id="MipY_g72gz" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.Tree" resolve="Tree" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="7Q6Q5uyyekc">
@@ -16654,9 +16672,6 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
       <node concept="1oajcY" id="1yljmw4RRr7" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="53G_t0F967W" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/tree.png" />
-    </node>
     <node concept="2ScWuX" id="bhVSeFFahJ" role="tmbBb">
       <node concept="3clFbS" id="bhVSeFFahK" role="2VODD2">
         <node concept="3clFbF" id="bhVSeGateb" role="3cqZAp">
@@ -16705,6 +16720,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="MipY_g8qdP" role="3Uehp1">
+      <node concept="10M0yZ" id="MipY_g8tQO" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.Tree" resolve="Tree" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="7Q6Q5uyzQ95">
     <property role="TrG5h" value="genericTreeGroup" />
@@ -16989,9 +17010,6 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
       <node concept="1oajcY" id="bhVSeFXdrz" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="bhVSeFXdr$" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/tree.png" />
-    </node>
     <node concept="2ScWuX" id="bhVSeFXdr_" role="tmbBb">
       <node concept="3clFbS" id="bhVSeFXdrA" role="2VODD2">
         <node concept="3clFbF" id="bhVSeFXdrL" role="3cqZAp">
@@ -17020,6 +17038,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="MipY_g9wUo" role="3Uehp1">
+      <node concept="10M0yZ" id="MipY_g9y34" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.Tree" resolve="Tree" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="bhVSeFHkXQ">
     <property role="TrG5h" value="genericTreeGroupDynamic" />
@@ -17252,9 +17276,6 @@
       <ref role="1DUlNI" to="qkt:~PlatformDataKeys.TOOL_WINDOW" resolve="TOOL_WINDOW" />
       <node concept="1oajcY" id="6AXckLE9yw4" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="6AXckLE8K94" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/refresh.png" />
-    </node>
     <node concept="2ScWuX" id="6AXckLE8K95" role="tmbBb">
       <node concept="3clFbS" id="6AXckLE8K96" role="2VODD2">
         <node concept="3clFbJ" id="7LIXz$lzI2k" role="3cqZAp">
@@ -17308,6 +17329,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="2uR7kGChGPE" role="3Uehp1">
+      <node concept="10M0yZ" id="2uR7kGChJ0n" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Refresh" resolve="Refresh" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="5EE0R5I1OfO">
     <property role="3GE5qa" value="tree" />
@@ -18772,9 +18799,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4ppn3W9rIRb" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/backIcon.png" />
-    </node>
     <node concept="1DS2jV" id="4ppn3W9rIRc" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -18802,6 +18826,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="2uR7kGChojb" role="3Uehp1">
+      <node concept="10M0yZ" id="2uR7kGChqU4" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Back" resolve="Back" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="4ppn3W9rIRe">
     <property role="TrG5h" value="Forward" />
@@ -18831,9 +18861,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4ppn3W9rIRh" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/fwdIcon.png" />
-    </node>
     <node concept="1DS2jV" id="4ppn3W9rIRi" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -18861,6 +18888,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="2uR7kGChlug" role="3Uehp1">
+      <node concept="10M0yZ" id="2uR7kGChnJ$" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Forward" resolve="Forward" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="2aP19v311Mf">
     <property role="TrG5h" value="TreeHistory" />
@@ -19332,7 +19365,7 @@
   </node>
   <node concept="sE7Ow" id="3ODAlcNAny7">
     <property role="TrG5h" value="RefreshButton" />
-    <property role="2uzpH1" value="Refresh" />
+    <property role="2uzpH1" value="Refresh (tree)" />
     <property role="3GE5qa" value="tree.toolbar" />
     <node concept="tnohg" id="3ODAlcNAnya" role="tncku">
       <node concept="3clFbS" id="3ODAlcNAnyb" role="2VODD2">
@@ -19361,8 +19394,11 @@
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="3ODAlcNAnyl" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="3ODAlcNAnyo" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/refresh.png" />
+    <node concept="1QGGSu" id="2uR7kGChrH9" role="3Uehp1">
+      <node concept="10M0yZ" id="2uR7kGCh$mM" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Refresh" resolve="Refresh" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2sPLpCfXLoM">
@@ -22103,8 +22139,11 @@
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="7SQqK0FfdCZ" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="79jc6YzgSN2" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/screenshot.png" />
+    <node concept="1QGGSu" id="2uR7kGCiQgi" role="3Uehp1">
+      <node concept="10M0yZ" id="2uR7kGCiUg8" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.Print" resolve="Print" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
+      </node>
     </node>
   </node>
   <node concept="tC5Ba" id="79jc6Yzh4Gr">
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/documentation.svg b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/documentation.svg
new file mode 100644
index 00000000000..83489e8c427
--- /dev/null
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/documentation.svg
@@ -0,0 +1,8 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="3.5" width="9" height="10" rx="1.5" stroke="#6C707E"/>
+<rect x="5" y="6" width="4" height="1" rx="0.5" fill="#6C707E"/>
+<rect x="5" y="8" width="4" height="1" rx="0.5" fill="#6C707E"/>
+<rect x="5" y="10" width="4" height="1" rx="0.5" fill="#6C707E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0019 2H11.6C12.3732 2 13 2.6268 13 3.4V3.91081C13.0013 3.94038 13.0019 3.97011 13.0019 4V11.5482C13.6065 11.1124 14 10.4021 14 9.6V3.4C14 2.07452 12.9255 1 11.6 1H6.39999C5.59698 1 4.88608 1.39437 4.45041 2H6.39999H11.0019Z" fill="#6C707E"/>
+</svg>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/documentation_dark.svg b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/documentation_dark.svg
new file mode 100644
index 00000000000..11cc055067c
--- /dev/null
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/documentation_dark.svg
@@ -0,0 +1,8 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="3.5" width="9" height="10" rx="1.5" stroke="#CED0D6"/>
+<rect x="5" y="6" width="4" height="1" rx="0.5" fill="#CED0D6"/>
+<rect x="5" y="8" width="4" height="1" rx="0.5" fill="#CED0D6"/>
+<rect x="5" y="10" width="4" height="1" rx="0.5" fill="#CED0D6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0019 2H11.6C12.3732 2 13 2.6268 13 3.4V3.91081C13.0013 3.94038 13.0019 3.97011 13.0019 4V11.5482C13.6065 11.1124 14 10.4021 14 9.6V3.4C14 2.07452 12.9255 1 11.6 1H6.39999C5.59698 1 4.88608 1.39437 4.45041 2H6.39999H11.0019Z" fill="#CED0D6"/>
+</svg>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/toc_closed.png b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/toc_closed.png
deleted file mode 100644
index 1feaca58e64..00000000000
Binary files a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/icons/toc_closed.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
index c0ff36d5ed8..ccb1f031f5b 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
@@ -10,6 +10,7 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -115,9 +116,6 @@
   </registry>
   <node concept="3vrhyV" id="70oIz4aiOJd">
     <property role="TrG5h" value="documentation" />
-    <node concept="1QGGSu" id="70oIz4aiOKk" role="3vqPLo">
-      <property role="1iqoE4" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/icons/toc_closed.png" />
-    </node>
     <node concept="2V$Bhx" id="70oIz4aiOKf" role="QG$2i">
       <property role="2V$B1T" value="38a074ed-e5ad-4b2d-be31-ca436911b8aa" />
       <property role="2V$B1Q" value="com.mbeddr.doc.lang" />
@@ -130,6 +128,9 @@
       <property role="2V$B1T" value="2374bc90-7e37-41f1-a9c4-c2e35194c36a" />
       <property role="2V$B1Q" value="com.mbeddr.doc" />
     </node>
+    <node concept="1QGGSu" id="MipY_gdmsX" role="3vqPLo">
+      <property role="1iqoE4" value="${module}/icons/documentation.svg" />
+    </node>
   </node>
   <node concept="vrV6u" id="1T8cMxCROk6">
     <property role="TrG5h" value="documentationAspectConfiguration" />
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/icons/pin.gif b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/icons/pin.gif
deleted file mode 100755
index ec50b70fab1..00000000000
Binary files a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/icons/pin.gif and /dev/null differ
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/icons/toc_closed.png b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/icons/toc_closed.png
deleted file mode 100644
index 1feaca58e64..00000000000
Binary files a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/icons/toc_closed.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
index 1dab9a5835a..de03c0cb689 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
@@ -63,6 +63,7 @@
     <import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" />
     <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" implicit="true" />
   </imports>
   <registry>
@@ -71,7 +72,7 @@
     </language>
     <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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
       <concept id="8974276187400029891" name="jetbrains.mps.lang.resources.structure.IconExpression" flags="nn" index="1QGGTA">
         <child id="8974276187400029893" name="icon" index="1QGGTw" />
@@ -127,7 +128,7 @@
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
       <concept id="1204478074808" name="jetbrains.mps.lang.plugin.structure.ConceptFunctionParameter_MPSProject" flags="nn" index="1KvdUw" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -169,7 +170,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -233,7 +234,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -296,7 +297,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -321,7 +322,7 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -389,7 +390,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -423,7 +424,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -536,8 +537,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="UK_oBpzHVU" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/toc_closed.png" />
+    <node concept="1QGGSu" id="MipY_gdpYf" role="3Uehp1">
+      <node concept="10M0yZ" id="MipY_gdr1y" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Toolwindows.Documentation" resolve="Documentation" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Toolwindows" resolve="Toolwindows" />
+      </node>
     </node>
   </node>
   <node concept="tC5Ba" id="69s3uhHThi8">
@@ -2203,8 +2207,11 @@
                 <node concept="liA8E" id="1IUlN8Q3WKg" role="2OqNvi">
                   <ref role="37wK5l" to="v7ux:~Content.setIcon(javax.swing.Icon)" resolve="setIcon" />
                   <node concept="1QGGTA" id="1IUlN8Q3WKA" role="37wK5m">
-                    <node concept="1QGGSu" id="1IUlN8Q3WKB" role="1QGGTw">
-                      <property role="1iqoE4" value="${module}/icons/toc_closed.png" />
+                    <node concept="1QGGSu" id="MipY_gcWZb" role="1QGGTw">
+                      <node concept="10M0yZ" id="MipY_gd3QS" role="3xaMm5">
+                        <ref role="3cqZAo" to="z2i8:~AllIcons$Toolwindows.Documentation" resolve="Documentation" />
+                        <ref role="1PxDUh" to="z2i8:~AllIcons$Toolwindows" resolve="Toolwindows" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -2277,9 +2284,7 @@
                 <node concept="liA8E" id="7r8qu42xWDu" role="2OqNvi">
                   <ref role="37wK5l" to="v7ux:~Content.setIcon(javax.swing.Icon)" resolve="setIcon" />
                   <node concept="1QGGTA" id="7r8qu42xWDv" role="37wK5m">
-                    <node concept="1QGGSu" id="7r8qu42xWDw" role="1QGGTw">
-                      <property role="1iqoE4" value="${module}/icons/toc_closed.png" />
-                    </node>
+                    <node concept="1QGGSu" id="MipY_gd8yr" role="1QGGTw" />
                   </node>
                 </node>
               </node>
@@ -3486,9 +3491,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="1KDc5EfI0Ce" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/toc_closed.png" />
-    </node>
     <node concept="2XrIbr" id="DxJoPcq$jB" role="2XNbBy">
       <property role="TrG5h" value="showNodeOrConceptContent" />
       <node concept="3Tm6S6" id="DxJoPcq$jC" role="1B3o_S" />
@@ -3819,8 +3821,11 @@
                                         </node>
                                       </node>
                                       <node concept="1QGGTA" id="DxJoPcq$hM" role="37wK5m">
-                                        <node concept="1QGGSu" id="DxJoPcq$hN" role="1QGGTw">
-                                          <property role="1iqoE4" value="${module}/icons/toc_closed.png" />
+                                        <node concept="1QGGSu" id="MipY_gdgc4" role="1QGGTw">
+                                          <node concept="10M0yZ" id="MipY_gdi5C" role="3xaMm5">
+                                            <ref role="3cqZAo" to="z2i8:~AllIcons$Toolwindows.Documentation" resolve="Documentation" />
+                                            <ref role="1PxDUh" to="z2i8:~AllIcons$Toolwindows" resolve="Toolwindows" />
+                                          </node>
                                         </node>
                                       </node>
                                       <node concept="10Nm6u" id="DxJoPcq$hO" role="37wK5m" />
@@ -4003,8 +4008,11 @@
                                         </node>
                                       </node>
                                       <node concept="1QGGTA" id="DxJoPcq$j0" role="37wK5m">
-                                        <node concept="1QGGSu" id="DxJoPcq$j1" role="1QGGTw">
-                                          <property role="1iqoE4" value="${module}/icons/toc_closed.png" />
+                                        <node concept="1QGGSu" id="MipY_gd9oS" role="1QGGTw">
+                                          <node concept="10M0yZ" id="MipY_gdbko" role="3xaMm5">
+                                            <ref role="3cqZAo" to="z2i8:~AllIcons$Toolwindows.Documentation" resolve="Documentation" />
+                                            <ref role="1PxDUh" to="z2i8:~AllIcons$Toolwindows" resolve="Toolwindows" />
+                                          </node>
                                         </node>
                                       </node>
                                       <node concept="10Nm6u" id="DxJoPcq$j2" role="37wK5m" />
@@ -4107,6 +4115,12 @@
         <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
       </node>
     </node>
+    <node concept="1QGGSu" id="MipY_gc55f" role="1nVCmq">
+      <node concept="10M0yZ" id="MipY_gcgqb" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Toolwindows.Documentation" resolve="Documentation" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Toolwindows" resolve="Toolwindows" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="24MikXOfIA3">
     <property role="TrG5h" value="DocumentationHandler" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps
index bda93ead82d..e8ee853aaf9 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps
@@ -30,8 +30,9 @@
     <import index="kz9k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.navigation(MPS.Editor/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
     <import index="4gky" ref="r:e1dfab1d-c7a7-43e7-9f26-028afd483e82(com.mbeddr.doc.behavior)" implicit="true" />
@@ -39,6 +40,11 @@
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" implicit="true" />
   </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">
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
+      </concept>
+    </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
       <concept id="1207145163717" name="jetbrains.mps.lang.plugin.structure.ElementListContents" flags="ng" index="ftmFs">
         <child id="1207145201301" name="reference" index="ftvYc" />
@@ -77,6 +83,7 @@
         <child id="8096638938275469614" name="toolInitBlock" index="uR5cp" />
         <child id="6547237850567462848" name="methodDeclaration" index="2XNbBy" />
         <child id="6547237850567462849" name="fieldDeclaration" index="2XNbBz" />
+        <child id="6791676465872004185" name="toolIcon" index="1nVCmq" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
       <concept id="5538333046911348654" name="jetbrains.mps.lang.plugin.structure.RequiredCondition" flags="ng" index="1oajcY" />
@@ -87,7 +94,7 @@
         <reference id="1217252646389" name="key" index="1DUlNI" />
       </concept>
       <concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
-      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
+      <concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
         <child id="5538333046911298738" name="condition" index="1oa70y" />
       </concept>
     </language>
@@ -109,7 +116,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -210,7 +217,7 @@
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -235,7 +242,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -278,7 +285,7 @@
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -344,7 +351,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -2700,6 +2707,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="1_GBr6nf8KR" role="1nVCmq">
+      <node concept="10M0yZ" id="1_GBr6nfdXd" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Words" resolve="Words" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/play.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/play.png
deleted file mode 100644
index 70e8629a85f..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/play.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/task.svg b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/task.svg
new file mode 100644
index 00000000000..b8d70b2cc68
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/task.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00002 14.0528C7.85812 14.0579 7.71386 14.0118 7.60895 13.9027C5.58951 11.8023 3.28756 12.6215 2.00294 13.3773C1.59499 13.6173 1 13.3303 1 12.857V3.4695C1 3.18531 1.15288 2.92515 1.4121 2.80867C2.56151 2.29219 5.85864 1.09521 8.00003 3.20167C10.1414 1.09521 13.4385 2.29219 14.5879 2.80867C14.8472 2.92515 15 3.18531 15 3.4695V12.857C15 13.3303 14.4051 13.6173 13.9971 13.3773C12.7125 12.6215 10.4105 11.8023 8.3911 13.9027C8.28619 14.0118 8.14193 14.0579 8.00002 14.0528ZM7.50002 4.13097C6.72801 3.22897 5.71886 2.96682 4.674 3.00316C3.61873 3.03987 2.60818 3.38648 2 3.64328V12.2424C2.67243 11.9094 3.53429 11.6052 4.49327 11.5696C5.47659 11.5331 6.51628 11.7821 7.50002 12.4869V4.13097ZM8.50002 12.4869C9.48377 11.7821 10.5235 11.5331 11.5068 11.5696C12.4658 11.6052 13.3276 11.9094 14 12.2424V3.64328C13.3919 3.38648 12.3813 3.03987 11.326 3.00316C10.2812 2.96682 9.27204 3.22897 8.50002 4.13097V12.4869Z" fill="#6C707E"/>
+</svg>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/task_dark.svg b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/task_dark.svg
new file mode 100644
index 00000000000..a65806c27bd
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/icons/task_dark.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00002 14.0528C7.85812 14.0579 7.71386 14.0118 7.60895 13.9027C5.58951 11.8023 3.28756 12.6215 2.00294 13.3773C1.59499 13.6173 1 13.3303 1 12.857V3.4695C1 3.18531 1.15288 2.92515 1.4121 2.80867C2.56151 2.29219 5.85864 1.09521 8.00003 3.20167C10.1414 1.09521 13.4385 2.29219 14.5879 2.80867C14.8472 2.92515 15 3.18531 15 3.4695V12.857C15 13.3303 14.4051 13.6173 13.9971 13.3773C12.7125 12.6215 10.4105 11.8023 8.3911 13.9027C8.28619 14.0118 8.14193 14.0579 8.00002 14.0528ZM7.50002 4.13097C6.72801 3.22897 5.71886 2.96682 4.674 3.00316C3.61873 3.03987 2.60818 3.38648 2 3.64328V12.2424C2.67243 11.9094 3.53429 11.6052 4.49327 11.5696C5.47659 11.5331 6.51628 11.7821 7.50002 12.4869V4.13097ZM8.50002 12.4869C9.48377 11.7821 10.5235 11.5331 11.5068 11.5696C12.4658 11.6052 13.3276 11.9094 14 12.2424V3.64328C13.3919 3.38648 12.3813 3.03987 11.326 3.00316C10.2812 2.96682 9.27204 3.22897 8.50002 4.13097V12.4869Z" fill="#CED0D6"/>
+</svg>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
index 10a8c75bf71..4c47ef8b651 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
@@ -241,8 +241,8 @@
     <node concept="PrWs8" id="4sSf$eKhX2q" role="PzmwI">
       <ref role="PrY4T" node="4sSf$eKgZ7y" resolve="IAmAwareOfRuntime" />
     </node>
-    <node concept="1QGGSu" id="6LCinStDtiP" role="rwd14">
-      <property role="1iqoE4" value="${module}/icons/play.png" />
+    <node concept="1QGGSu" id="frftTv5thU" role="rwd14">
+      <property role="1iqoE4" value="${module}/icons/task.svg" />
     </node>
   </node>
   <node concept="1TIwiD" id="3p1cdQ7_xTL">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/back.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/back.png
deleted file mode 100644
index b77b17ba65f..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/back.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/back@2x.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/back@2x.png
deleted file mode 100644
index 15e4f3a6404..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/back@2x.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/fitView.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/fitView.png
deleted file mode 100644
index 4a6bc017d86..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/fitView.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/fitView@2x.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/fitView@2x.png
deleted file mode 100644
index db82b4baced..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/fitView@2x.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/forward.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/forward.png
deleted file mode 100644
index 611c48b6001..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/forward.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/forward@2x.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/forward@2x.png
deleted file mode 100644
index c039a07c5cc..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/forward@2x.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/graphingTool.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/graphingTool.png
deleted file mode 100644
index 5adc7838cd5..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/graphingTool.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/graphstream.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/graphstream.png
new file mode 100644
index 00000000000..91b49866754
Binary files /dev/null and b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/graphstream.png differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/refresh.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/refresh.png
deleted file mode 100644
index 776f475cb65..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/refresh.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/refresh@2x.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/refresh@2x.png
deleted file mode 100644
index 816bfb1b583..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/refresh@2x.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomIn.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomIn.png
deleted file mode 100644
index 3017dbb0fba..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomIn.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomIn@2x.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomIn@2x.png
deleted file mode 100644
index 035f795e093..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomIn@2x.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomOut.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomOut.png
deleted file mode 100644
index 6da15c5c8fa..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomOut.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomOut@2x.png b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomOut@2x.png
deleted file mode 100644
index 302e83950ab..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/icons/zoomOut@2x.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps
index 62e9f2c75cf..f28656b706f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps
@@ -39,8 +39,9 @@
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
     <import index="u99y" ref="ab71436a-a7d1-4689-ac02-b5fde2ec681f/java:de.itemis.graphing.model.style(com.mbeddr.mpsutil.graphstream.runtime/)" />
     <import index="7vlr" ref="ab71436a-a7d1-4689-ac02-b5fde2ec681f/java:de.itemis.graphing.view.interaction(com.mbeddr.mpsutil.graphstream.runtime/)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="er5d" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.swing(de.itemis.stubs.batik/)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="7noo" ref="r:81975c0c-72ff-4213-b65b-0baff111a818(com.mbeddr.mpsutil.graphstream.behavior)" implicit="true" />
     <import index="7bx7" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.workbench.action(MPS.Platform/)" implicit="true" />
     <import index="41rc" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.swing.gvt(de.itemis.stubs.batik/)" implicit="true" />
@@ -49,6 +50,7 @@
     <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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
       <concept id="8974276187400029891" name="jetbrains.mps.lang.resources.structure.IconExpression" flags="nn" index="1QGGTA">
         <child id="8974276187400029893" name="icon" index="1QGGTw" />
@@ -1504,7 +1506,7 @@
       </node>
     </node>
     <node concept="1QGGSu" id="53G_t0Fb_PQ" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/graphingTool.png" />
+      <property role="1iqoE4" value="${module}/icons/graphstream.png" />
     </node>
     <node concept="2xpOpl" id="6yVMxJNjcaz" role="uR5co">
       <node concept="3clFbS" id="6yVMxJNjca$" role="2VODD2">
@@ -1550,7 +1552,7 @@
   </node>
   <node concept="sE7Ow" id="4ppn3W9rGUJ">
     <property role="TrG5h" value="FitView" />
-    <property role="2uzpH1" value="Fit View" />
+    <property role="2uzpH1" value="Fit View (Graph)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4ppn3W9rGUK" role="tncku">
@@ -1586,14 +1588,17 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4ppn3W9rGUY" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/fitView.png" />
-    </node>
     <node concept="1DS2jV" id="4ppn3W9rGUZ" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="4ppn3W9rGV0" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzRmLM" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzRylx" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.FitContent" resolve="FitContent" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="18ZQ$P85bbH">
     <property role="TrG5h" value="GraphingToolbar" />
@@ -1628,7 +1633,7 @@
   <node concept="sE7Ow" id="18ZQ$P82xbr">
     <property role="TrG5h" value="ZoomIn" />
     <property role="3GE5qa" value="toolbar" />
-    <property role="2uzpH1" value="Zoom in" />
+    <property role="2uzpH1" value="Zoom In (Graph)" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="18ZQ$P82xbs" role="tncku">
       <node concept="3clFbS" id="18ZQ$P82xbt" role="2VODD2">
@@ -1663,18 +1668,21 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="5BkFC2yhAJ4" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/zoomIn.png" />
-    </node>
     <node concept="1DS2jV" id="18ZQ$P85cQE" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="18ZQ$P85cQF" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzRB$o" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzRCLY" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.ZoomIn" resolve="ZoomIn" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="2sPLpCfQji_">
     <property role="TrG5h" value="ZoomOut" />
-    <property role="2uzpH1" value="Zoom out" />
+    <property role="2uzpH1" value="Zoom Out (Graph)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2sPLpCfQjiA" role="tncku">
@@ -1710,14 +1718,17 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="2sPLpCfQjiP" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/zoomOut.png" />
-    </node>
     <node concept="1DS2jV" id="2sPLpCfQjiQ" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="2sPLpCfQjiR" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzRCTr" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzRErq" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.ZoomOut" resolve="ZoomOut" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="bhVSeGf9hE">
     <property role="1XlLyE" value="true" />
@@ -1796,8 +1807,8 @@
               <node concept="liA8E" id="4DzE9lEwD$9" role="2OqNvi">
                 <ref role="37wK5l" to="qkt:~Presentation.setIcon(javax.swing.Icon)" resolve="setIcon" />
                 <node concept="1QGGTA" id="4glh_Dcka$v" role="37wK5m">
-                  <node concept="1QGGSu" id="4glh_DckaC1" role="1QGGTw">
-                    <property role="1iqoE4" value="${module}/icons/graphingTool.png" />
+                  <node concept="1QGGSu" id="5XU4dCzR77z" role="1QGGTw">
+                    <property role="1iqoE4" value="${module}/icons/graphstream.png" />
                   </node>
                 </node>
               </node>
@@ -2828,7 +2839,7 @@
   </node>
   <node concept="sE7Ow" id="4iv9KfRBKWH">
     <property role="TrG5h" value="HistoryGoBack" />
-    <property role="2uzpH1" value="Go Back" />
+    <property role="2uzpH1" value="Go Back (Graph)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4iv9KfRBKWI" role="tncku">
@@ -2864,18 +2875,21 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4iv9KfRBKWW" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/back.png" />
-    </node>
     <node concept="1DS2jV" id="4iv9KfRBKWX" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="4iv9KfRBKWY" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzRz0M" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzR$F2" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Back" resolve="Back" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="4iv9KfRBRSs">
     <property role="TrG5h" value="HistoryGoForward" />
-    <property role="2uzpH1" value="Go Forward" />
+    <property role="2uzpH1" value="Go Forward (Graph)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4iv9KfRBRSt" role="tncku">
@@ -2911,18 +2925,21 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4iv9KfRBRSF" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/forward.png" />
-    </node>
     <node concept="1DS2jV" id="4iv9KfRBRSG" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="4iv9KfRBRSH" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzR$Mv" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzR_ZU" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Forward" resolve="Forward" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="4iv9KfRC_SE">
     <property role="TrG5h" value="Refresh" />
-    <property role="2uzpH1" value="Refresh" />
+    <property role="2uzpH1" value="Refresh (Graph)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4iv9KfRC_SF" role="tncku">
@@ -2958,14 +2975,17 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4iv9KfRC_ST" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/refresh.png" />
-    </node>
     <node concept="1DS2jV" id="4iv9KfRC_SU" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="4iv9KfRC_SV" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzRA7n" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzRBmK" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Refresh" resolve="Refresh" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="50Rn4r1GKpK">
     <property role="TrG5h" value="GraphingHistory" />
@@ -4621,7 +4641,7 @@
   </node>
   <node concept="sE7Ow" id="6x5UxX31b1p">
     <property role="TrG5h" value="RenderAsSVG" />
-    <property role="2uzpH1" value="Render GraphViz SVG" />
+    <property role="2uzpH1" value="Render As SVG (Graph)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6x5UxX31b1q" role="tncku">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps
index a2a513712b9..2c4c16d7692 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps
@@ -44,6 +44,7 @@
     <import index="rtrw" ref="1338ba73-5059-479b-a929-de86597a62b8/java:edu.uci.ics.jung.visualization.renderers(com.mbeddr.mpsutil.jung.pluginSolution/)" />
     <import index="gsia" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.event(JDK/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
   </imports>
@@ -57,6 +58,11 @@
         <child id="1238857834412" name="index" index="1LF_Uc" />
       </concept>
     </language>
+    <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">
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
+      </concept>
+    </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
       <concept id="1204908117386" name="jetbrains.mps.lang.plugin.structure.Separator" flags="ng" index="2a7GMi" />
       <concept id="1207145163717" name="jetbrains.mps.lang.plugin.structure.ElementListContents" flags="ng" index="ftmFs">
@@ -102,6 +108,7 @@
         <child id="8096638938275469614" name="toolInitBlock" index="uR5cp" />
         <child id="6547237850567462848" name="methodDeclaration" index="2XNbBy" />
         <child id="6547237850567462849" name="fieldDeclaration" index="2XNbBz" />
+        <child id="6791676465872004185" name="toolIcon" index="1nVCmq" />
       </concept>
       <concept id="1562714432501166198" name="jetbrains.mps.lang.plugin.structure.SimpleShortcutChange" flags="lg" index="Zd509">
         <child id="1562714432501166206" name="keystroke" index="Zd501" />
@@ -9283,6 +9290,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="5XU4dCzSJgq" role="1nVCmq">
+      <node concept="10M0yZ" id="5XU4dCzTqEb" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$FileTypes.Diagram" resolve="Diagram" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$FileTypes" resolve="AllIcons.FileTypes" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="4mGNV$raQvF">
     <property role="TrG5h" value="OpenGraphViewer" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl
index 44b43678b31..7fbfb636dcd 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl
@@ -40,6 +40,7 @@
         <dependency reexport="false">1d6e05d7-9de9-40a7-9dad-7b8444280942(jetbrains.mps.lang.plugin#1203080439937)</dependency>
         <dependency reexport="false">443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)</dependency>
         <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
+        <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/generator/template/main@generator.mps
index 8259c921958..ebb08a84117 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/generator/template/main@generator.mps
@@ -40,7 +40,9 @@
     <import index="rh18" ref="32addf6f-1f14-40cb-991d-e0fddb7506c1/r:7c73bcc0-050a-46cb-bba5-d10598f1b9f2(com.mbeddr.mpsutil.preferenceform.runtime/com.mbeddr.mpsutil.preferenceform.runtime)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="tp4h" ref="r:00000000-0000-4000-0000-011c8959036d(jetbrains.mps.baseLanguage.classifiers.behavior)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -6687,6 +6689,53 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="nCjUNn4Elb" role="jymVt" />
+    <node concept="3clFb_" id="nCjUNn4Elc" role="jymVt">
+      <property role="TrG5h" value="getId" />
+      <node concept="3Tm1VV" id="nCjUNn4Eld" role="1B3o_S" />
+      <node concept="2AHcQZ" id="nCjUNn4Ele" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="2AHcQZ" id="nCjUNn4Elf" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NonNls" resolve="NonNls" />
+      </node>
+      <node concept="3uibUv" id="nCjUNn4Elg" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+      </node>
+      <node concept="3clFbS" id="nCjUNn4Elh" role="3clF47">
+        <node concept="3clFbF" id="nCjUNn4Eli" role="3cqZAp">
+          <node concept="Xl_RD" id="nCjUNn4Elj" role="3clFbG">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="nCjUNn4Elk" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="nCjUNn4Ell" role="3zH0cK">
+                <node concept="3clFbS" id="nCjUNn4Elm" role="2VODD2">
+                  <node concept="3clFbF" id="nCjUNn4Eln" role="3cqZAp">
+                    <node concept="2OqwBi" id="nCjUNn4Elo" role="3clFbG">
+                      <node concept="2OqwBi" id="nCjUNn4Elp" role="2Oq$k0">
+                        <node concept="2JrnkZ" id="nCjUNn4Elq" role="2Oq$k0">
+                          <node concept="30H73N" id="nCjUNn4Elr" role="2JrQYb" />
+                        </node>
+                        <node concept="liA8E" id="nCjUNn4Els" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="nCjUNn4Elt" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="nCjUNn4Elu" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="4vnGofEtmpA" role="1B3o_S" />
     <node concept="n94m4" id="4vnGofEtmpB" role="lGtFl">
       <ref role="n9lRv" to="3iid:86yKXFERvb" resolve="PreferenceForm" />
@@ -8666,6 +8715,7 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="nCjUNn3FJh" role="jymVt" />
     <node concept="3Tm1VV" id="hI3naNM" role="1B3o_S" />
     <node concept="n94m4" id="hI3naNR" role="lGtFl">
       <ref role="n9lRv" to="3iid:86yKXFERvb" resolve="PreferenceForm" />
@@ -8689,6 +8739,52 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="3GLOsuShDHo" role="jymVt">
+      <property role="TrG5h" value="getId" />
+      <node concept="3Tm1VV" id="3GLOsuShDHp" role="1B3o_S" />
+      <node concept="2AHcQZ" id="3GLOsuShDHr" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+      </node>
+      <node concept="2AHcQZ" id="3GLOsuShDHs" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~NonNls" resolve="NonNls" />
+      </node>
+      <node concept="3uibUv" id="3GLOsuShDHt" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+      </node>
+      <node concept="3clFbS" id="3GLOsuShDHB" role="3clF47">
+        <node concept="3clFbF" id="3GLOsuShDHE" role="3cqZAp">
+          <node concept="Xl_RD" id="3GLOsuShZu_" role="3clFbG">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="3GLOsuSi6Th" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="3GLOsuSi6Ti" role="3zH0cK">
+                <node concept="3clFbS" id="3GLOsuSi6Tj" role="2VODD2">
+                  <node concept="3clFbF" id="3GLOsuSi_Qx" role="3cqZAp">
+                    <node concept="2OqwBi" id="3GLOsuSjp7Q" role="3clFbG">
+                      <node concept="2OqwBi" id="3GLOsuSjcCO" role="2Oq$k0">
+                        <node concept="2JrnkZ" id="3GLOsuSj6AP" role="2Oq$k0">
+                          <node concept="30H73N" id="3GLOsuSiN4K" role="2JrQYb" />
+                        </node>
+                        <node concept="liA8E" id="3GLOsuSjiMN" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="3GLOsuSjwrh" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3GLOsuShDHC" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
   </node>
   <node concept="13MO4I" id="4vnGofEwSEJ">
     <property role="TrG5h" value="reduce_DotExpressionApplication" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/icons/buildassistant.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/icons/buildassistant.png
deleted file mode 100644
index a09e3a518a3..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/icons/buildassistant.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/models/com/mbeddr/mpsutil/buildassistant/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/models/com/mbeddr/mpsutil/buildassistant/plugin.mps
index 8fe85f27bf9..09d1ff51cf0 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/models/com/mbeddr/mpsutil/buildassistant/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.buildassistant/models/com/mbeddr/mpsutil/buildassistant/plugin.mps
@@ -29,13 +29,14 @@
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="ap4t" ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd/java:jetbrains.mps.generator(MPS.Generator/)" />
     <import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" implicit="true" />
     <import index="xlb7" ref="r:cf42fd0a-68d2-493b-8b77-961658617704(jetbrains.mps.lang.modelapi.behavior)" implicit="true" />
   </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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -2149,8 +2150,11 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODULES" resolve="MODULES" />
       <node concept="1oajcY" id="3x_7aSMkI7S" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="6YP03IIYksX" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/buildassistant.png" />
+    <node concept="1QGGSu" id="6Nf_8jRm2rZ" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRm67z" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Diff.MagicResolve" resolve="MagicResolve" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Diff" resolve="AllIcons.Diff" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="3_loG3uwDi">
@@ -2201,8 +2205,11 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODEL" resolve="MODEL" />
       <node concept="1oajcY" id="3_loG3uwDH" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="FniR$CiprS" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/buildassistant.png" />
+    <node concept="1QGGSu" id="6Nf_8jRm9$8" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRmb_4" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Diff.MagicResolve" resolve="MagicResolve" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Diff" resolve="AllIcons.Diff" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="3x_7aSMkC8e">
@@ -2279,8 +2286,11 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODULES" resolve="MODULES" />
       <node concept="1oajcY" id="3x_7aSMkEFL" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="6YP03IIYkCy" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/buildassistant.png" />
+    <node concept="1QGGSu" id="6Nf_8jRmcVE" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRmecy" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Diff.MagicResolve" resolve="MagicResolve" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Diff" resolve="AllIcons.Diff" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="3_loG33b7f">
@@ -2331,8 +2341,11 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODEL" resolve="MODEL" />
       <node concept="1oajcY" id="3_loG33bjf" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="74geI_h41wO" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/buildassistant.png" />
+    <node concept="1QGGSu" id="6Nf_8jRm73T" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRm8D0" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Diff.MagicResolve" resolve="MagicResolve" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Diff" resolve="AllIcons.Diff" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="3x_7aSMkJ6n">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/icons/context_actions.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/icons/context_actions.png
deleted file mode 100644
index 469c99a41e3..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/icons/context_actions.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime/plugin.mps
index 273fc88e9c6..2a4ba51f1e7 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime/plugin.mps
@@ -21,13 +21,14 @@
     <import index="b9kz" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm.ex(MPS.IDEA/)" />
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" implicit="true" />
   </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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -107,6 +108,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
@@ -593,8 +597,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="3Ymokd9HSJf" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/context_actions.png" />
+    <node concept="1QGGSu" id="1_GBr6nfp3T" role="1nVCmq">
+      <node concept="10M0yZ" id="2uR7kGClsM$" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.IntentionBulbGrey" resolve="IntentionBulbGrey" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
     </node>
   </node>
   <node concept="2uRRBC" id="5lGdLibXpnp">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/icons/emf.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/icons/emf.png
new file mode 100644
index 00000000000..06f81afebe7
Binary files /dev/null and b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/icons/emf.png differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps
index fd324e7d553..9bd4229004e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps
@@ -35,6 +35,11 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </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="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
       <concept id="1207145163717" name="jetbrains.mps.lang.plugin.structure.ElementListContents" flags="ng" index="ftmFs">
         <child id="1207145201301" name="reference" index="ftvYc" />
@@ -47,6 +52,7 @@
         <child id="1203083196627" name="updateBlock" index="tmbBb" />
         <child id="1203083461638" name="executeFunction" index="tncku" />
         <child id="1217413222820" name="parameter" index="1NuT2Z" />
+        <child id="8976425910813834639" name="icon" index="3Uehp1" />
       </concept>
       <concept id="1203071677434" name="jetbrains.mps.lang.plugin.structure.ToolDeclaration" flags="ng" index="sEfby">
         <child id="1214307129846" name="getComponentBlock" index="2Um5zG" />
@@ -72,6 +78,7 @@
       <concept id="6547237850567458268" name="jetbrains.mps.lang.plugin.structure.BaseToolDeclaration" flags="ng" index="2XNcJY">
         <property id="2498620720770664572" name="position" index="2bmUCM" />
         <property id="6547237850567462620" name="caption" index="2XNbzY" />
+        <child id="6791676465872004185" name="toolIcon" index="1nVCmq" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
       <concept id="5538333046911348654" name="jetbrains.mps.lang.plugin.structure.RequiredCondition" flags="ng" index="1oajcY" />
@@ -1550,6 +1557,9 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="KbQql6O$hc" role="1nVCmq">
+      <property role="1iqoE4" value="${module}/icons/emf.png" />
+    </node>
   </node>
   <node concept="sEfby" id="6TiIOkR_ShZ">
     <property role="TrG5h" value="ImportModelViewer" />
@@ -1671,6 +1681,9 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
       <node concept="1oajcY" id="7izjdFIxsrg" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="KbQql6O$pk" role="3Uehp1">
+      <property role="1iqoE4" value="${module}/icons/emf.png" />
+    </node>
   </node>
   <node concept="tC5Ba" id="6TiIOkR_RTk">
     <property role="TrG5h" value="ecoreActionGroup" />
@@ -1753,6 +1766,9 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
       <node concept="1oajcY" id="7izjdFIxjGY" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="1_GBr6nf$J3" role="3Uehp1">
+      <property role="1iqoE4" value="${module}/icons/emf.png" />
+    </node>
   </node>
   <node concept="sE7Ow" id="6TiIOkR_Sie">
     <property role="TrG5h" value="importEcoreModelAction" />
@@ -1793,6 +1809,9 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="KbQql6OzN1" role="3Uehp1">
+      <property role="1iqoE4" value="${module}/icons/emf.png" />
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/play.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/play.png
deleted file mode 100644
index 70e8629a85f..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/play.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/task.svg b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/task.svg
new file mode 100644
index 00000000000..b8d70b2cc68
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/task.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00002 14.0528C7.85812 14.0579 7.71386 14.0118 7.60895 13.9027C5.58951 11.8023 3.28756 12.6215 2.00294 13.3773C1.59499 13.6173 1 13.3303 1 12.857V3.4695C1 3.18531 1.15288 2.92515 1.4121 2.80867C2.56151 2.29219 5.85864 1.09521 8.00003 3.20167C10.1414 1.09521 13.4385 2.29219 14.5879 2.80867C14.8472 2.92515 15 3.18531 15 3.4695V12.857C15 13.3303 14.4051 13.6173 13.9971 13.3773C12.7125 12.6215 10.4105 11.8023 8.3911 13.9027C8.28619 14.0118 8.14193 14.0579 8.00002 14.0528ZM7.50002 4.13097C6.72801 3.22897 5.71886 2.96682 4.674 3.00316C3.61873 3.03987 2.60818 3.38648 2 3.64328V12.2424C2.67243 11.9094 3.53429 11.6052 4.49327 11.5696C5.47659 11.5331 6.51628 11.7821 7.50002 12.4869V4.13097ZM8.50002 12.4869C9.48377 11.7821 10.5235 11.5331 11.5068 11.5696C12.4658 11.6052 13.3276 11.9094 14 12.2424V3.64328C13.3919 3.38648 12.3813 3.03987 11.326 3.00316C10.2812 2.96682 9.27204 3.22897 8.50002 4.13097V12.4869Z" fill="#6C707E"/>
+</svg>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/task_dark.svg b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/task_dark.svg
new file mode 100644
index 00000000000..a65806c27bd
--- /dev/null
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/icons/task_dark.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00002 14.0528C7.85812 14.0579 7.71386 14.0118 7.60895 13.9027C5.58951 11.8023 3.28756 12.6215 2.00294 13.3773C1.59499 13.6173 1 13.3303 1 12.857V3.4695C1 3.18531 1.15288 2.92515 1.4121 2.80867C2.56151 2.29219 5.85864 1.09521 8.00003 3.20167C10.1414 1.09521 13.4385 2.29219 14.5879 2.80867C14.8472 2.92515 15 3.18531 15 3.4695V12.857C15 13.3303 14.4051 13.6173 13.9971 13.3773C12.7125 12.6215 10.4105 11.8023 8.3911 13.9027C8.28619 14.0118 8.14193 14.0579 8.00002 14.0528ZM7.50002 4.13097C6.72801 3.22897 5.71886 2.96682 4.674 3.00316C3.61873 3.03987 2.60818 3.38648 2 3.64328V12.2424C2.67243 11.9094 3.53429 11.6052 4.49327 11.5696C5.47659 11.5331 6.51628 11.7821 7.50002 12.4869V4.13097ZM8.50002 12.4869C9.48377 11.7821 10.5235 11.5331 11.5068 11.5696C12.4658 11.6052 13.3276 11.9094 14 12.2424V3.64328C13.3919 3.38648 12.3813 3.03987 11.326 3.00316C10.2812 2.96682 9.27204 3.22897 8.50002 4.13097V12.4869Z" fill="#CED0D6"/>
+</svg>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps
index a83b5d1d6d5..3da5b6813a6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps
@@ -270,8 +270,8 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
       <node concept="1oajcY" id="2N1CSrzEzc9" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="45f0X_J3uoz" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/play.png" />
+    <node concept="1QGGSu" id="frftTv53d3" role="3Uehp1">
+      <property role="1iqoE4" value="${module}/icons/task.svg" />
     </node>
   </node>
   <node concept="tC5Ba" id="31xWCC5Urf">
@@ -416,6 +416,9 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="2uR7kGCk757" role="3Uehp1">
+      <property role="1iqoE4" value="${module}/icons/task.svg" />
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/icons/folder.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/icons/folder.png
deleted file mode 100644
index e5e22b1a599..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/icons/folder.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps
index 74e7ff72b61..a405d8bb7e5 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps
@@ -28,12 +28,13 @@
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="fnpx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.notification(MPS.IDEA/)" />
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
   </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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -135,6 +136,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534513062" name="jetbrains.mps.baseLanguage.structure.DoubleType" flags="in" index="10P55v" />
@@ -1044,8 +1048,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="67rUwlckK4B" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/folder.png" />
+    <node concept="1QGGSu" id="6Nf_8jRlztq" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRlRJ4" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.GeneratedFolder" resolve="GeneratedFolder" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
     </node>
   </node>
   <node concept="Zd50a" id="6bM7gvq4Vtb">
@@ -1156,8 +1163,11 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MODULE" resolve="MODULE" />
       <node concept="1oajcY" id="7uLL3Mf2_Qz" role="1oa70y" />
     </node>
-    <node concept="1QGGSu" id="6wvhQs7nVXo" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/folder.png" />
+    <node concept="1QGGSu" id="6Nf_8jRlFq7" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRlQXY" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.GeneratedFolder" resolve="GeneratedFolder" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
     </node>
   </node>
   <node concept="tC5Ba" id="DMIuLunJDF">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/arrow_left.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/arrow_left.png
deleted file mode 100644
index 2859b71d993..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/arrow_left.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/arrow_right.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/arrow_right.png
deleted file mode 100644
index f9bf8e6cb58..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/arrow_right.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/code_review.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/code_review.png
deleted file mode 100644
index a3c102468b4..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/code_review.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/folder.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/folder.png
deleted file mode 100644
index e5e22b1a599..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/folder.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/refresh.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/refresh.png
deleted file mode 100644
index 26226601c9d..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/icons/refresh.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps
index 99d8722fb81..717559505f5 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps
@@ -40,8 +40,9 @@
     <import index="lg3m" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.search(MPS.Platform/)" />
     <import index="3ju5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.vfs(MPS.Core/)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
-    <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
+    <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
   </imports>
   <registry>
@@ -67,10 +68,7 @@
         <property id="1860120738943552481" name="val" index="3PKj8l" />
       </concept>
       <concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
-        <property id="2756621024541341363" name="file" index="1iqoE4" />
-      </concept>
-      <concept id="8974276187400029891" name="jetbrains.mps.lang.resources.structure.IconExpression" flags="nn" index="1QGGTA">
-        <child id="8974276187400029893" name="icon" index="1QGGTw" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -625,8 +623,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="335p1i8Lxpe" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/code_review.png" />
+    <node concept="1QGGSu" id="6Nf_8jRlm$U" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRlo_O" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.Settings" resolve="Settings" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
+      </node>
     </node>
   </node>
   <node concept="2uRRBC" id="Gz1BlfcHmK">
@@ -4025,10 +4026,9 @@
                 <node concept="Xl_RD" id="13$DeUDQdkQ" role="37wK5m">
                   <property role="Xl_RC" value=" Select file to review" />
                 </node>
-                <node concept="1QGGTA" id="2QR_NtQCWq4" role="37wK5m">
-                  <node concept="1QGGSu" id="2QR_NtQCX1c" role="1QGGTw">
-                    <property role="1iqoE4" value="${module}/icons/folder.png" />
-                  </node>
+                <node concept="10M0yZ" id="frftTv2WBa" role="37wK5m">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$General.OpenDisk" resolve="OpenDisk" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
                 </node>
               </node>
             </node>
@@ -4042,10 +4042,9 @@
                 <node concept="Xl_RD" id="335p1i8MY6m" role="37wK5m">
                   <property role="Xl_RC" value="" />
                 </node>
-                <node concept="1QGGTA" id="335p1i8MZb4" role="37wK5m">
-                  <node concept="1QGGSu" id="335p1i8MZfK" role="1QGGTw">
-                    <property role="1iqoE4" value="${module}/icons/arrow_left.png" />
-                  </node>
+                <node concept="10M0yZ" id="frftTv3DrT" role="37wK5m">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Back" resolve="Back" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
                 </node>
               </node>
             </node>
@@ -4060,10 +4059,9 @@
               <node concept="1pGfFk" id="5z92V1ozUP2" role="2ShVmc">
                 <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(java.lang.String,javax.swing.Icon)" resolve="JButton" />
                 <node concept="Xl_RD" id="5z92V1ozViy" role="37wK5m" />
-                <node concept="1QGGTA" id="335p1i8N09Z" role="37wK5m">
-                  <node concept="1QGGSu" id="335p1i8N0eF" role="1QGGTw">
-                    <property role="1iqoE4" value="${module}/icons/arrow_right.png" />
-                  </node>
+                <node concept="10M0yZ" id="frftTv47a5" role="37wK5m">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Forward" resolve="Forward" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
                 </node>
               </node>
             </node>
@@ -4108,10 +4106,9 @@
                 <node concept="Xl_RD" id="3Hn7Pd_I3bs" role="37wK5m">
                   <property role="Xl_RC" value="Reload" />
                 </node>
-                <node concept="1QGGTA" id="3Hn7Pd_I4ZC" role="37wK5m">
-                  <node concept="1QGGSu" id="3Hn7Pd_I54f" role="1QGGTw">
-                    <property role="1iqoE4" value="${module}/icons/refresh.png" />
-                  </node>
+                <node concept="10M0yZ" id="frftTv4Cp6" role="37wK5m">
+                  <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Refresh" resolve="Refresh" />
+                  <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
                 </node>
               </node>
             </node>
@@ -6977,8 +6974,11 @@
     <node concept="15feLf" id="48h5VLbZEGE" role="15cTzA">
       <property role="15feLF" value="1" />
     </node>
-    <node concept="1QGGSu" id="335p1i8LEpE" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/code_review.png" />
+    <node concept="1QGGSu" id="5XU4dCzQz8f" role="1nVCmq">
+      <node concept="10M0yZ" id="5XU4dCzQEGd" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$CodeWithMe.CwmPermissionView" resolve="CwmPermissionView" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$CodeWithMe" resolve="AllIcons.CodeWithMe" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="6pgsoSCzlAX">
@@ -7069,8 +7069,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="335p1i8MDBd" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/code_review.png" />
+    <node concept="1QGGSu" id="6Nf_8jRli_T" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRllSj" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.GeneratedFolder" resolve="GeneratedFolder" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="2TQvFxbywia">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps
index f0fa1c951d4..aa591e45b5c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps
@@ -21,10 +21,16 @@
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" implicit="true" />
   </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">
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
+      </concept>
+    </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
       <concept id="1203071677434" name="jetbrains.mps.lang.plugin.structure.ToolDeclaration" flags="ng" index="sEfby">
         <child id="1214307129846" name="getComponentBlock" index="2Um5zG" />
@@ -37,6 +43,7 @@
         <child id="8096638938275469614" name="toolInitBlock" index="uR5cp" />
         <child id="6547237850567462848" name="methodDeclaration" index="2XNbBy" />
         <child id="6547237850567462849" name="fieldDeclaration" index="2XNbBz" />
+        <child id="6791676465872004185" name="toolIcon" index="1nVCmq" />
       </concept>
       <concept id="1208528650020" name="jetbrains.mps.lang.plugin.structure.ToolType" flags="in" index="1xUVSX">
         <reference id="1208529537963" name="tool" index="1xYkEM" />
@@ -78,6 +85,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
@@ -416,6 +426,12 @@
         <node concept="3clFbH" id="C_LCOTqUC5" role="3cqZAp" />
       </node>
     </node>
+    <node concept="1QGGSu" id="5XU4dCzS5po" role="1nVCmq">
+      <node concept="10M0yZ" id="5XU4dCzSd5s" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$FileTypes.Diagram" resolve="Diagram" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$FileTypes" resolve="AllIcons.FileTypes" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7uOgiT8LxA">
     <property role="TrG5h" value="ChartManager" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/icons/diff1.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/icons/diff1.png
deleted file mode 100644
index 24eae8dbc50..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/icons/diff1.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/icons/diff2.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/icons/diff2.png
deleted file mode 100644
index 28b8505c0ee..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/icons/diff2.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps
index 4fdbfbd1df1..eefe66cc179 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps
@@ -24,6 +24,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
@@ -31,7 +32,7 @@
   <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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -117,6 +118,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
@@ -941,8 +945,11 @@
       <node concept="1oajcY" id="2rgL4xy7Ayf" role="1oa70y" />
       <node concept="3Tqbb2" id="2rgL4xy7_1b" role="1tU5fm" />
     </node>
-    <node concept="1QGGSu" id="2rgL4xy7L5I" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/diff1.png" />
+    <node concept="1QGGSu" id="6Nf_8jRl7kL" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRl8wn" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Diff.ArrowLeftDown" resolve="ArrowLeftDown" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Diff" resolve="AllIcons.Diff" />
+      </node>
     </node>
   </node>
   <node concept="sE7Ow" id="2rgL4xy7AJl">
@@ -1010,8 +1017,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="2rgL4xy7Lcg" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/diff2.png" />
+    <node concept="1QGGSu" id="6Nf_8jRl9$6" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRlbXb" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Diff.ArrowRight" resolve="ArrowRight" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Diff" resolve="AllIcons.Diff" />
+      </node>
     </node>
   </node>
   <node concept="tC5Ba" id="2rgL4xy7CcB">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/backIcon.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/backIcon.png
deleted file mode 100644
index 4fa47f37895..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/backIcon.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/fwdIcon.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/fwdIcon.png
deleted file mode 100644
index f926d712d34..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/fwdIcon.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/puml.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/puml.png
deleted file mode 100644
index cdabf56b150..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/puml.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/resetIcon.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/resetIcon.png
deleted file mode 100644
index 6a43eb963f4..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/resetIcon.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/saveIcon.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/saveIcon.png
deleted file mode 100644
index d2d7bb90135..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/saveIcon.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/vis.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/vis.png
deleted file mode 100644
index 792b68d3d03..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/vis.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/zoomInIcon.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/zoomInIcon.png
deleted file mode 100644
index 3017dbb0fba..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/zoomInIcon.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/zoomOutIcon.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/zoomOutIcon.png
deleted file mode 100644
index 6da15c5c8fa..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/icons/zoomOutIcon.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps
index 1aaa0f64a86..a63d30ff3b5 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps
@@ -37,20 +37,21 @@
     <import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
     <import index="81o" ref="c0488c1e-322f-4f38-92d4-5520a7ce96c1/java:net.sourceforge.plantuml(com.mbeddr.mpsutil.plantuml.pluginSolution/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
+    <import index="ughz" ref="124d077c-270f-42ca-8bf8-bee488dc96dc/java:org.w3c.dom.svg(de.itemis.stubs.xml/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="e373" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.util(de.itemis.stubs.batik/)" />
+    <import index="ugom" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.bridge(de.itemis.stubs.batik/)" />
+    <import index="dnq3" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.dom.util(de.itemis.stubs.batik/)" />
     <import index="er5d" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.swing(de.itemis.stubs.batik/)" />
     <import index="4anb" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.swing.svg(de.itemis.stubs.batik/)" />
     <import index="41rc" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.swing.gvt(de.itemis.stubs.batik/)" />
-    <import index="ugom" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.bridge(de.itemis.stubs.batik/)" />
-    <import index="e373" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.util(de.itemis.stubs.batik/)" />
-    <import index="dnq3" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.dom.util(de.itemis.stubs.batik/)" />
-    <import index="ughz" ref="124d077c-270f-42ca-8bf8-bee488dc96dc/java:org.w3c.dom.svg(de.itemis.stubs.xml/)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
   </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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -2107,8 +2108,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="53G_t0Fb_PQ" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/vis.png" />
+    <node concept="1QGGSu" id="5XU4dCzVfhS" role="1nVCmq">
+      <node concept="10M0yZ" id="5XU4dCzVlL3" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$FileTypes.Diagram" resolve="Diagram" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$FileTypes" resolve="AllIcons.FileTypes" />
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1X6acCMyThI">
@@ -2669,7 +2673,7 @@
   </node>
   <node concept="sE7Ow" id="18ZQ$P82xbr">
     <property role="TrG5h" value="ZoomIn" />
-    <property role="2uzpH1" value="Zoom In" />
+    <property role="2uzpH1" value="Zoom In (SVG)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="18ZQ$P82xbs" role="tncku">
@@ -2705,14 +2709,17 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="5BkFC2yhAJ4" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/zoomInIcon.png" />
-    </node>
     <node concept="1DS2jV" id="18ZQ$P85cQE" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="18ZQ$P85cQF" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzWmSw" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzWopf" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.ZoomIn" resolve="ZoomIn" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="18ZQ$P82Epd">
     <property role="TrG5h" value="VisualizeAction" />
@@ -2859,8 +2866,11 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="53G_t0FbBQs" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/vis.png" />
+    <node concept="1QGGSu" id="5XU4dCzVDwy" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzVEQc" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$FileTypes.Diagram" resolve="Diagram" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$FileTypes" resolve="AllIcons.FileTypes" />
+      </node>
     </node>
   </node>
   <node concept="tC5Ba" id="18ZQ$P84YIL">
@@ -2909,7 +2919,7 @@
   </node>
   <node concept="sE7Ow" id="2sPLpCfQji_">
     <property role="TrG5h" value="ZoomOut" />
-    <property role="2uzpH1" value="Zoom Out" />
+    <property role="2uzpH1" value="Zoom Out (SVG)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="2sPLpCfQjiA" role="tncku">
@@ -2945,14 +2955,17 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="2sPLpCfQjiP" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/zoomOutIcon.png" />
-    </node>
     <node concept="1DS2jV" id="2sPLpCfQjiQ" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="2sPLpCfQjiR" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzWoCx" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzWqUx" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.ZoomOut" resolve="ZoomOut" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="2sPLpCfQjiT">
     <property role="TrG5h" value="Save" />
@@ -3151,9 +3164,6 @@
         <node concept="3clFbH" id="2aP19v2Yi5h" role="3cqZAp" />
       </node>
     </node>
-    <node concept="1QGGSu" id="2sPLpCfQjj9" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/saveIcon.png" />
-    </node>
     <node concept="1DS2jV" id="2sPLpCfQjja" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -3164,6 +3174,12 @@
       <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.FRAME" resolve="FRAME" />
       <node concept="1oajcY" id="2aP19v2Ugnt" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzW31G" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzW6oV" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.MenuSaveall" resolve="MenuSaveall" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="2sPLpCfQsmQ">
     <property role="TrG5h" value="PlantUMLSVGCanvas" />
@@ -3195,9 +3211,6 @@
     <node concept="2tJIrI" id="5gmO3pL7WRn" role="jymVt" />
     <node concept="2tJIrI" id="5gmO3pL7I9J" role="jymVt" />
     <node concept="3Tm1VV" id="2sPLpCfQsmR" role="1B3o_S" />
-    <node concept="3uibUv" id="6geq6jk11UV" role="1zkMxy">
-      <ref role="3uigEE" to="er5d:~JSVGCanvas" resolve="JSVGCanvas" />
-    </node>
     <node concept="3clFbW" id="2sPLpCfQsmS" role="jymVt">
       <node concept="3cqZAl" id="2sPLpCfQsmT" role="3clF45" />
       <node concept="3Tm1VV" id="2sPLpCfQsmU" role="1B3o_S" />
@@ -3976,12 +3989,12 @@
                                 <ref role="37wK5l" to="wyt6:~Thread.setContextClassLoader(java.lang.ClassLoader)" resolve="setContextClassLoader" />
                                 <node concept="2OqwBi" id="5ziaHPEAGLQ" role="37wK5m">
                                   <node concept="2OqwBi" id="5ziaHPEAuoL" role="2Oq$k0">
-                                    <node concept="Xjq3P" id="5ziaHPEApcj" role="2Oq$k0">
-                                      <ref role="1HBi2w" node="2sPLpCfQsmQ" resolve="PlantUMLSVGCanvas" />
-                                    </node>
                                     <node concept="liA8E" id="5ziaHPEAzPA" role="2OqNvi">
                                       <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                                     </node>
+                                    <node concept="Xjq3P" id="5ziaHPEApcj" role="2Oq$k0">
+                                      <ref role="1HBi2w" node="2sPLpCfQsmQ" resolve="PlantUMLSVGCanvas" />
+                                    </node>
                                   </node>
                                   <node concept="liA8E" id="5ziaHPEALZA" role="2OqNvi">
                                     <ref role="37wK5l" to="wyt6:~Class.getClassLoader()" resolve="getClassLoader" />
@@ -4173,6 +4186,9 @@
         </node>
       </node>
     </node>
+    <node concept="3uibUv" id="6geq6jk11UV" role="1zkMxy">
+      <ref role="3uigEE" to="er5d:~JSVGCanvas" resolve="JSVGCanvas" />
+    </node>
   </node>
   <node concept="312cEu" id="2sPLpCfQCUL">
     <property role="TrG5h" value="PlantUMLSVGDocumentLoader" />
@@ -4565,9 +4581,6 @@
                   </node>
                 </node>
                 <node concept="3clFbJ" id="2sPLpCfQE4P" role="3cqZAp">
-                  <node concept="1rXfSq" id="6geq6jk2IPw" role="3clFbw">
-                    <ref role="37wK5l" to="e373:~HaltingThread.isHalted()" resolve="isHalted" />
-                  </node>
                   <node concept="3clFbS" id="2sPLpCfQE4R" role="3clFbx">
                     <node concept="3clFbF" id="2sPLpCfQE4S" role="3cqZAp">
                       <node concept="3P9mCS" id="2sPLpCfQE4T" role="3clFbG">
@@ -4582,6 +4595,9 @@
                     </node>
                     <node concept="3cpWs6" id="2sPLpCfQE4W" role="3cqZAp" />
                   </node>
+                  <node concept="1rXfSq" id="6geq6jk2IPw" role="3clFbw">
+                    <ref role="37wK5l" to="e373:~HaltingThread.isHalted()" resolve="isHalted" />
+                  </node>
                 </node>
                 <node concept="3clFbH" id="2sPLpCfQJty" role="3cqZAp" />
                 <node concept="3cpWs8" id="2sPLpCfQnjE" role="3cqZAp">
@@ -4699,9 +4715,6 @@
                       </node>
                     </node>
                     <node concept="3clFbJ" id="2sPLpCfQE56" role="3cqZAp">
-                      <node concept="1rXfSq" id="6geq6jk2Hmb" role="3clFbw">
-                        <ref role="37wK5l" to="e373:~HaltingThread.isHalted()" resolve="isHalted" />
-                      </node>
                       <node concept="3clFbS" id="2sPLpCfQE58" role="3clFbx">
                         <node concept="3clFbF" id="2sPLpCfQE59" role="3cqZAp">
                           <node concept="3P9mCS" id="2sPLpCfQE5a" role="3clFbG">
@@ -4716,6 +4729,9 @@
                         </node>
                         <node concept="3cpWs6" id="2sPLpCfQE5d" role="3cqZAp" />
                       </node>
+                      <node concept="1rXfSq" id="6geq6jk2Hmb" role="3clFbw">
+                        <ref role="37wK5l" to="e373:~HaltingThread.isHalted()" resolve="isHalted" />
+                      </node>
                     </node>
                     <node concept="3clFbF" id="2sPLpCfQE5e" role="3cqZAp">
                       <node concept="37vLTI" id="2sPLpCfQE5f" role="3clFbG">
@@ -5225,7 +5241,7 @@
   </node>
   <node concept="sE7Ow" id="4ppn3W9rGUJ">
     <property role="TrG5h" value="Reset" />
-    <property role="2uzpH1" value="Reset" />
+    <property role="2uzpH1" value="Reset (SVG)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="4ppn3W9rGUK" role="tncku">
@@ -5261,18 +5277,21 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4ppn3W9rGUY" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/resetIcon.png" />
-    </node>
     <node concept="1DS2jV" id="4ppn3W9rGUZ" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="4ppn3W9rGV0" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzVVzt" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzVXbj" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$General.Reset" resolve="Reset" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="AllIcons.General" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="4ppn3W9rIR8">
     <property role="TrG5h" value="Back" />
-    <property role="2uzpH1" value="Previous Visualization" />
+    <property role="2uzpH1" value="Previous (SVG)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="fJN8o" value="true" />
     <property role="1rBW0U" value="true" />
@@ -5298,9 +5317,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4ppn3W9rIRb" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/backIcon.png" />
-    </node>
     <node concept="1DS2jV" id="4ppn3W9rIRc" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -5328,10 +5344,16 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="5XU4dCzVImC" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzVK04" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Back" resolve="Back" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="4ppn3W9rIRe">
     <property role="TrG5h" value="Forward" />
-    <property role="2uzpH1" value="Next Visualization" />
+    <property role="2uzpH1" value="Next Visualization (SVG)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="fJN8o" value="true" />
     <property role="1rBW0U" value="true" />
@@ -5357,9 +5379,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="4ppn3W9rIRh" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/fwdIcon.png" />
-    </node>
     <node concept="1DS2jV" id="4ppn3W9rIRi" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
@@ -5388,6 +5407,12 @@
         <node concept="3clFbH" id="2aP19v30Uav" role="3cqZAp" />
       </node>
     </node>
+    <node concept="1QGGSu" id="5XU4dCzVSUN" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzVURB" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Forward" resolve="Forward" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="2aP19v311Mf">
     <property role="TrG5h" value="VisualisationHistory" />
@@ -6119,7 +6144,7 @@
   </node>
   <node concept="sE7Ow" id="6IuaPRfaRij">
     <property role="TrG5h" value="CopySources" />
-    <property role="2uzpH1" value="Copy sources to clipboard" />
+    <property role="2uzpH1" value="Copy sources to clipboard (SVG)" />
     <property role="3GE5qa" value="toolbar" />
     <property role="1rBW0U" value="true" />
     <node concept="tnohg" id="6IuaPRfaRik" role="tncku">
@@ -6206,14 +6231,17 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="6IuaPRfaRiy" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/puml.png" />
-    </node>
     <node concept="1DS2jV" id="6IuaPRfaRiz" role="1NuT2Z">
       <property role="TrG5h" value="project" />
       <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
       <node concept="1oajcY" id="6IuaPRfaRi$" role="1oa70y" />
     </node>
+    <node concept="1QGGSu" id="5XU4dCzVR2x" role="3Uehp1">
+      <node concept="10M0yZ" id="5XU4dCzVSsO" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Copy" resolve="Copy" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
+    </node>
   </node>
   <node concept="sE7Ow" id="bhVSeGf3sb">
     <property role="TrG5h" value="VisualizeActionParametrized" />
@@ -6317,9 +6345,6 @@
         </node>
       </node>
     </node>
-    <node concept="1QGGSu" id="bhVSeGf3t4" role="3Uehp1">
-      <property role="1iqoE4" value="${module}/icons/vis.png" />
-    </node>
     <node concept="2ScWuX" id="bhVSeGf5_Y" role="tmbBb">
       <node concept="3clFbS" id="bhVSeGf5_Z" role="2VODD2">
         <node concept="3clFbF" id="bhVSeFXdrL" role="3cqZAp">
@@ -6348,6 +6373,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="6Nf_8jRkT6T" role="3Uehp1">
+      <node concept="10M0yZ" id="6Nf_8jRl5Hd" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$FileTypes.Diagram" resolve="Diagram" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$FileTypes" resolve="AllIcons.FileTypes" />
+      </node>
+    </node>
   </node>
   <node concept="tC5Ba" id="bhVSeGf9hE">
     <property role="TrG5h" value="VisualizeActionGroupDynamic" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormConfigurable.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormConfigurable.mpsr
index e90d624d910..8eb853cdf67 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormConfigurable.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.preferenceform.runtime/models/AbstractPreferenceFormConfigurable.mpsr
@@ -199,6 +199,9 @@
     <node concept="3uibUv" id="X7OD3Wrikr" role="EKbjA">
       <ref role="3uigEE" to="hq8m:~Configurable" resolve="Configurable" />
     </node>
+    <node concept="3uibUv" id="3dMezZ0ymKN" role="EKbjA">
+      <ref role="3uigEE" to="hq8m:~SearchableConfigurable" resolve="SearchableConfigurable" />
+    </node>
     <node concept="Wx3nA" id="4vnGofEqMD3" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="TrG5h" value="OWN_CLIENT_PROPERTY_KEY" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/icons/trace.png b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/icons/trace.png
deleted file mode 100644
index a2ec841209f..00000000000
Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/icons/trace.png and /dev/null differ
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
index c4ffcfcf95e..86c1bc0c602 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps
@@ -54,13 +54,13 @@
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="gsia" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.event(JDK/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
-    <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
     <import index="gspm" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui.popup(MPS.IDEA/)" />
+    <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
   </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" />
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
       </concept>
     </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -1118,8 +1118,11 @@
         <ref role="3uigEE" to="z1c3:~MPSProject" resolve="MPSProject" />
       </node>
     </node>
-    <node concept="1QGGSu" id="5d4VabvUrnR" role="1nVCmq">
-      <property role="1iqoE4" value="${module}/icons/trace.png" />
+    <node concept="1QGGSu" id="5XU4dCzWuZZ" role="1nVCmq">
+      <node concept="10M0yZ" id="5XU4dCzXya7" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Actions.TraceInto" resolve="TraceInto" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="AllIcons.Actions" />
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2jSY3BO406M">
@@ -4875,9 +4878,6 @@
         <node concept="3Tm1VV" id="5syY_AMvqCC" role="1B3o_S" />
       </node>
       <node concept="3Tmbuc" id="3EF07BwyiEp" role="1B3o_S" />
-      <node concept="3uibUv" id="43zZ$xOYbZ0" role="1zkMxy">
-        <ref role="3uigEE" node="43zZ$xOUWtT" resolve="TraceTab.TraceAction" />
-      </node>
       <node concept="3clFb_" id="47H5HUZ1V3T" role="jymVt">
         <property role="TrG5h" value="actionPerformed" />
         <node concept="3Tm1VV" id="47H5HUZ1V3U" role="1B3o_S" />
@@ -4902,6 +4902,9 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="3uibUv" id="43zZ$xOYbZ0" role="1zkMxy">
+        <ref role="3uigEE" node="43zZ$xOUWtT" resolve="TraceTab.TraceAction" />
+      </node>
     </node>
     <node concept="2tJIrI" id="5U8d23PWktf" role="jymVt" />
     <node concept="312cEu" id="5U8d23PWgMB" role="jymVt">
@@ -4927,9 +4930,6 @@
         <node concept="3Tm1VV" id="5U8d23PWgMI" role="1B3o_S" />
       </node>
       <node concept="3Tmbuc" id="3EF07Bwya9g" role="1B3o_S" />
-      <node concept="3uibUv" id="6LC1q0qTytq" role="1zkMxy">
-        <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
-      </node>
       <node concept="3clFb_" id="5U8d23PWgML" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="isSelected" />
@@ -5030,6 +5030,9 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="3uibUv" id="6LC1q0qTytq" role="1zkMxy">
+        <ref role="3uigEE" to="qkt:~ToggleAction" resolve="ToggleAction" />
+      </node>
     </node>
     <node concept="2tJIrI" id="3wJ9Qm10iLQ" role="jymVt" />
     <node concept="312cEu" id="3wJ9Qm10p6o" role="jymVt">
@@ -5237,9 +5240,6 @@
         </node>
       </node>
       <node concept="3Tmbuc" id="4LCAlMBQST3" role="1B3o_S" />
-      <node concept="3uibUv" id="43zZ$xOYFTx" role="1zkMxy">
-        <ref role="3uigEE" node="43zZ$xOUWtT" resolve="TraceTab.TraceAction" />
-      </node>
       <node concept="3clFb_" id="7wcaLmvFWm7" role="jymVt">
         <property role="TrG5h" value="update" />
         <node concept="3Tm1VV" id="7wcaLmvFWm8" role="1B3o_S" />
@@ -5284,6 +5284,9 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="3uibUv" id="43zZ$xOYFTx" role="1zkMxy">
+        <ref role="3uigEE" node="43zZ$xOUWtT" resolve="TraceTab.TraceAction" />
+      </node>
     </node>
     <node concept="2tJIrI" id="5U8d23PFxtB" role="jymVt" />
     <node concept="3clFb_" id="7IhZGc$yJxp" role="jymVt">
@@ -5882,9 +5885,6 @@
         </node>
       </node>
       <node concept="3Tmbuc" id="7rNasV4jYlT" role="1B3o_S" />
-      <node concept="3uibUv" id="43zZ$xOZI3L" role="1zkMxy">
-        <ref role="3uigEE" node="43zZ$xOUWtT" resolve="TraceTab.TraceAction" />
-      </node>
       <node concept="3clFb_" id="7wcaLmvCaRG" role="jymVt">
         <property role="TrG5h" value="update" />
         <node concept="3Tm1VV" id="7wcaLmvCaRH" role="1B3o_S" />
@@ -5925,6 +5925,9 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="3uibUv" id="43zZ$xOZI3L" role="1zkMxy">
+        <ref role="3uigEE" node="43zZ$xOUWtT" resolve="TraceTab.TraceAction" />
+      </node>
     </node>
     <node concept="2tJIrI" id="4yQfyMjzv5k" role="jymVt" />
     <node concept="312cEu" id="4yQfyMjyk9O" role="jymVt">
@@ -6260,9 +6263,6 @@
         </node>
       </node>
       <node concept="3Tmbuc" id="3EF07BwwMzj" role="1B3o_S" />
-      <node concept="3uibUv" id="43zZ$xP0L32" role="1zkMxy">
-        <ref role="3uigEE" node="43zZ$xOUWtT" resolve="TraceTab.TraceAction" />
-      </node>
       <node concept="3clFb_" id="7wcaLmvsh1g" role="jymVt">
         <property role="TrG5h" value="update" />
         <node concept="3Tm1VV" id="7wcaLmvsh1h" role="1B3o_S" />
@@ -6326,6 +6326,9 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="3uibUv" id="43zZ$xP0L32" role="1zkMxy">
+        <ref role="3uigEE" node="43zZ$xOUWtT" resolve="TraceTab.TraceAction" />
+      </node>
     </node>
     <node concept="2tJIrI" id="2jSY3BOcmM6" role="jymVt" />
     <node concept="3clFb_" id="4p7g2DNhJ9Z" role="jymVt">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps
index 9dffc875ffb..cb680d66e9d 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps
@@ -24,11 +24,17 @@
     <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="evo" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.newTypesystem.context(MPS.Core/)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="ev0w" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking.backend(MPS.Core/)" implicit="true" />
   </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">
+        <child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
+      </concept>
+    </language>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
       <concept id="1204908117386" name="jetbrains.mps.lang.plugin.structure.Separator" flags="ng" index="2a7GMi" />
       <concept id="1207145163717" name="jetbrains.mps.lang.plugin.structure.ElementListContents" flags="ng" index="ftmFs">
@@ -63,6 +69,7 @@
         <property id="6547237850567462620" name="caption" index="2XNbzY" />
         <child id="6547237850567462848" name="methodDeclaration" index="2XNbBy" />
         <child id="6547237850567462849" name="fieldDeclaration" index="2XNbBz" />
+        <child id="6791676465872004185" name="toolIcon" index="1nVCmq" />
       </concept>
       <concept id="1206092561075" name="jetbrains.mps.lang.plugin.structure.ActionParameterReferenceOperation" flags="nn" index="3gHZIF" />
       <concept id="5538333046911348654" name="jetbrains.mps.lang.plugin.structure.RequiredCondition" flags="ng" index="1oajcY" />
@@ -1306,6 +1313,12 @@
         </node>
       </node>
     </node>
+    <node concept="1QGGSu" id="5XU4dCzY0Z9" role="1nVCmq">
+      <node concept="10M0yZ" id="5XU4dCzYdq5" role="3xaMm5">
+        <ref role="3cqZAo" to="z2i8:~AllIcons$Nodes.Type" resolve="Type" />
+        <ref role="1PxDUh" to="z2i8:~AllIcons$Nodes" resolve="AllIcons.Nodes" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="FUKXd70BF9">
     <property role="TrG5h" value="PerformanceTableModel" />