diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable.svg b/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable.svg
index 50efe953..787b7994 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable.svg
+++ b/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable.svg
@@ -1,4 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <circle cx="8" cy="8" r="6.5" fill="#FFF7F7" stroke="#DB3B4B"/>
-<path d="M7.4826 9.08146C7.4826 8.87172 7.51854 8.68656 7.5904 8.52598C7.66554 8.36213 7.75537 8.22121 7.8599 8.10323C7.9677 7.98525 8.1098 7.84597 8.2862 7.68539C8.4528 7.53137 8.58347 7.40192 8.6782 7.29705C8.7762 7.19218 8.85787 7.06765 8.9232 6.92345C8.9918 6.77926 9.0261 6.61704 9.0261 6.4368C9.0261 6.24345 8.98364 6.07139 8.8987 5.92065C8.81704 5.7699 8.70107 5.65356 8.5508 5.57163C8.4038 5.48642 8.23394 5.44382 8.0412 5.44382C7.8256 5.44382 7.63614 5.49134 7.4728 5.58638C7.30947 5.67814 7.1837 5.80922 7.0955 5.97963C7.0073 6.14677 6.9632 6.34012 6.9632 6.55969H5.8999C5.8999 6.14677 5.9881 5.78464 6.1645 5.47331C6.34417 5.16198 6.5957 4.92275 6.9191 4.75562C7.24577 4.58521 7.6247 4.5 8.0559 4.5C8.4675 4.5 8.82847 4.57865 9.1388 4.73595C9.44914 4.88998 9.6876 5.10955 9.8542 5.39466C10.0241 5.6765 10.1074 6.00257 10.1041 6.37289C10.1041 6.66128 10.0584 6.91362 9.9669 7.12992C9.87544 7.34293 9.766 7.52154 9.6386 7.66573C9.5112 7.80665 9.3446 7.96395 9.1388 8.13764C8.9918 8.26873 8.8742 8.38015 8.786 8.47191C8.70107 8.56039 8.63084 8.66035 8.5753 8.77177C8.51977 8.87992 8.492 8.99953 8.492 9.13062V9.31742H7.4826V9.08146ZM7.3797 10.2416H8.6341V11.5H7.3797V10.2416Z" fill="#DB3B4B"/>
+<path d="M7.59245 8.521C7.67312 8.33767 7.77212 8.18 7.88945 8.048C8.00679 7.916 8.16445 7.75833 8.36245 7.575C8.55312 7.40267 8.70345 7.25417 8.81345 7.1295C8.92712 7.00483 9.02245 6.86 9.09945 6.695C9.17645 6.52633 9.21495 6.33933 9.21495 6.134C9.21495 5.903 9.16545 5.69767 9.06645 5.518C8.97112 5.33833 8.83545 5.199 8.65945 5.1C8.48345 5.001 8.28179 4.9515 8.05445 4.9515C7.80145 4.9515 7.57779 5.0065 7.38345 5.1165C7.18912 5.2265 7.03879 5.3805 6.93245 5.5785C6.90638 5.62705 6.88351 5.67735 6.86383 5.72943C6.75806 6.00931 6.5304 6.2605 6.2312 6.2605C5.932 6.2605 5.68157 6.01527 5.74167 5.72217C5.78989 5.48707 5.87148 5.27051 5.98645 5.0725C6.18445 4.7315 6.46312 4.4675 6.82245 4.2805C7.18179 4.0935 7.59612 4 8.06545 4C8.51279 4 8.90695 4.08617 9.24795 4.2585C9.58895 4.43083 9.85295 4.67467 10.04 4.99C10.227 5.30167 10.3186 5.661 10.315 6.068C10.315 6.38333 10.2655 6.662 10.1665 6.904C10.0675 7.14233 9.94645 7.34217 9.80345 7.5035C9.66045 7.66483 9.47529 7.84633 9.24795 8.048C9.07929 8.19833 8.94729 8.32483 8.85195 8.4275C8.75662 8.53017 8.67595 8.64567 8.60995 8.774C8.59197 8.80996 8.57743 8.84636 8.56569 8.88312C8.47784 9.15799 8.28252 9.401 7.99395 9.401C7.70538 9.401 7.45381 9.16525 7.4934 8.87941C7.51026 8.75764 7.54001 8.6378 7.59245 8.521Z" fill="#DB3B4B"/>
+<circle cx="8" cy="10.75" r="0.75" fill="#DB3B4B"/>
 </svg>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable_dark.svg b/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable_dark.svg
index 0b9ffeaf..de3450f3 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable_dark.svg
+++ b/coderules/languages/jetbrains.mps.lang.coderules/icons/queryTable_dark.svg
@@ -1,4 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <circle cx="8" cy="8" r="6.5" fill="#402929" stroke="#DB5C5C"/>
-<path d="M7.4826 9.08146C7.4826 8.87172 7.51854 8.68656 7.5904 8.52598C7.66554 8.36213 7.75537 8.22121 7.8599 8.10323C7.9677 7.98525 8.1098 7.84597 8.2862 7.68539C8.4528 7.53137 8.58347 7.40192 8.6782 7.29705C8.7762 7.19218 8.85787 7.06765 8.9232 6.92345C8.9918 6.77926 9.0261 6.61704 9.0261 6.4368C9.0261 6.24345 8.98364 6.07139 8.8987 5.92065C8.81704 5.7699 8.70107 5.65356 8.5508 5.57163C8.4038 5.48642 8.23394 5.44382 8.0412 5.44382C7.8256 5.44382 7.63614 5.49134 7.4728 5.58638C7.30947 5.67814 7.1837 5.80922 7.0955 5.97963C7.0073 6.14677 6.9632 6.34012 6.9632 6.55969H5.8999C5.8999 6.14677 5.9881 5.78464 6.1645 5.47331C6.34417 5.16198 6.5957 4.92275 6.9191 4.75562C7.24577 4.58521 7.6247 4.5 8.0559 4.5C8.4675 4.5 8.82847 4.57865 9.1388 4.73595C9.44914 4.88998 9.6876 5.10955 9.8542 5.39466C10.0241 5.6765 10.1074 6.00257 10.1041 6.37289C10.1041 6.66128 10.0584 6.91362 9.9669 7.12992C9.87544 7.34293 9.766 7.52154 9.6386 7.66573C9.5112 7.80665 9.3446 7.96395 9.1388 8.13764C8.9918 8.26873 8.8742 8.38015 8.786 8.47191C8.70107 8.56039 8.63084 8.66035 8.5753 8.77177C8.51977 8.87992 8.492 8.99953 8.492 9.13062V9.31742H7.4826V9.08146ZM7.3797 10.2416H8.6341V11.5H7.3797V10.2416Z" fill="#DB5C5C"/>
+<path d="M7.59245 8.521C7.67312 8.33767 7.77212 8.18 7.88945 8.048C8.00679 7.916 8.16445 7.75833 8.36245 7.575C8.55312 7.40267 8.70345 7.25417 8.81345 7.1295C8.92712 7.00483 9.02245 6.86 9.09945 6.695C9.17645 6.52633 9.21495 6.33933 9.21495 6.134C9.21495 5.903 9.16545 5.69767 9.06645 5.518C8.97112 5.33833 8.83545 5.199 8.65945 5.1C8.48345 5.001 8.28179 4.9515 8.05445 4.9515C7.80145 4.9515 7.57779 5.0065 7.38345 5.1165C7.18912 5.2265 7.03879 5.3805 6.93245 5.5785C6.90638 5.62705 6.88351 5.67735 6.86383 5.72943C6.75806 6.00931 6.5304 6.2605 6.2312 6.2605C5.932 6.2605 5.68157 6.01527 5.74167 5.72217C5.78989 5.48707 5.87148 5.27051 5.98645 5.0725C6.18445 4.7315 6.46312 4.4675 6.82245 4.2805C7.18179 4.0935 7.59612 4 8.06545 4C8.51279 4 8.90695 4.08617 9.24795 4.2585C9.58895 4.43083 9.85295 4.67467 10.04 4.99C10.227 5.30167 10.3186 5.661 10.315 6.068C10.315 6.38333 10.2655 6.662 10.1665 6.904C10.0675 7.14233 9.94645 7.34217 9.80345 7.5035C9.66045 7.66483 9.47529 7.84633 9.24795 8.048C9.07929 8.19833 8.94729 8.32483 8.85195 8.4275C8.75662 8.53017 8.67595 8.64567 8.60995 8.774C8.59197 8.80996 8.57743 8.84636 8.56569 8.88312C8.47784 9.15799 8.28252 9.401 7.99395 9.401C7.70538 9.401 7.45381 9.16525 7.4934 8.87941C7.51026 8.75764 7.54001 8.6378 7.59245 8.521Z" fill="#DB5C5C"/>
+<circle cx="8" cy="10.75" r="0.75" fill="#DB5C5C"/>
 </svg>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/icons/queryTableContribution.svg b/coderules/languages/jetbrains.mps.lang.typechecking/icons/queryTableContribution.svg
index df42ae6c..37a6f8fd 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/icons/queryTableContribution.svg
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/icons/queryTableContribution.svg
@@ -1,6 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M10 1.28988V4C10 5.10457 10.8954 6 12 6H14.7101C14.8987 6.63371 15 7.30503 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C8.69497 1 9.36629 1.10128 10 1.28988Z" fill="#FFF7F7"/>
-<path d="M7.4826 9.08146C7.4826 8.87172 7.51854 8.68656 7.5904 8.52598C7.66554 8.36213 7.75537 8.22121 7.8599 8.10323C7.9677 7.98525 8.1098 7.84597 8.2862 7.68539C8.4528 7.53137 8.58347 7.40192 8.6782 7.29705C8.7762 7.19218 8.85787 7.06765 8.9232 6.92345C8.9918 6.77926 9.0261 6.61704 9.0261 6.4368C9.0261 6.24345 8.98364 6.07139 8.8987 5.92065C8.81704 5.7699 8.70107 5.65356 8.5508 5.57163C8.4038 5.48642 8.23394 5.44382 8.0412 5.44382C7.8256 5.44382 7.63614 5.49134 7.4728 5.58638C7.30947 5.67814 7.1837 5.80922 7.0955 5.97963C7.0073 6.14677 6.9632 6.34012 6.9632 6.55969H5.8999C5.8999 6.14677 5.9881 5.78464 6.1645 5.47331C6.34417 5.16198 6.5957 4.92275 6.9191 4.75562C7.24577 4.58521 7.6247 4.5 8.0559 4.5C8.4675 4.5 8.82847 4.57865 9.1388 4.73595C9.44914 4.88998 9.6876 5.10955 9.8542 5.39466C10.0241 5.6765 10.1074 6.00257 10.1041 6.37289C10.1041 6.66128 10.0584 6.91362 9.9669 7.12992C9.87544 7.34293 9.766 7.52154 9.6386 7.66573C9.5112 7.80665 9.3446 7.96395 9.1388 8.13764C8.9918 8.26873 8.8742 8.38015 8.786 8.47191C8.70107 8.56039 8.63084 8.66035 8.5753 8.77177C8.51977 8.87992 8.492 8.99953 8.492 9.13062V9.31742H7.4826V9.08146ZM7.3797 10.2416H8.6341V11.5H7.3797V10.2416Z" fill="#DB3B4B"/>
 <rect x="11.5" y="0.5" width="4" height="4" rx="0.5" stroke="#6C707E"/>
 <path d="M10 1.28988C9.36629 1.10128 8.69497 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15C11.866 15 15 11.866 15 8C15 7.30503 14.8987 6.63371 14.7101 6H13.6586C13.8797 6.62556 14 7.29873 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 4.68629 4.68629 2 8 2C8.70127 2 9.37444 2.12031 10 2.34141V1.28988Z" fill="#DB3B4B"/>
+<path d="M7.59245 8.521C7.67312 8.33767 7.77212 8.18 7.88945 8.048C8.00679 7.916 8.16445 7.75833 8.36245 7.575C8.55312 7.40267 8.70345 7.25417 8.81345 7.1295C8.92712 7.00483 9.02245 6.86 9.09945 6.695C9.17645 6.52633 9.21495 6.33933 9.21495 6.134C9.21495 5.903 9.16545 5.69767 9.06645 5.518C8.97112 5.33833 8.83545 5.199 8.65945 5.1C8.48345 5.001 8.28179 4.9515 8.05445 4.9515C7.80145 4.9515 7.57779 5.0065 7.38345 5.1165C7.18912 5.2265 7.03879 5.3805 6.93245 5.5785C6.90638 5.62705 6.88351 5.67735 6.86383 5.72943C6.75806 6.00931 6.5304 6.2605 6.2312 6.2605C5.932 6.2605 5.68157 6.01527 5.74167 5.72217C5.78989 5.48707 5.87148 5.27051 5.98645 5.0725C6.18445 4.7315 6.46312 4.4675 6.82245 4.2805C7.18179 4.0935 7.59612 4 8.06545 4C8.51279 4 8.90695 4.08617 9.24795 4.2585C9.58895 4.43083 9.85295 4.67467 10.04 4.99C10.227 5.30167 10.3186 5.661 10.315 6.068C10.315 6.38333 10.2655 6.662 10.1665 6.904C10.0675 7.14233 9.94645 7.34217 9.80345 7.5035C9.66045 7.66483 9.47529 7.84633 9.24795 8.048C9.07929 8.19833 8.94729 8.32483 8.85195 8.4275C8.75662 8.53017 8.67595 8.64567 8.60995 8.774C8.59197 8.80996 8.57743 8.84636 8.56569 8.88312C8.47784 9.15799 8.28252 9.401 7.99395 9.401C7.70538 9.401 7.45381 9.16525 7.4934 8.87941C7.51026 8.75764 7.54001 8.6378 7.59245 8.521Z" fill="#DB3B4B"/>
+<circle cx="8" cy="10.75" r="0.75" fill="#DB3B4B"/>
 </svg>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/icons/queryTableContribution_dark.svg b/coderules/languages/jetbrains.mps.lang.typechecking/icons/queryTableContribution_dark.svg
index 2524822e..0b69fc0d 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/icons/queryTableContribution_dark.svg
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/icons/queryTableContribution_dark.svg
@@ -1,6 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M10 1.28988V4C10 5.10457 10.8954 6 12 6H14.7101C14.8987 6.63371 15 7.30503 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C8.69497 1 9.36629 1.10128 10 1.28988Z" fill="#402929"/>
-<path d="M7.4826 9.08146C7.4826 8.87172 7.51854 8.68656 7.5904 8.52598C7.66554 8.36213 7.75537 8.22121 7.8599 8.10323C7.9677 7.98525 8.1098 7.84597 8.2862 7.68539C8.4528 7.53137 8.58347 7.40192 8.6782 7.29705C8.7762 7.19218 8.85787 7.06765 8.9232 6.92345C8.9918 6.77926 9.0261 6.61704 9.0261 6.4368C9.0261 6.24345 8.98364 6.07139 8.8987 5.92065C8.81704 5.7699 8.70107 5.65356 8.5508 5.57163C8.4038 5.48642 8.23394 5.44382 8.0412 5.44382C7.8256 5.44382 7.63614 5.49134 7.4728 5.58638C7.30947 5.67814 7.1837 5.80922 7.0955 5.97963C7.0073 6.14677 6.9632 6.34012 6.9632 6.55969H5.8999C5.8999 6.14677 5.9881 5.78464 6.1645 5.47331C6.34417 5.16198 6.5957 4.92275 6.9191 4.75562C7.24577 4.58521 7.6247 4.5 8.0559 4.5C8.4675 4.5 8.82847 4.57865 9.1388 4.73595C9.44914 4.88998 9.6876 5.10955 9.8542 5.39466C10.0241 5.6765 10.1074 6.00257 10.1041 6.37289C10.1041 6.66128 10.0584 6.91362 9.9669 7.12992C9.87544 7.34293 9.766 7.52154 9.6386 7.66573C9.5112 7.80665 9.3446 7.96395 9.1388 8.13764C8.9918 8.26873 8.8742 8.38015 8.786 8.47191C8.70107 8.56039 8.63084 8.66035 8.5753 8.77177C8.51977 8.87992 8.492 8.99953 8.492 9.13062V9.31742H7.4826V9.08146ZM7.3797 10.2416H8.6341V11.5H7.3797V10.2416Z" fill="#DB5C5C"/>
 <rect x="11.5" y="0.5" width="4" height="4" rx="0.5" stroke="#CED0D6"/>
 <path d="M10 1.28988C9.36629 1.10128 8.69497 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15C11.866 15 15 11.866 15 8C15 7.30503 14.8987 6.63371 14.7101 6H13.6586C13.8797 6.62556 14 7.29873 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 4.68629 4.68629 2 8 2C8.70127 2 9.37444 2.12031 10 2.34141V1.28988Z" fill="#DB5C5C"/>
+<path d="M7.59245 8.521C7.67312 8.33767 7.77212 8.18 7.88945 8.048C8.00679 7.916 8.16445 7.75833 8.36245 7.575C8.55312 7.40267 8.70345 7.25417 8.81345 7.1295C8.92712 7.00483 9.02245 6.86 9.09945 6.695C9.17645 6.52633 9.21495 6.33933 9.21495 6.134C9.21495 5.903 9.16545 5.69767 9.06645 5.518C8.97112 5.33833 8.83545 5.199 8.65945 5.1C8.48345 5.001 8.28179 4.9515 8.05445 4.9515C7.80145 4.9515 7.57779 5.0065 7.38345 5.1165C7.18912 5.2265 7.03879 5.3805 6.93245 5.5785C6.90638 5.62705 6.88351 5.67735 6.86383 5.72943C6.75806 6.00931 6.5304 6.2605 6.2312 6.2605C5.932 6.2605 5.68157 6.01527 5.74167 5.72217C5.78989 5.48707 5.87148 5.27051 5.98645 5.0725C6.18445 4.7315 6.46312 4.4675 6.82245 4.2805C7.18179 4.0935 7.59612 4 8.06545 4C8.51279 4 8.90695 4.08617 9.24795 4.2585C9.58895 4.43083 9.85295 4.67467 10.04 4.99C10.227 5.30167 10.3186 5.661 10.315 6.068C10.315 6.38333 10.2655 6.662 10.1665 6.904C10.0675 7.14233 9.94645 7.34217 9.80345 7.5035C9.66045 7.66483 9.47529 7.84633 9.24795 8.048C9.07929 8.19833 8.94729 8.32483 8.85195 8.4275C8.75662 8.53017 8.67595 8.64567 8.60995 8.774C8.59197 8.80996 8.57743 8.84636 8.56569 8.88312C8.47784 9.15799 8.28252 9.401 7.99395 9.401C7.70538 9.401 7.45381 9.16525 7.4934 8.87941C7.51026 8.75764 7.54001 8.6378 7.59245 8.521Z" fill="#DB5C5C"/>
+<circle cx="8" cy="10.75" r="0.75" fill="#DB5C5C"/>
 </svg>