diff --git a/build.xml b/build.xml
index 1774e5ca..ae8dbc1a 100644
--- a/build.xml
+++ b/build.xml
@@ -2990,6 +2990,7 @@
+
@@ -3167,6 +3168,9 @@
+
+
+
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/macroTable.png b/coderules/languages/jetbrains.mps.lang.coderules/icons/macroTable.png
new file mode 100644
index 00000000..b12a1e2d
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.coderules/icons/macroTable.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/macroTable@2x.png b/coderules/languages/jetbrains.mps.lang.coderules/icons/macroTable@2x.png
new file mode 100644
index 00000000..7db1084d
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.coderules/icons/macroTable@2x.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable.png b/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable.png
new file mode 100644
index 00000000..61fbbc4d
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable@2x.png b/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable@2x.png
new file mode 100644
index 00000000..c4dbad03
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable@2x.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/ruleTable.png b/coderules/languages/jetbrains.mps.lang.coderules/icons/ruleTable.png
new file mode 100644
index 00000000..dd2d1d25
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.coderules/icons/ruleTable.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/ruleTable@2x.png b/coderules/languages/jetbrains.mps.lang.coderules/icons/ruleTable@2x.png
new file mode 100644
index 00000000..90960e3b
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.coderules/icons/ruleTable@2x.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/termTable.png b/coderules/languages/jetbrains.mps.lang.coderules/icons/termTable.png
new file mode 100644
index 00000000..1c85b576
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.coderules/icons/termTable.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/termTable@2x.png b/coderules/languages/jetbrains.mps.lang.coderules/icons/termTable@2x.png
new file mode 100644
index 00000000..0bed3a44
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.coderules/icons/termTable@2x.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index ad6075a3..80e4e848 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -15,6 +15,11 @@
+
+
+
+
+
@@ -82,6 +87,7 @@
+
@@ -141,6 +147,9 @@
+
+
+
@@ -458,6 +467,9 @@
+
+
+
@@ -1552,6 +1564,9 @@
+
+
+
@@ -1619,6 +1634,9 @@
+
+
+
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/icons/tcqueryTable.png b/coderules/languages/jetbrains.mps.lang.typechecking/icons/tcqueryTable.png
new file mode 100644
index 00000000..916fee14
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.typechecking/icons/tcqueryTable.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/icons/tcqueryTable@2x.png b/coderules/languages/jetbrains.mps.lang.typechecking/icons/tcqueryTable@2x.png
new file mode 100644
index 00000000..9a158cb2
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.typechecking/icons/tcqueryTable@2x.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/icons/tctermTable.png b/coderules/languages/jetbrains.mps.lang.typechecking/icons/tctermTable.png
new file mode 100644
index 00000000..07390551
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.typechecking/icons/tctermTable.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/icons/tctermTable@2x.png b/coderules/languages/jetbrains.mps.lang.typechecking/icons/tctermTable@2x.png
new file mode 100644
index 00000000..11d48c36
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.typechecking/icons/tctermTable@2x.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/icons/typesModel.png b/coderules/languages/jetbrains.mps.lang.typechecking/icons/typesModel.png
new file mode 100644
index 00000000..debb899f
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.typechecking/icons/typesModel.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/icons/typesModel@2x.png b/coderules/languages/jetbrains.mps.lang.typechecking/icons/typesModel@2x.png
new file mode 100644
index 00000000..6643d900
Binary files /dev/null and b/coderules/languages/jetbrains.mps.lang.typechecking/icons/typesModel@2x.png differ
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
index c360ee1d..3047a91c 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
@@ -11,11 +11,17 @@
+
+
+
+
+
+
@@ -48,6 +54,9 @@
+
+
+
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index afd0d912..1453a946 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -14,6 +14,11 @@
+
+
+
+
+
@@ -24,6 +29,7 @@
+
@@ -57,6 +63,9 @@
+
+
+
@@ -127,6 +136,9 @@
+
+
+
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 4636488e..1e3a064b 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
@@ -44,6 +44,9 @@
+
+
+
@@ -139,6 +142,7 @@
+
@@ -870,6 +874,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3735,7 +3769,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3746,7 +3807,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+