diff --git a/build.xml b/build.xml
index 8aa8f97c..d5a207e5 100644
--- a/build.xml
+++ b/build.xml
@@ -1969,6 +1969,7 @@
     </echoxml>
     <jar destfile="${build.layout}/jetbrains.mps.coderules/lib/jetbrains.mps.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/coderules-ideaplugin" />
+      <zipfileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/icons" prefix="icons" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.jar1" />
     </jar>
     <mkdir dir="${build.layout}/coderules-ideaplugin" />
@@ -3529,6 +3530,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/lib/jetbrains.mps.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/coderules-ideaplugin" />
+      <zipfileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/icons" prefix="icons" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.jar3" />
     </jar>
     <zip destfile="${build.layout}/jetbrains.mps.coderules-${ci.mps.release}-0.9-b${ci.build.tag}.zip">
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 6a394720..e93021d8 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -3316,6 +3316,30 @@
                 </node>
               </node>
             </node>
+            <node concept="398223" id="1x1Z3NieIQ8" role="39821P">
+              <node concept="2HvfSZ" id="1x1Z3NieIQO" role="39821P">
+                <node concept="398BVA" id="1x1Z3NieIQP" role="2HvfZ0">
+                  <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                  <node concept="2Ry0Ak" id="1x1Z3NieIQQ" role="iGT6I">
+                    <property role="2Ry0Am" value="coderules" />
+                    <node concept="2Ry0Ak" id="1x1Z3NieIQR" role="2Ry0An">
+                      <property role="2Ry0Am" value="solutions" />
+                      <node concept="2Ry0Ak" id="1x1Z3NieIQS" role="2Ry0An">
+                        <property role="2Ry0Am" value="jetbrains.mps.coderules.ideaplugin" />
+                        <node concept="2Ry0Ak" id="1x1Z3NieIQT" role="2Ry0An">
+                          <property role="2Ry0Am" value="icons" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3_J27D" id="1x1Z3NieIQa" role="Nbhlr">
+                <node concept="3Mxwew" id="1x1Z3NieIQK" role="3MwsjC">
+                  <property role="3MwjfP" value="icons" />
+                </node>
+              </node>
+            </node>
             <node concept="Saw0i" id="adIlSvk2_2" role="39821P">
               <ref role="Saw0g" node="adIlSu_N7G" resolve="coderules-ideaplugin" />
             </node>
@@ -3726,6 +3750,30 @@
                   </node>
                 </node>
               </node>
+              <node concept="398223" id="1x1Z3NifuvY" role="39821P">
+                <node concept="2HvfSZ" id="1x1Z3NifuvZ" role="39821P">
+                  <node concept="398BVA" id="1x1Z3Nifuw0" role="2HvfZ0">
+                    <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                    <node concept="2Ry0Ak" id="1x1Z3Nifuw1" role="iGT6I">
+                      <property role="2Ry0Am" value="coderules" />
+                      <node concept="2Ry0Ak" id="1x1Z3Nifuw2" role="2Ry0An">
+                        <property role="2Ry0Am" value="solutions" />
+                        <node concept="2Ry0Ak" id="1x1Z3Nifuw3" role="2Ry0An">
+                          <property role="2Ry0Am" value="jetbrains.mps.coderules.ideaplugin" />
+                          <node concept="2Ry0Ak" id="1x1Z3Nifuw4" role="2Ry0An">
+                            <property role="2Ry0Am" value="icons" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3_J27D" id="1x1Z3Nifuw5" role="Nbhlr">
+                  <node concept="3Mxwew" id="1x1Z3Nifuw6" role="3MwsjC">
+                    <property role="3MwjfP" value="icons" />
+                  </node>
+                </node>
+              </node>
               <node concept="Saw0i" id="2CPBoDBNCUu" role="39821P">
                 <ref role="Saw0g" node="adIlSu_N7G" resolve="coderules-ideaplugin" />
               </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
index 0c442935..c94b3156 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
@@ -12,7 +12,6 @@
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
     <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/)" />
@@ -24,8 +23,6 @@
     <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
     <import index="hq8m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.options(MPS.IDEA/)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
-    <import index="ctgy" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.plugins(MPS.IDEA/)" />
-    <import index="9ti4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.extensions(MPS.IDEA/)" />
     <import index="j936" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.ui(MPS.IDEA/)" />
     <import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" />
     <import index="mnlj" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.beans(JDK/)" />
@@ -2294,7 +2291,7 @@
       </node>
       <node concept="3Tm6S6" id="39fX5EFCy4h" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="6TxWhg_Bo$b" role="jymVt" />
+    <node concept="2tJIrI" id="1x1Z3NicmCU" role="jymVt" />
     <node concept="312cEg" id="6TxWhg_Bq25" role="jymVt">
       <property role="TrG5h" value="panel" />
       <node concept="3Tm6S6" id="6TxWhg_Bq26" role="1B3o_S" />
@@ -3023,8 +3020,8 @@
                   <node concept="1rXfSq" id="6TxWhgA7CHg" role="37wK5m">
                     <ref role="37wK5l" node="6TxWhg_AqGF" resolve="getText" />
                   </node>
-                  <node concept="37vLTw" id="6TxWhgA7CHh" role="37wK5m">
-                    <ref role="3cqZAo" node="39fX5EFCsBQ" resolve="enabledIcon" />
+                  <node concept="1rXfSq" id="1x1Z3NidPkP" role="37wK5m">
+                    <ref role="37wK5l" node="1x1Z3NidiGN" resolve="getIcon" />
                   </node>
                   <node concept="10M0yZ" id="6TxWhgA7CHi" role="37wK5m">
                     <ref role="3cqZAo" to="dxuu:~SwingConstants.LEFT" resolve="LEFT" />
@@ -3219,20 +3216,8 @@
               </node>
               <node concept="liA8E" id="6TxWhgA86LR" role="2OqNvi">
                 <ref role="37wK5l" to="dxuu:~JLabel.setIcon(javax.swing.Icon)" resolve="setIcon" />
-                <node concept="3K4zz7" id="6TxWhgA8ewY" role="37wK5m">
-                  <node concept="37vLTw" id="6TxWhgA8jtN" role="3K4E3e">
-                    <ref role="3cqZAo" node="39fX5EFCsBQ" resolve="enabledIcon" />
-                  </node>
-                  <node concept="37vLTw" id="6TxWhgA8q5h" role="3K4GZi">
-                    <ref role="3cqZAo" node="39fX5EFCy4f" resolve="disabledIcon" />
-                  </node>
-                  <node concept="2YIFZM" id="4qPSkk6qx_R" role="3K4Cdx">
-                    <ref role="37wK5l" to="rfhd:~Registry.is(java.lang.String)" resolve="is" />
-                    <ref role="1Pybhc" to="rfhd:~Registry" resolve="Registry" />
-                    <node concept="Xl_RD" id="4qPSkk6qx_S" role="37wK5m">
-                      <property role="Xl_RC" value="mps.coderules.typechecking.enabled" />
-                    </node>
-                  </node>
+                <node concept="1rXfSq" id="1x1Z3NidTQF" role="37wK5m">
+                  <ref role="37wK5l" node="1x1Z3NidiGN" resolve="getIcon" />
                 </node>
               </node>
             </node>
@@ -3253,6 +3238,33 @@
         </node>
         <node concept="3Tm6S6" id="6TxWhg_BKGI" role="1B3o_S" />
       </node>
+      <node concept="2tJIrI" id="1x1Z3NidkSw" role="jymVt" />
+      <node concept="3clFb_" id="1x1Z3NidiGN" role="jymVt">
+        <property role="TrG5h" value="getIcon" />
+        <node concept="3Tm6S6" id="1x1Z3NidiGO" role="1B3o_S" />
+        <node concept="3uibUv" id="1x1Z3NidiGP" role="3clF45">
+          <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
+        </node>
+        <node concept="3clFbS" id="1x1Z3NidiGt" role="3clF47">
+          <node concept="3clFbF" id="1x1Z3NieAIM" role="3cqZAp">
+            <node concept="3K4zz7" id="1x1Z3NidiGz" role="3clFbG">
+              <node concept="37vLTw" id="1x1Z3NieAIR" role="3K4E3e">
+                <ref role="3cqZAo" node="39fX5EFCsBQ" resolve="enabledIcon" />
+              </node>
+              <node concept="37vLTw" id="1x1Z3NieAIW" role="3K4GZi">
+                <ref role="3cqZAo" node="39fX5EFCy4f" resolve="disabledIcon" />
+              </node>
+              <node concept="2YIFZM" id="1x1Z3NidiGA" role="3K4Cdx">
+                <ref role="37wK5l" to="rfhd:~Registry.is(java.lang.String)" resolve="is" />
+                <ref role="1Pybhc" to="rfhd:~Registry" resolve="Registry" />
+                <node concept="Xl_RD" id="1x1Z3NidiGB" role="37wK5m">
+                  <property role="Xl_RC" value="mps.coderules.typechecking.enabled" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="6TxWhgA8rcX" role="jymVt" />
       <node concept="3clFb_" id="6TxWhg_Egh4" role="jymVt">
         <property role="TrG5h" value="getToolTipText" />