diff --git a/build.xml b/build.xml
index e8617db9..56a9c0be 100644
--- a/build.xml
+++ b/build.xml
@@ -1605,6 +1605,7 @@
           <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
           <language id="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" />
           <language id="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" />
+          <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
           <language id="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" />
@@ -1618,6 +1619,7 @@
     <jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <zipfileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking/icons" prefix="jetbrains/mps/coderules/typechecking/plugin" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.typechecking.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.typechecking-models">
@@ -2893,6 +2895,7 @@
           <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
           <language id="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" />
           <language id="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" />
+          <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
           <language id="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" />
@@ -2906,6 +2909,7 @@
     <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/languages/jetbrains.mps.coderules.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.typechecking" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <zipfileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.typechecking/icons" prefix="jetbrains/mps/coderules/typechecking/plugin" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.typechecking.jar1" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.typechecking-models1">
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 94ec19c0..bf04bf99 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
@@ -3856,7 +3856,34 @@
             </node>
           </node>
           <node concept="L2wRC" id="7Ant4WkHLmq" role="39821P">
+            <property role="3PtdQa" value="true" />
             <ref role="L2wRA" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
+            <node concept="3PtdJl" id="4zmLkhBJoGz" role="3PtcVe">
+              <node concept="398223" id="4zmLkhBJoHH" role="39821P">
+                <node concept="3_J27D" id="4zmLkhBJoHI" role="Nbhlr">
+                  <node concept="3Mxwew" id="4zmLkhBJoHJ" role="3MwsjC">
+                    <property role="3MwjfP" value="jetbrains/mps/coderules/typechecking/plugin" />
+                  </node>
+                </node>
+                <node concept="2HvfSZ" id="4zmLkhBJoHK" role="39821P">
+                  <node concept="398BVA" id="4zmLkhBJoHL" role="2HvfZ0">
+                    <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                    <node concept="2Ry0Ak" id="4zmLkhBJoHM" role="iGT6I">
+                      <property role="2Ry0Am" value="coderules" />
+                      <node concept="2Ry0Ak" id="4zmLkhBJoHN" role="2Ry0An">
+                        <property role="2Ry0Am" value="solutions" />
+                        <node concept="2Ry0Ak" id="4zmLkhBJoHO" role="2Ry0An">
+                          <property role="2Ry0Am" value="jetbrains.mps.coderules.typechecking" />
+                          <node concept="2Ry0Ak" id="4zmLkhBJoHP" role="2Ry0An">
+                            <property role="2Ry0Am" value="icons" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
           <node concept="L2wRC" id="5pz4PwHqt4r" role="39821P">
             <ref role="L2wRA" node="7mB3viLuogo" resolve="jetbrains.mps.typechecking.testlang" />
@@ -4169,7 +4196,34 @@
               </node>
             </node>
             <node concept="L2wRC" id="65DJywFj_1R" role="39821P">
+              <property role="3PtdQa" value="true" />
               <ref role="L2wRA" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
+              <node concept="3PtdJl" id="4zmLkhBJhBI" role="3PtcVe">
+                <node concept="398223" id="4zmLkhBJo$N" role="39821P">
+                  <node concept="3_J27D" id="4zmLkhBJo$O" role="Nbhlr">
+                    <node concept="3Mxwew" id="4zmLkhBJo$P" role="3MwsjC">
+                      <property role="3MwjfP" value="jetbrains/mps/coderules/typechecking/plugin" />
+                    </node>
+                  </node>
+                  <node concept="2HvfSZ" id="4zmLkhBJo$Q" role="39821P">
+                    <node concept="398BVA" id="4zmLkhBJo$R" role="2HvfZ0">
+                      <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                      <node concept="2Ry0Ak" id="4zmLkhBJo$S" role="iGT6I">
+                        <property role="2Ry0Am" value="coderules" />
+                        <node concept="2Ry0Ak" id="4zmLkhBJo$T" role="2Ry0An">
+                          <property role="2Ry0Am" value="solutions" />
+                          <node concept="2Ry0Ak" id="4zmLkhBJo$U" role="2Ry0An">
+                            <property role="2Ry0Am" value="jetbrains.mps.coderules.typechecking" />
+                            <node concept="2Ry0Ak" id="4zmLkhBJo$V" role="2Ry0An">
+                              <property role="2Ry0Am" value="icons" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
             <node concept="L2wRC" id="65DJywFk8Gh" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules.svg b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules.svg
new file mode 100644
index 00000000..aeb09c98
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules.svg
@@ -0,0 +1,5 @@
+<svg width="23" height="16" viewBox="0 0 23 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2" y="2" width="19" height="12" rx="2" fill="#F98B9E" fill-opacity="0.6"/>
+<path d="M8.13241 11.5C9.62136 11.5 10.8976 10.6008 11.2118 9.32459H10.1966C9.88241 10.0546 9.1041 10.5767 8.13241 10.5767C6.79332 10.5767 5.82647 9.50345 5.82647 8C5.82647 6.49655 6.79332 5.42334 8.13241 5.42334C9.1041 5.42334 9.88241 5.94544 10.1966 6.67541H11.2118C10.8976 5.39917 9.62136 4.5 8.13241 4.5C6.21321 4.5 4.78711 5.99378 4.78711 8C4.78711 10.0062 6.21321 11.5 8.13241 11.5Z" fill="#231F20" fill-opacity="0.7"/>
+<path d="M15.1405 8.37966H16.2131L18.0361 11.357H16.9153L15.1405 8.37966ZM13 4.62305H15.7802C16.2259 4.62305 16.6171 4.70642 16.9538 4.87317C17.2905 5.03671 17.5503 5.26919 17.733 5.57062C17.9158 5.87204 18.0072 6.22157 18.0072 6.6192C18.0072 7.02003 17.9142 7.37276 17.7282 7.6774C17.5422 7.98203 17.2777 8.21772 16.9346 8.38447C16.5947 8.55121 16.197 8.63459 15.7417 8.63459H13.9716V11.357H13V4.62305ZM15.7513 7.76879C15.9982 7.76879 16.2147 7.72229 16.4007 7.6293C16.5867 7.5363 16.731 7.40323 16.8336 7.23007C16.9362 7.05691 16.9875 6.85489 16.9875 6.62401C16.9875 6.39633 16.9362 6.19592 16.8336 6.02276C16.731 5.8496 16.5867 5.71812 16.4007 5.62834C16.2147 5.53534 15.9982 5.48885 15.7513 5.48885H13.9716V7.76879H15.7513Z" fill="#231F20" fill-opacity="0.7"/>
+</svg>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff.svg b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff.svg
new file mode 100644
index 00000000..19526796
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff.svg
@@ -0,0 +1,5 @@
+<svg width="23" height="16" viewBox="0 0 23 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2" y="2" width="19" height="12" rx="2" fill="#9AA7B0" fill-opacity="0.6"/>
+<path d="M8.13241 11.5C9.62136 11.5 10.8976 10.6008 11.2118 9.32459H10.1966C9.88241 10.0546 9.1041 10.5767 8.13241 10.5767C6.79332 10.5767 5.82647 9.50345 5.82647 8C5.82647 6.49655 6.79332 5.42334 8.13241 5.42334C9.1041 5.42334 9.88241 5.94544 10.1966 6.67541H11.2118C10.8976 5.39917 9.62136 4.5 8.13241 4.5C6.21321 4.5 4.78711 5.99378 4.78711 8C4.78711 10.0062 6.21321 11.5 8.13241 11.5Z" fill="#231F20" fill-opacity="0.7"/>
+<path d="M15.1405 8.37966H16.2131L18.0361 11.357H16.9153L15.1405 8.37966ZM13 4.62305H15.7802C16.2259 4.62305 16.6171 4.70642 16.9538 4.87317C17.2905 5.03671 17.5503 5.26919 17.733 5.57062C17.9158 5.87204 18.0072 6.22157 18.0072 6.6192C18.0072 7.02003 17.9142 7.37276 17.7282 7.6774C17.5422 7.98203 17.2777 8.21772 16.9346 8.38447C16.5947 8.55121 16.197 8.63459 15.7417 8.63459H13.9716V11.357H13V4.62305ZM15.7513 7.76879C15.9982 7.76879 16.2147 7.72229 16.4007 7.6293C16.5867 7.5363 16.731 7.40323 16.8336 7.23007C16.9362 7.05691 16.9875 6.85489 16.9875 6.62401C16.9875 6.39633 16.9362 6.19592 16.8336 6.02276C16.731 5.8496 16.5867 5.71812 16.4007 5.62834C16.2147 5.53534 15.9982 5.48885 15.7513 5.48885H13.9716V7.76879H15.7513Z" fill="#231F20" fill-opacity="0.7"/>
+</svg>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff_newui.svg b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff_newui.svg
new file mode 100644
index 00000000..43a16b3a
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff_newui.svg
@@ -0,0 +1,5 @@
+<svg width="23" height="16" viewBox="0 0 23 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="2.5" width="18" height="11" rx="1.5" fill="#EBECF0" stroke="#6C707E"/>
+<path d="M8.13241 11.5C9.62136 11.5 10.8976 10.6008 11.2118 9.32459H10.1966C9.88241 10.0546 9.1041 10.5767 8.13241 10.5767C6.79332 10.5767 5.82647 9.50345 5.82647 8C5.82647 6.49655 6.79332 5.42334 8.13241 5.42334C9.1041 5.42334 9.88241 5.94544 10.1966 6.67541H11.2118C10.8976 5.39917 9.62136 4.5 8.13241 4.5C6.21321 4.5 4.78711 5.99378 4.78711 8C4.78711 10.0062 6.21321 11.5 8.13241 11.5Z" fill="#6C707E"/>
+<path d="M15.1405 8.37966H16.2131L18.0361 11.357H16.9153L15.1405 8.37966ZM13 4.62305H15.7802C16.2259 4.62305 16.6171 4.70642 16.9538 4.87317C17.2905 5.03671 17.5503 5.26919 17.733 5.57062C17.9158 5.87204 18.0072 6.22157 18.0072 6.6192C18.0072 7.02003 17.9142 7.37276 17.7282 7.6774C17.5422 7.98203 17.2777 8.21772 16.9346 8.38447C16.5947 8.55121 16.197 8.63459 15.7417 8.63459H13.9716V11.357H13V4.62305ZM15.7513 7.76879C15.9982 7.76879 16.2147 7.72229 16.4007 7.6293C16.5867 7.5363 16.731 7.40323 16.8336 7.23007C16.9362 7.05691 16.9875 6.85489 16.9875 6.62401C16.9875 6.39633 16.9362 6.19592 16.8336 6.02276C16.731 5.8496 16.5867 5.71812 16.4007 5.62834C16.2147 5.53534 15.9982 5.48885 15.7513 5.48885H13.9716V7.76879H15.7513Z" fill="#6C707E"/>
+</svg>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff_newui_dark.svg b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff_newui_dark.svg
new file mode 100644
index 00000000..40cd05c7
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRulesOff_newui_dark.svg
@@ -0,0 +1,5 @@
+<svg width="23" height="16" viewBox="0 0 23 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="2.5" width="18" height="11" rx="1.5" fill="#43454A" stroke="#CED0D6"/>
+<path d="M8.13241 11.5C9.62136 11.5 10.8976 10.6008 11.2118 9.32459H10.1966C9.88241 10.0546 9.1041 10.5767 8.13241 10.5767C6.79332 10.5767 5.82647 9.50345 5.82647 8C5.82647 6.49655 6.79332 5.42334 8.13241 5.42334C9.1041 5.42334 9.88241 5.94544 10.1966 6.67541H11.2118C10.8976 5.39917 9.62136 4.5 8.13241 4.5C6.21321 4.5 4.78711 5.99378 4.78711 8C4.78711 10.0062 6.21321 11.5 8.13241 11.5Z" fill="#CED0D6"/>
+<path d="M15.1405 8.37966H16.2131L18.0361 11.357H16.9153L15.1405 8.37966ZM13 4.62305H15.7802C16.2259 4.62305 16.6171 4.70642 16.9538 4.87317C17.2905 5.03671 17.5503 5.26919 17.733 5.57062C17.9158 5.87204 18.0072 6.22157 18.0072 6.6192C18.0072 7.02003 17.9142 7.37276 17.7282 7.6774C17.5422 7.98203 17.2777 8.21772 16.9346 8.38447C16.5947 8.55121 16.197 8.63459 15.7417 8.63459H13.9716V11.357H13V4.62305ZM15.7513 7.76879C15.9982 7.76879 16.2147 7.72229 16.4007 7.6293C16.5867 7.5363 16.731 7.40323 16.8336 7.23007C16.9362 7.05691 16.9875 6.85489 16.9875 6.62401C16.9875 6.39633 16.9362 6.19592 16.8336 6.02276C16.731 5.8496 16.5867 5.71812 16.4007 5.62834C16.2147 5.53534 15.9982 5.48885 15.7513 5.48885H13.9716V7.76879H15.7513Z" fill="#CED0D6"/>
+</svg>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules_newui.svg b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules_newui.svg
new file mode 100644
index 00000000..0d7d92d4
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules_newui.svg
@@ -0,0 +1,5 @@
+<svg width="23" height="16" viewBox="0 0 23 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="2.5" width="18" height="11" rx="1.5" fill="#FFF7F7" stroke="#DB3B4B"/>
+<path d="M8.13241 11.5C9.62136 11.5 10.8976 10.6008 11.2118 9.32459H10.1966C9.88241 10.0546 9.1041 10.5767 8.13241 10.5767C6.79332 10.5767 5.82647 9.50345 5.82647 8C5.82647 6.49655 6.79332 5.42334 8.13241 5.42334C9.1041 5.42334 9.88241 5.94544 10.1966 6.67541H11.2118C10.8976 5.39917 9.62136 4.5 8.13241 4.5C6.21321 4.5 4.78711 5.99378 4.78711 8C4.78711 10.0062 6.21321 11.5 8.13241 11.5Z" fill="#DB3B4B"/>
+<path d="M15.1405 8.37966H16.2131L18.0361 11.357H16.9153L15.1405 8.37966ZM13 4.62305H15.7802C16.2259 4.62305 16.6171 4.70642 16.9538 4.87317C17.2905 5.03671 17.5503 5.26919 17.733 5.57062C17.9158 5.87204 18.0072 6.22157 18.0072 6.6192C18.0072 7.02003 17.9142 7.37276 17.7282 7.6774C17.5422 7.98203 17.2777 8.21772 16.9346 8.38447C16.5947 8.55121 16.197 8.63459 15.7417 8.63459H13.9716V11.357H13V4.62305ZM15.7513 7.76879C15.9982 7.76879 16.2147 7.72229 16.4007 7.6293C16.5867 7.5363 16.731 7.40323 16.8336 7.23007C16.9362 7.05691 16.9875 6.85489 16.9875 6.62401C16.9875 6.39633 16.9362 6.19592 16.8336 6.02276C16.731 5.8496 16.5867 5.71812 16.4007 5.62834C16.2147 5.53534 15.9982 5.48885 15.7513 5.48885H13.9716V7.76879H15.7513Z" fill="#DB3B4B"/>
+</svg>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules_newui_dark.svg b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules_newui_dark.svg
new file mode 100644
index 00000000..817cad8d
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/icons/codeRules_newui_dark.svg
@@ -0,0 +1,5 @@
+<svg width="23" height="16" viewBox="0 0 23 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="2.5" width="18" height="11" rx="1.5" fill="#402929" stroke="#DB5C5C"/>
+<path d="M8.13241 11.5C9.62136 11.5 10.8976 10.6008 11.2118 9.32459H10.1966C9.88241 10.0546 9.1041 10.5767 8.13241 10.5767C6.79332 10.5767 5.82647 9.50345 5.82647 8C5.82647 6.49655 6.79332 5.42334 8.13241 5.42334C9.1041 5.42334 9.88241 5.94544 10.1966 6.67541H11.2118C10.8976 5.39917 9.62136 4.5 8.13241 4.5C6.21321 4.5 4.78711 5.99378 4.78711 8C4.78711 10.0062 6.21321 11.5 8.13241 11.5Z" fill="#DB5C5C"/>
+<path d="M15.1405 8.37966H16.2131L18.0361 11.357H16.9153L15.1405 8.37966ZM13 4.62305H15.7802C16.2259 4.62305 16.6171 4.70642 16.9538 4.87317C17.2905 5.03671 17.5503 5.26919 17.733 5.57062C17.9158 5.87204 18.0072 6.22157 18.0072 6.6192C18.0072 7.02003 17.9142 7.37276 17.7282 7.6774C17.5422 7.98203 17.2777 8.21772 16.9346 8.38447C16.5947 8.55121 16.197 8.63459 15.7417 8.63459H13.9716V11.357H13V4.62305ZM15.7513 7.76879C15.9982 7.76879 16.2147 7.72229 16.4007 7.6293C16.5867 7.5363 16.731 7.40323 16.8336 7.23007C16.9362 7.05691 16.9875 6.85489 16.9875 6.62401C16.9875 6.39633 16.9362 6.19592 16.8336 6.02276C16.731 5.8496 16.5867 5.71812 16.4007 5.62834C16.2147 5.53534 15.9982 5.48885 15.7513 5.48885H13.9716V7.76879H15.7513Z" fill="#DB5C5C"/>
+</svg>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
index f013c23d..83395a81 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
@@ -48,6 +48,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 28c97a2d..b0695556 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -16,6 +16,7 @@
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
@@ -105,9 +106,19 @@
     <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="28m1" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.time(JDK/)" />
+    <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.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="1805901909778165289" name="newuiFile" index="uyjgh" />
+        <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" />
+      </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">
@@ -9166,6 +9177,33 @@
         <property role="Xl_RC" value="TypecheckingWidget" />
       </node>
     </node>
+    <node concept="2tJIrI" id="39fX5EFCOVY" role="jymVt" />
+    <node concept="Wx3nA" id="39fX5EFCsBQ" role="jymVt">
+      <property role="TrG5h" value="enabledIcon" />
+      <node concept="3uibUv" id="39fX5EFCsBT" role="1tU5fm">
+        <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
+      </node>
+      <node concept="1QGGTA" id="39fX5EFCsBU" role="33vP2m">
+        <node concept="1QGGSu" id="39fX5EFCsBV" role="1QGGTw">
+          <property role="1iqoE4" value="${module}/icons/codeRules.svg" />
+          <property role="uyjgh" value="${module}/icons/codeRules_newui.svg" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="39fX5EFCsBS" role="1B3o_S" />
+    </node>
+    <node concept="Wx3nA" id="39fX5EFCy4f" role="jymVt">
+      <property role="TrG5h" value="disabledIcon" />
+      <node concept="3uibUv" id="39fX5EFCy4i" role="1tU5fm">
+        <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
+      </node>
+      <node concept="1QGGTA" id="39fX5EFCy4j" role="33vP2m">
+        <node concept="1QGGSu" id="39fX5EFCy4k" role="1QGGTw">
+          <property role="1iqoE4" value="${module}/icons/codeRulesOff.svg" />
+          <property role="uyjgh" value="${module}/icons/codeRulesOff_newui.svg" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="39fX5EFCy4h" role="1B3o_S" />
+    </node>
     <node concept="2tJIrI" id="6TxWhg_Bo$b" role="jymVt" />
     <node concept="312cEg" id="6TxWhg_Bq25" role="jymVt">
       <property role="TrG5h" value="panel" />
@@ -9759,20 +9797,6 @@
           <ref role="3uigEE" to="dxuu:~JLabel" resolve="JLabel" />
         </node>
       </node>
-      <node concept="312cEg" id="6TxWhgA7Gut" role="jymVt">
-        <property role="TrG5h" value="enabledIcon" />
-        <node concept="3Tm6S6" id="6TxWhgA7Gur" role="1B3o_S" />
-        <node concept="3uibUv" id="6TxWhgA7Gus" role="1tU5fm">
-          <ref role="3uigEE" to="o35r:3WU9yfA8xAD" resolve="DynamicIcon" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6TxWhgA7Qbj" role="jymVt">
-        <property role="TrG5h" value="disabledIcon" />
-        <node concept="3Tm6S6" id="6TxWhgA7Qbh" role="1B3o_S" />
-        <node concept="3uibUv" id="6TxWhgA7Qbi" role="1tU5fm">
-          <ref role="3uigEE" to="o35r:3WU9yfA8xAD" resolve="DynamicIcon" />
-        </node>
-      </node>
       <node concept="2tJIrI" id="6TxWhgA7VSn" role="jymVt" />
       <node concept="3clFbW" id="6TxWhg_BkMR" role="jymVt">
         <node concept="3cqZAl" id="6TxWhg_BkMT" role="3clF45" />
@@ -9868,74 +9892,8 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="6TxWhgA7GuC" role="3cqZAp">
-            <node concept="37vLTI" id="6TxWhgA7GuD" role="3clFbG">
-              <node concept="2OqwBi" id="6TxWhgA7GuE" role="37vLTJ">
-                <node concept="Xjq3P" id="6TxWhgA7GuF" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6TxWhgA7GuG" role="2OqNvi">
-                  <ref role="2Oxat5" node="6TxWhgA7Gut" resolve="enabledIcon" />
-                </node>
-              </node>
-              <node concept="2ShNRf" id="6TxWhgA7GuH" role="37vLTx">
-                <node concept="1pGfFk" id="6TxWhgA7GuI" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="o35r:6TxWhg_OIpy" resolve="DynamicIcon" />
-                  <node concept="Xl_RD" id="6TxWhgA7GuJ" role="37wK5m">
-                    <property role="Xl_RC" value="CR" />
-                  </node>
-                  <node concept="10M0yZ" id="6TxWhgA7GuK" role="37wK5m">
-                    <ref role="3cqZAo" to="lzb2:~JBColor.DARK_GRAY" resolve="DARK_GRAY" />
-                    <ref role="1PxDUh" to="exr9:~MPSColors" resolve="MPSColors" />
-                  </node>
-                  <node concept="10M0yZ" id="6TxWhgA7GuL" role="37wK5m">
-                    <ref role="3cqZAo" to="exr9:~MPSColors.PINK" resolve="PINK" />
-                    <ref role="1PxDUh" to="exr9:~MPSColors" resolve="MPSColors" />
-                  </node>
-                  <node concept="37vLTw" id="6TxWhgAkXf8" role="37wK5m">
-                    <ref role="3cqZAo" node="4ot3PHQS3m4" resolve="iconFont" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6TxWhgA7Qbu" role="3cqZAp">
-            <node concept="37vLTI" id="6TxWhgA7Qbv" role="3clFbG">
-              <node concept="2OqwBi" id="6TxWhgA7Qbw" role="37vLTJ">
-                <node concept="Xjq3P" id="6TxWhgA7Qbx" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6TxWhgA7Qby" role="2OqNvi">
-                  <ref role="2Oxat5" node="6TxWhgA7Qbj" resolve="disabledIcon" />
-                </node>
-              </node>
-              <node concept="2ShNRf" id="6TxWhgA7Qbz" role="37vLTx">
-                <node concept="1pGfFk" id="6TxWhgA7Qb$" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="37wK5l" to="o35r:6TxWhg_OIpy" resolve="DynamicIcon" />
-                  <node concept="Xl_RD" id="6TxWhgA7Qb_" role="37wK5m">
-                    <property role="Xl_RC" value="CR" />
-                  </node>
-                  <node concept="10M0yZ" id="6TxWhgA7QbA" role="37wK5m">
-                    <ref role="3cqZAo" to="lzb2:~JBColor.DARK_GRAY" resolve="DARK_GRAY" />
-                    <ref role="1PxDUh" to="exr9:~MPSColors" resolve="MPSColors" />
-                  </node>
-                  <node concept="10M0yZ" id="6TxWhgAcCa0" role="37wK5m">
-                    <ref role="3cqZAo" to="lzb2:~JBColor.LIGHT_GRAY" resolve="LIGHT_GRAY" />
-                    <ref role="1PxDUh" to="exr9:~MPSColors" resolve="MPSColors" />
-                  </node>
-                  <node concept="37vLTw" id="4ot3PHQTjFF" role="37wK5m">
-                    <ref role="3cqZAo" node="4ot3PHQS3m4" resolve="iconFont" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="6TxWhgA7CH9" role="3cqZAp">
             <node concept="37vLTI" id="6TxWhgA7CHa" role="3clFbG">
-              <node concept="2OqwBi" id="6TxWhgA7CHb" role="37vLTJ">
-                <node concept="Xjq3P" id="6TxWhgA7CHc" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6TxWhgA7CHd" role="2OqNvi">
-                  <ref role="2Oxat5" node="6TxWhgA7CGY" resolve="label" />
-                </node>
-              </node>
               <node concept="2ShNRf" id="6TxWhgA7CHe" role="37vLTx">
                 <node concept="1pGfFk" id="6TxWhgA7CHf" role="2ShVmc">
                   <property role="373rjd" value="true" />
@@ -9944,7 +9902,7 @@
                     <ref role="37wK5l" node="6TxWhg_AqGF" resolve="getText" />
                   </node>
                   <node concept="37vLTw" id="6TxWhgA7CHh" role="37wK5m">
-                    <ref role="3cqZAo" node="6TxWhgA7Gut" resolve="enabledIcon" />
+                    <ref role="3cqZAo" node="39fX5EFCsBQ" resolve="enabledIcon" />
                   </node>
                   <node concept="10M0yZ" id="6TxWhgA7CHi" role="37wK5m">
                     <ref role="3cqZAo" to="dxuu:~SwingConstants.LEFT" resolve="LEFT" />
@@ -9952,6 +9910,9 @@
                   </node>
                 </node>
               </node>
+              <node concept="37vLTw" id="39fX5EFD3Yr" role="37vLTJ">
+                <ref role="3cqZAo" node="6TxWhgA7CGY" resolve="label" />
+              </node>
             </node>
           </node>
           <node concept="3clFbF" id="6TxWhg_Gn0F" role="3cqZAp">
@@ -10138,10 +10099,10 @@
                 <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="6TxWhgA7Gut" resolve="enabledIcon" />
+                    <ref role="3cqZAo" node="39fX5EFCsBQ" resolve="enabledIcon" />
                   </node>
                   <node concept="37vLTw" id="6TxWhgA8q5h" role="3K4GZi">
-                    <ref role="3cqZAo" node="6TxWhgA7Qbj" resolve="disabledIcon" />
+                    <ref role="3cqZAo" node="39fX5EFCy4f" resolve="disabledIcon" />
                   </node>
                   <node concept="2OqwBi" id="6TxWhgAyBdZ" role="3K4Cdx">
                     <node concept="37vLTw" id="6TxWhgA8bIm" role="2Oq$k0">
@@ -10175,9 +10136,7 @@
       <node concept="3clFb_" id="6TxWhg_Egh4" role="jymVt">
         <property role="TrG5h" value="getToolTipText" />
         <node concept="3Tm1VV" id="6TxWhg_Egh5" role="1B3o_S" />
-        <node concept="3uibUv" id="6TxWhg_Egh7" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-        </node>
+        <node concept="17QB3L" id="39fX5EFD5E8" role="3clF45" />
         <node concept="3clFbS" id="6TxWhg_Egha" role="3clF47">
           <node concept="3clFbF" id="6TxWhg_ErCn" role="3cqZAp">
             <node concept="2OqwBi" id="6TxWhg_Ev7a" role="3clFbG">
diff --git a/gradle.properties b/gradle.properties
index 56a7d847..c95fcd92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.daemon=false
 org.gradle.logging.level=info
-mpsBuildConfiguration = MPS_20232_Distribution_Binaries
+mpsBuildConfiguration = MPS_20233_Distribution_Binaries
 mpsBuildLabel = 
-mpsBuildNumber = MPS-232.8660.663
-mpsRelease = 2023.2
+mpsBuildNumber = MPS-233.11799.814
+mpsRelease = 2023.3
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index 9d8f7547..07eafe19 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -1084,7 +1084,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
@@ -1234,7 +1234,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
@@ -1385,7 +1385,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
@@ -1536,7 +1536,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
@@ -1692,7 +1692,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index 8401c5c7..691af888 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -483,7 +483,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
@@ -566,7 +566,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index b91916c4..a3ef28f3 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -14378,7 +14378,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.util.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
@@ -15053,7 +15053,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
@@ -15161,7 +15161,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.jar" />
@@ -15268,7 +15268,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
@@ -15375,7 +15375,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
@@ -15475,7 +15475,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.testhelper.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
@@ -15572,7 +15572,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.lang.coderules.runtime.jar" />
@@ -15669,7 +15669,7 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.jar" />
-        <fileset file="${artifacts.coderules}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" />
+        <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.runtime.jar" />
         <fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.execution.util.jar" />