diff --git a/images/src/org/intellij/images/icons/ImagesFileType@2x.svg b/images/src/org/intellij/images/icons/ImagesFileType@2x.svg
deleted file mode 100644
index 485b919d4312..000000000000
--- a/images/src/org/intellij/images/icons/ImagesFileType@2x.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>ImagesFileType@2x</title>
-  <g>
-    <polygon points="12 0 4 8 12 8 12 0" fill="#9aa7b0" opacity="0.7" style="isolation: isolate"/>
-    <path d="M14,0V10H4V30H26V0H14ZM24,28H6V12H24V28Z" fill="#9aa7b0" opacity="0.7" style="isolation: isolate"/>
-    <path d="M22,26H8V22s4.12722-3.79136,6-2c3.06667,2.93333,8,4,8,4v2Z" fill="#62b543" opacity="0.8"/>
-    <path d="M8,14v6s4.127-3.791,6-2c3.06641,2.93359,8,4,8,4V14H8Zm11,4a1,1,0,1,1,1-1A0.99974,0.99974,0,0,1,19,18Z" fill="#40b6e0" opacity="0.8"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/editFolder@2x.svg b/platform/icons/src/modules/editFolder@2x.svg
deleted file mode 100644
index ba5e5ecd5bab..000000000000
--- a/platform/icons/src/modules/editFolder@2x.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>editFolder@2x</title>
-  <g>
-    <g opacity="0.7">
-      <polygon points="30 12.224 30 10 27.775 10 30 12.224" fill="#9aa7b0"/>
-    </g>
-    <g opacity="0.7">
-      <path d="M12.01123,24.13477L12,24.123l0.01953-.01953,1.79785-1.79785L26.123,10H15.96924L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252V28h8.98926Z" fill="#9aa7b0"/>
-    </g>
-    <g opacity="0.7">
-      <polygon points="23.877 28 30 28 30 21.878 23.877 28" fill="#9aa7b0"/>
-    </g>
-  </g>
-  <g>
-    <rect x="14.84239" y="17.01586" width="17.14267" height="7.14223" transform="translate(-7.69954 22.58462) rotate(-44.99785)" fill="#62b543"/>
-    <polygon points="18.868 30.183 13.817 25.133 12 32 18.868 30.183" fill="#9aa7b0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/excludeRoot@2x.svg b/platform/icons/src/modules/excludeRoot@2x.svg
deleted file mode 100644
index 749c5c9cbe27..000000000000
--- a/platform/icons/src/modules/excludeRoot@2x.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>excludeRoot@2x</title>
-  <g id="_Group_" data-name=" Group " opacity="0.6">
-    <path d="M2,28H30V10H15.96914L13.39265,7.423A5.598,5.598,0,0,0,9.95776,6H2.10256A0.10256,0.10256,0,0,0,2,6.10256H2V28Z" fill="#f26522"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/excludedGeneratedRoot@2x.svg b/platform/icons/src/modules/excludedGeneratedRoot@2x.svg
deleted file mode 100644
index b0b8881a8e34..000000000000
--- a/platform/icons/src/modules/excludedGeneratedRoot@2x.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>excludedGeneratedRoot@2x</title>
-  <g opacity="0.6">
-    <path d="M12,24c0-5.52246,4.9248-10,11-10a11.64179,11.64179,0,0,1,7,2.28613V10H15.96924L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252V28H12.92139A9.19405,9.19405,0,0,1,12,24Z" fill="#f26522"/>
-  </g>
-  <g>
-    <path d="M32,23.9989l-0.0002.0048a9.58248,9.58248,0,0,0-8.9986-.0208V23.9727c0.0004-1.7534,2.5426-3.7168,4.0978-4.158C31.0234,18.7017,32,22.5239,32,23.9989Zm-13.0962,4.186c1.5554-.4408,4.0974-2.4044,4.0978-4.1578V24.0167a9.58323,9.58323,0,0,1-8.9986-.0206v0.0046C14.003,25.4757,14.9796,29.2981,18.9038,28.1849Z" fill="#9aa7b0"/>
-    <path d="M18.5012,16.7551l0.0044-.0022a7.87629,7.87629,0,0,0,1.2046,4.2042,8.66961,8.66961,0,0,0,3.2756,3.0512l-0.0096.005c-1.6336.8764-4.7336-.1884-5.9222-1.22C14.055,20.1901,17.1274,17.4927,18.5012,16.7551Zm10.4476,8.4512c-1.1884-1.0318-4.2886-2.0966-5.922-1.2204l-0.0096.0052a8.66706,8.66706,0,0,1,3.2752,3.0512,7.877,7.877,0,0,1,1.2048,4.2042l0.0044-.0022C28.8754,30.5067,31.9478,27.8093,28.9488,25.2063Z" fill="#9aa7b0"/>
-    <path d="M18.5028,31.2453l-0.0042-.0026a8.67061,8.67061,0,0,0,3.3142-3.0718,7.88151,7.88151,0,0,0,1.2044-4.1628l0.0096,0.0052c1.633,0.877,2.191,3.9056,1.8242,5.3782C23.9258,33.1075,19.8768,31.9827,18.5028,31.2453Zm2.6486-12.6372c-0.3666,1.4728.1914,4.501,1.8244,5.3782l0.0098,0.0052a7.87686,7.87686,0,0,1,1.2046-4.1628,8.66931,8.66931,0,0,1,3.314-3.072l-0.0046-.0024C26.1258,16.0169,22.0768,14.8921,21.1514,18.6081Z" fill="#9aa7b0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/generatedFolder@2x.svg b/platform/icons/src/modules/generatedFolder@2x.svg
deleted file mode 100644
index e45e7a4997ee..000000000000
--- a/platform/icons/src/modules/generatedFolder@2x.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>generatedFolder@2x</title>
-  <g opacity="0.7">
-    <path d="M12,24c0-5.52246,4.9248-10,11-10a11.64179,11.64179,0,0,1,7,2.28613V10H15.96924L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252V28H12.92139A9.19405,9.19405,0,0,1,12,24Z" fill="#9aa7b0"/>
-  </g>
-  <g>
-    <path d="M32,23.9989l-0.0002.0048a9.58248,9.58248,0,0,0-8.9986-.0208V23.9727c0.0004-1.7534,2.5426-3.7168,4.0978-4.158C31.0234,18.7017,32,22.5239,32,23.9989Zm-13.0962,4.186c1.5554-.4408,4.0974-2.4044,4.0978-4.1578V24.0167a9.58323,9.58323,0,0,1-8.9986-.0206v0.0046C14.003,25.4757,14.9796,29.2981,18.9038,28.1849Z" fill="#9aa7b0"/>
-    <path d="M18.5012,16.7551l0.0044-.0022a7.87629,7.87629,0,0,0,1.2046,4.2042,8.66961,8.66961,0,0,0,3.2756,3.0512l-0.0096.005c-1.6336.8764-4.7336-.1884-5.9222-1.22C14.055,20.1901,17.1274,17.4927,18.5012,16.7551Zm10.4476,8.4512c-1.1884-1.0318-4.2886-2.0966-5.922-1.2204l-0.0096.0052a8.66706,8.66706,0,0,1,3.2752,3.0512,7.877,7.877,0,0,1,1.2048,4.2042l0.0044-.0022C28.8754,30.5067,31.9478,27.8093,28.9488,25.2063Z" fill="#9aa7b0"/>
-    <path d="M18.5028,31.2453l-0.0042-.0026a8.67061,8.67061,0,0,0,3.3142-3.0718,7.88151,7.88151,0,0,0,1.2044-4.1628l0.0096,0.0052c1.633,0.877,2.191,3.9056,1.8242,5.3782C23.9258,33.1075,19.8768,31.9827,18.5028,31.2453Zm2.6486-12.6372c-0.3666,1.4728.1914,4.501,1.8244,5.3782l0.0098,0.0052a7.87686,7.87686,0,0,1,1.2046-4.1628,8.66931,8.66931,0,0,1,3.314-3.072l-0.0046-.0024C26.1258,16.0169,22.0768,14.8921,21.1514,18.6081Z" fill="#9aa7b0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/generatedSourceRoot@2x.svg b/platform/icons/src/modules/generatedSourceRoot@2x.svg
deleted file mode 100644
index a3ce97d196b3..000000000000
--- a/platform/icons/src/modules/generatedSourceRoot@2x.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>generatedSourceRoot@2x</title>
-  <g opacity="0.6">
-    <path d="M12,24c0-5.52246,4.9248-10,11-10a11.64179,11.64179,0,0,1,7,2.28613V10H15.96924L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252V28H12.92139A9.19405,9.19405,0,0,1,12,24Z" fill="#40b6e0"/>
-  </g>
-  <g>
-    <path d="M32,23.9989l-0.0002.0048a9.58248,9.58248,0,0,0-8.9986-.0208V23.9727c0.0004-1.7534,2.5426-3.7168,4.0978-4.158C31.0234,18.7017,32,22.5239,32,23.9989Zm-13.0962,4.186c1.5554-.4408,4.0974-2.4044,4.0978-4.1578V24.0167a9.58323,9.58323,0,0,1-8.9986-.0206v0.0046C14.003,25.4757,14.9796,29.2981,18.9038,28.1849Z" fill="#9aa7b0"/>
-    <path d="M18.5012,16.7551l0.0044-.0022a7.87629,7.87629,0,0,0,1.2046,4.2042,8.66961,8.66961,0,0,0,3.2756,3.0512l-0.0096.005c-1.6336.8764-4.7336-.1884-5.9222-1.22C14.055,20.1901,17.1274,17.4927,18.5012,16.7551Zm10.4476,8.4512c-1.1884-1.0318-4.2886-2.0966-5.922-1.2204l-0.0096.0052a8.66706,8.66706,0,0,1,3.2752,3.0512,7.877,7.877,0,0,1,1.2048,4.2042l0.0044-.0022C28.8754,30.5067,31.9478,27.8093,28.9488,25.2063Z" fill="#9aa7b0"/>
-    <path d="M18.5028,31.2453l-0.0042-.0026a8.67061,8.67061,0,0,0,3.3142-3.0718,7.88151,7.88151,0,0,0,1.2044-4.1628l0.0096,0.0052c1.633,0.877,2.191,3.9056,1.8242,5.3782C23.9258,33.1075,19.8768,31.9827,18.5028,31.2453Zm2.6486-12.6372c-0.3666,1.4728.1914,4.501,1.8244,5.3782l0.0098,0.0052a7.87686,7.87686,0,0,1,1.2046-4.1628,8.66931,8.66931,0,0,1,3.314-3.072l-0.0046-.0024C26.1258,16.0169,22.0768,14.8921,21.1514,18.6081Z" fill="#9aa7b0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/generatedTestRoot@2x.svg b/platform/icons/src/modules/generatedTestRoot@2x.svg
deleted file mode 100644
index cbf3517d2298..000000000000
--- a/platform/icons/src/modules/generatedTestRoot@2x.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>generatedTestRoot@2x</title>
-  <g opacity="0.6">
-    <path d="M12,24c0-5.52246,4.9248-10,11-10a11.64179,11.64179,0,0,1,7,2.28613V10H15.96924L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252V28H12.92139A9.19405,9.19405,0,0,1,12,24Z" fill="#62b543"/>
-  </g>
-  <g>
-    <path d="M32,23.9989l-0.0002.0048a9.58248,9.58248,0,0,0-8.9986-.0208V23.9727c0.0004-1.7534,2.5426-3.7168,4.0978-4.158C31.0234,18.7017,32,22.5239,32,23.9989Zm-13.0962,4.186c1.5554-.4408,4.0974-2.4044,4.0978-4.1578V24.0167a9.58323,9.58323,0,0,1-8.9986-.0206v0.0046C14.003,25.4757,14.9796,29.2981,18.9038,28.1849Z" fill="#9aa7b0"/>
-    <path d="M18.5012,16.7551l0.0044-.0022a7.87629,7.87629,0,0,0,1.2046,4.2042,8.66961,8.66961,0,0,0,3.2756,3.0512l-0.0096.005c-1.6336.8764-4.7336-.1884-5.9222-1.22C14.055,20.1901,17.1274,17.4927,18.5012,16.7551Zm10.4476,8.4512c-1.1884-1.0318-4.2886-2.0966-5.922-1.2204l-0.0096.0052a8.66706,8.66706,0,0,1,3.2752,3.0512,7.877,7.877,0,0,1,1.2048,4.2042l0.0044-.0022C28.8754,30.5067,31.9478,27.8093,28.9488,25.2063Z" fill="#9aa7b0"/>
-    <path d="M18.5028,31.2453l-0.0042-.0026a8.67061,8.67061,0,0,0,3.3142-3.0718,7.88151,7.88151,0,0,0,1.2044-4.1628l0.0096,0.0052c1.633,0.877,2.191,3.9056,1.8242,5.3782C23.9258,33.1075,19.8768,31.9827,18.5028,31.2453Zm2.6486-12.6372c-0.3666,1.4728.1914,4.501,1.8244,5.3782l0.0098,0.0052a7.87686,7.87686,0,0,1,1.2046-4.1628,8.66931,8.66931,0,0,1,3.314-3.072l-0.0046-.0024C26.1258,16.0169,22.0768,14.8921,21.1514,18.6081Z" fill="#9aa7b0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/library@2x.svg b/platform/icons/src/modules/library@2x.svg
deleted file mode 100644
index 3a6cc56fbfa8..000000000000
--- a/platform/icons/src/modules/library@2x.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>library@2x</title>
-  <g>
-    <rect x="2" y="6" width="4" height="22" fill="#9aa7b0"/>
-    <rect x="8" y="6" width="4" height="22" fill="#62b543"/>
-    <rect x="20" y="6" width="4" height="22" fill="#40b6e0"/>
-    <rect x="26" y="10" width="4" height="18" fill="#9aa7b0"/>
-    <rect x="14" y="2" width="4" height="26" fill="#9aa7b0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/modulesNode@2x.svg b/platform/icons/src/modules/modulesNode@2x.svg
deleted file mode 100644
index ea60e4b13f47..000000000000
--- a/platform/icons/src/modules/modulesNode@2x.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>modulesNode@2x</title>
-  <g opacity="0.7">
-    <polygon points="16 16 24 16 24 2 2 2 2 24 16 24 16 16" fill="#9aa7b0"/>
-  </g>
-  <g>
-    <g id="_Rectangle_" data-name=" Rectangle ">
-      <rect x="26" y="26" width="6" height="6" fill="#40b6e0"/>
-    </g>
-    <g id="_Rectangle_2" data-name=" Rectangle 2">
-      <rect x="18" y="26" width="6" height="6" fill="#40b6e0"/>
-    </g>
-    <g id="_Rectangle_3" data-name=" Rectangle 3">
-      <rect x="26" y="18" width="6" height="6" fill="#40b6e0"/>
-    </g>
-    <g id="_Rectangle_4" data-name=" Rectangle 4">
-      <rect x="18" y="18" width="6" height="6" fill="#40b6e0"/>
-    </g>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/output@2x.svg b/platform/icons/src/modules/output@2x.svg
deleted file mode 100644
index 6596c04fb9f5..000000000000
--- a/platform/icons/src/modules/output@2x.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>output@2x</title>
-  <g>
-    <rect x="2" y="26" width="28" height="4" fill="#9aa7b0"/>
-    <g opacity="0.7">
-      <rect x="4" y="2" width="24" height="22" fill="#9aa7b0"/>
-    </g>
-    <g>
-      <path d="M17,13.996a13.235,13.235,0,0,1-.21842,2.52757,5.54558,5.54558,0,0,1-.70236,1.8897A3.27432,3.27432,0,0,1,14.833,19.59336,3.88609,3.88609,0,0,1,12.98287,20a3.636,3.636,0,0,1-1.76017-.40664,3.36768,3.36768,0,0,1-1.242-1.18007,5.80455,5.80455,0,0,1-.73662-1.8897A11.88263,11.88263,0,0,1,9,13.996a13.235,13.235,0,0,1,.21842-2.52757,5.61907,5.61907,0,0,1,.69379-1.88571,3.23011,3.23011,0,0,1,1.2334-1.17608A3.84065,3.84065,0,0,1,12.98287,8a3.70984,3.70984,0,0,1,1.773.40266,3.36747,3.36747,0,0,1,1.25054,1.17209,5.76062,5.76062,0,0,1,.74518,1.88571A11.72658,11.72658,0,0,1,17,13.996Zm-6.41542,0a14.86124,14.86124,0,0,0,.12848,2.089,5.20909,5.20909,0,0,0,.41113,1.487,2.11651,2.11651,0,0,0,.7409.893,2.00166,2.00166,0,0,0,1.11777.299,2.04369,2.04369,0,0,0,1.12206-.295,2.16479,2.16479,0,0,0,.758-0.885,4.95948,4.95948,0,0,0,.42827-1.487,14.53806,14.53806,0,0,0,.13276-2.101,14.38877,14.38877,0,0,0-.13276-2.089,4.9548,4.9548,0,0,0-.42827-1.48306,2.16479,2.16479,0,0,0-.758-0.885,2.04371,2.04371,0,0,0-1.12206-.295,2.02214,2.02214,0,0,0-1.11777.295,2.09159,2.09159,0,0,0-.7409.885,5.1546,5.1546,0,0,0-.41113,1.48306A14.86137,14.86137,0,0,0,10.58458,13.996Z" fill="#231f20" opacity="0.6" style="isolation: isolate"/>
-      <path d="M23,19.83318H21.38254V12.44351q0-.348.0046-0.74463t0.01838-.78915q0.01379-.39255.02757-0.75273t0.023-.63537q-0.15623.14569-.2757,0.25091t-0.24354.20235q-0.12407.09713-.26192,0.20639t-0.33084.255l-1.36014.97935-0.88225-.99554L21.62148,8H23V19.83318Z" fill="#231f20" opacity="0.6" style="isolation: isolate"/>
-    </g>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/resourcesRoot@2x.svg b/platform/icons/src/modules/resourcesRoot@2x.svg
deleted file mode 100644
index 6f0cffd88903..000000000000
--- a/platform/icons/src/modules/resourcesRoot@2x.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>ResourcesRoot@2x</title>
-  <g>
-    <g opacity="0.7">
-      <path d="M15.96924,10L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252V28H18V16H30V10H15.96924Z" fill="#9aa7b0"/>
-    </g>
-    <rect x="20" y="26" width="12" height="2" fill="#d9a343"/>
-    <rect x="20" y="30" width="12" height="2" fill="#d9a343"/>
-    <rect x="20" y="22" width="12" height="2" fill="#d9a343"/>
-    <rect x="20" y="18" width="12" height="2" fill="#d9a343"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/sourceFolder@2x.svg b/platform/icons/src/modules/sourceFolder@2x.svg
deleted file mode 100644
index 0679b7ab717e..000000000000
--- a/platform/icons/src/modules/sourceFolder@2x.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>sourceFolder@2x</title>
-  <path d="M15.96924,10L13.39258,7.42285A5.59663,5.59663,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252H2V28H30V10H15.96924ZM12.00061,22.98975a3.99466,3.99466,0,1,1,.001,0h-0.001Z" fill="#9aa7b0" opacity="0.7"/>
-  <path d="M12.00061,22.98975a3.99466,3.99466,0,1,1,.001,0h-0.001Z" fill="#9aa7b0" opacity="0.2"/>
-</svg>
diff --git a/platform/icons/src/modules/sourceRoot@2x.svg b/platform/icons/src/modules/sourceRoot@2x.svg
deleted file mode 100644
index d510705ee5cd..000000000000
--- a/platform/icons/src/modules/sourceRoot@2x.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>sourceRoot@2x</title>
-  <g id="_Group_" data-name=" Group " opacity="0.6">
-    <path d="M2,28H30V10H15.96914L13.39265,7.423A5.598,5.598,0,0,0,9.95776,6H2.10256A0.10256,0.10256,0,0,0,2,6.10256H2V28Z" fill="#40b6e0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/sources@2x.svg b/platform/icons/src/modules/sources@2x.svg
deleted file mode 100644
index 97b6fbc6fbfc..000000000000
--- a/platform/icons/src/modules/sources@2x.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>sources@2x</title>
-  <g>
-    <g opacity="0.5">
-      <path d="M9.37207,24H22.62793A12,12,0,1,0,9.37207,24Z" fill="#40b6e0"/>
-    </g>
-    <path d="M21.23186,17.96313l-1.0814-1.10674a4.95515,4.95515,0,0,1-3.76821,1.56092,4.2471,4.2471,0,0,1-4.05469-4.41708V13.967a4.28989,4.28989,0,0,1,4.12959-4.44441l0.041-.00131A5.2348,5.2348,0,0,1,20.14461,10.947l1.02231-1.10934a6.267,6.267,0,0,0-4.6062-1.8374H16.1971a6.05971,6.05971,0,0,0-6.19589,5.9204l-0.00129.0796V14.033a5.9881,5.9881,0,0,0,6.00476,5.96729h0.50721A6.24735,6.24735,0,0,0,21.23186,17.96313Z" fill="#231f20" opacity="0.6" style="isolation: isolate"/>
-    <rect x="2" y="26" width="28" height="4" fill="#9aa7b0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/testResourcesRoot@2x.svg b/platform/icons/src/modules/testResourcesRoot@2x.svg
deleted file mode 100644
index f38b528e6f54..000000000000
--- a/platform/icons/src/modules/testResourcesRoot@2x.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>testResourcesRoot@2x</title>
-  <g>
-    <g opacity="0.7">
-      <path d="M15.96924,10L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10254V28H18V16H30V10H15.96924Z" fill="#9aa7b0"/>
-    </g>
-    <polygon points="9.892 24 4 18.919 9.892 14 9.892 24" fill="#f2510c"/>
-    <polygon points="12 24 17.892 18.919 12 14 12 24" fill="#219444"/>
-    <rect x="20" y="30" width="12" height="2" fill="#d9a343"/>
-    <rect x="20" y="26" width="12" height="2" fill="#d9a343"/>
-    <rect x="20" y="22" width="12" height="2" fill="#d9a343"/>
-    <rect x="20" y="18" width="12" height="2" fill="#d9a343"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/testRoot@2x.svg b/platform/icons/src/modules/testRoot@2x.svg
deleted file mode 100644
index 57a808706ee7..000000000000
--- a/platform/icons/src/modules/testRoot@2x.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>testRoot@2x</title>
-  <g id="_Group_" data-name=" Group " opacity="0.6">
-    <path d="M2,28H30V10H15.96914L13.39265,7.423A5.598,5.598,0,0,0,9.95776,6H2.10256A0.10256,0.10256,0,0,0,2,6.10256H2V28Z" fill="#62b543"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/testSourceFolder@2x.svg b/platform/icons/src/modules/testSourceFolder@2x.svg
deleted file mode 100644
index 16c32a3746c2..000000000000
--- a/platform/icons/src/modules/testSourceFolder@2x.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>testSourceFolder@2x</title>
-  <g>
-    <g opacity="0.7">
-      <path d="M15.96924,10L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10254V28H30V10H15.96924Z" fill="#9aa7b0"/>
-    </g>
-    <polygon points="9.892 24 4 18.919 9.892 14 9.892 24" fill="#f2510c"/>
-    <polygon points="12.108 24 18 18.919 12.108 14 12.108 24" fill="#219444"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/unmarkWebroot@2x.svg b/platform/icons/src/modules/unmarkWebroot@2x.svg
deleted file mode 100644
index 87a8cac79249..000000000000
--- a/platform/icons/src/modules/unmarkWebroot@2x.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>unmarkWebroot@2x</title>
-  <g opacity="0.6">
-    <path d="M15.96924,10L13.39258,7.42285A5.59944,5.59944,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252V28H18V16H30V10H15.96924Z" fill="#40b6e0"/>
-  </g>
-  <circle cx="11.99792" cy="18.99561" r="3.99805" fill="#40b6e0"/>
-  <g id="_Rectangle_" data-name=" Rectangle ">
-    <rect x="20" y="18" width="12" height="12" fill="#9aa7b0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/modules/webRoot@2x.svg b/platform/icons/src/modules/webRoot@2x.svg
deleted file mode 100644
index b92b7e4ba5b4..000000000000
--- a/platform/icons/src/modules/webRoot@2x.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>webRoot@2x</title>
-  <g>
-    <g opacity="0.6">
-      <path d="M15.96924,10L13.39258,7.42285A5.59663,5.59663,0,0,0,9.958,6H2.10254A0.10253,0.10253,0,0,0,2,6.10252V28H30V10H15.96924Z" fill="#40b6e0"/>
-    </g>
-    <circle cx="11.9978" cy="18.99536" r="3.99789" fill="#40b6e0"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/nodes/abstractClass@2x.svg b/platform/icons/src/nodes/abstractClass@2x.svg
deleted file mode 100644
index bd26ec409336..000000000000
--- a/platform/icons/src/nodes/abstractClass@2x.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>abstractClass@2x</title>
-  <g>
-    <g>
-      <path d="M6,6.21094A13.97821,13.97821,0,0,0,6,25.78906Z" fill="#9aa7b0" opacity="0.7"/>
-      <path d="M26,6.21094V25.78906A13.97821,13.97821,0,0,0,26,6.21094Z" fill="#9aa7b0" opacity="0.7"/>
-      <g opacity="0.6">
-        <path d="M24,4.51953a13.96055,13.96055,0,0,0-16,0V27.48047a13.96055,13.96055,0,0,0,16,0Z" fill="#40b6e0"/>
-      </g>
-    </g>
-    <path d="M21.23193,19.96289l-1.08139-1.10674a4.95518,4.95518,0,0,1-3.76822,1.56093A4.24711,4.24711,0,0,1,12.32764,16v-.0332a4.28989,4.28989,0,0,1,4.17062-4.44573A5.23219,5.23219,0,0,1,20.14,12.94235L21.167,11.8374A6.267,6.267,0,0,0,16.5608,10h-.36362A6.05971,6.05971,0,0,0,10,16v.03271A5.9881,5.9881,0,0,0,16.00476,22H16.512A6.24731,6.24731,0,0,0,21.23193,19.96289Z" fill="#231f20" opacity="0.7"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/nodes/abstractMethod@2x.svg b/platform/icons/src/nodes/abstractMethod@2x.svg
index 24ae9f00246d..e9fdd95f54a8 100644
--- a/platform/icons/src/nodes/abstractMethod@2x.svg
+++ b/platform/icons/src/nodes/abstractMethod@2x.svg
@@ -1,15 +1,19 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>abstractMethod@2x</title>
-  <g>
-    <g>
-      <path d="M6,6.21094A13.97821,13.97821,0,0,0,6,25.78906Z" fill="#9aa7b0" opacity="0.7"/>
-      <path d="M26,6.21094V25.78906A13.97821,13.97821,0,0,0,26,6.21094Z" fill="#9aa7b0" opacity="0.7"/>
-      <g opacity="0.6">
-        <path d="M24,4.51953a13.96055,13.96055,0,0,0-16,0V27.48047a13.96055,13.96055,0,0,0,16,0Z" fill="#f98b9e"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+  <defs>
+    <rect id="abstractmethod@2x-a" width="8" height="14"/>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#9AA7B0" fill-opacity=".8" d="M3 3.1055C1.764 4.3685 1 6.0935 1 8.0005 1 9.9065 1.764 11.6315 3 12.8945L3 3.1055zM13 3.1055L13 12.8945C14.236 11.6315 15 9.9065 15 8.0005 15 6.0935 14.236 4.3675 13 3.1055"/>
+    <g transform="translate(4 1)">
+      <mask id="abstractmethod@2x-b" fill="#fff">
+        <use xlink:href="#abstractmethod@2x-a"/>
+      </mask>
+      <g mask="url(#abstractmethod@2x-b)">
+        <g transform="translate(-4 -1)">
+          <path fill="#F98B9E" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
+          <path fill="#231F20" fill-opacity=".7" d="M7.9922,2 C7.9912,1.251 7.49847412,0.0003 5.881628,0.0003 C5.0919717,0.0003 4.49762904,0.201595671 4.0986,0.604187012 C3.69953333,0.201595671 3.13333333,0.0003 2.4,0.0003 C1.93194173,0.0003 1.46527507,0.133277 1,0.399231 L1,0.0003 L0,0.0003 L0,5.0003 L1,5.0003 C0.966666667,3.1563 0.966666667,2.1562 1,2 C1.05,1.7657 1.25,1 2.2,1 C3.15,1 3.499,1.537 3.5,2 L3.5,5.0003 L4.5,5.0003 L4.5,2 C4.5,1.686 4.7591191,1 5.781628,1 C6.8041369,1 7.00413731,1.73961181 7.00469971,2 C7.00469971,2.79041884 7.00469971,3.38323296 7.00469971,3.77844238 C7.00469971,4.0499663 7.00469971,4.45725217 7.00469971,5.0003 L7.9972,5.0003 L7.9922,2 Z" transform="translate(4 6)"/>
+        </g>
       </g>
     </g>
-    <g opacity="0.7" style="isolation: isolate">
-      <path d="M22.05384,21.99992l-.01022-5.58707a3.39476,3.39476,0,0,0-.53713-2.08464,1.95985,1.95985,0,0,0-1.6573-.69487,3.14927,3.14927,0,0,0-1.32476.25124,2.21537,2.21537,0,0,0-.8913.73764,3.27634,3.27634,0,0,0-.506,1.208,7.71426,7.71426,0,0,0-.158,1.66236l.00876,4.50734H15.02228l-.01021-5.58707a3.4206,3.4206,0,0,0-.53178-2.08464,1.94465,1.94465,0,0,0-1.652-.69486,3.062,3.062,0,0,0-1.37815.278,2.17472,2.17472,0,0,0-.89119.82317,3.83158,3.83158,0,0,0-.47907,1.33631A10.20914,10.20914,0,0,0,9.9381,17.8882L10,22H8.00142L8,12l1.56712.233.28,1.58218H9.954a3.338,3.338,0,0,1,.608-.79644,3.48573,3.48573,0,0,1,.774-.56126,3.56528,3.56528,0,0,1,.8972-.3314,4.39377,4.39377,0,0,1,.967-.10692,4.363,4.363,0,0,1,2.13254.47037,2.83127,2.83127,0,0,1,1.25763,1.47528h.08549a3.45529,3.45529,0,0,1,.66672-.86593,3.82641,3.82641,0,0,1,.85408-.604,4.11929,4.11929,0,0,1,.97731-.35814,4.66986,4.66986,0,0,1,1.0471-.1176A3.65813,3.65813,0,0,1,23.03823,13.04a4.71185,4.71185,0,0,1,.95015,3.26593l.01035,5.694Z" fill="#231f20"/>
-    </g>
   </g>
 </svg>
diff --git a/platform/icons/src/nodes/annotationtype@2x.svg b/platform/icons/src/nodes/annotationtype@2x.svg
deleted file mode 100644
index 88718ef07f99..000000000000
--- a/platform/icons/src/nodes/annotationtype@2x.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>annotationtype@2x</title>
-  <g>
-    <g id="_Group_" data-name="&lt;Group&gt;" opacity="0.6">
-      <circle cx="16" cy="16" r="14" fill="#74bd59"/>
-    </g>
-    <path d="M15.79773,24a10.07443,10.07443,0,0,1-3.30973-.50642,6.642,6.642,0,0,1-2.43776-1.44418,6.21125,6.21125,0,0,1-1.51671-2.3089,8.64352,8.64352,0,0,1-.5306-3.12156A9.796,9.796,0,0,1,8.27824,14.285a8.77239,8.77239,0,0,1,.7969-2.0687,8.07318,8.07318,0,0,1,1.26843-1.73243A7.67329,7.67329,0,0,1,12.0465,9.15581a8.44363,8.44363,0,0,1,2.11138-.8527,9.86613,9.86613,0,0,1,2.4758-.30024,8.68068,8.68068,0,0,1,2.96835.4944,6.726,6.726,0,0,1,2.32663,1.41316,6.4,6.4,0,0,1,1.52172,2.23084A7.69919,7.69919,0,0,1,24,15.11371a7.50414,7.50414,0,0,1-.22926,1.8365,5.297,5.297,0,0,1-.68878,1.60832,3.70312,3.70312,0,0,1-1.14329,1.13193,2.95307,2.95307,0,0,1-1.5988.42635,2.58207,2.58207,0,0,1-.69179-.08907,2.274,2.274,0,0,1-.59066-.24921,1.99494,1.99494,0,0,1-.46052-.3733,1.52089,1.52089,0,0,1-.29033-.45538l-.026-.06405-.09511-.06305h-.22625l-.29434.2472c-.10511.10509-.20022.19917-.30334.29124a2.87905,2.87905,0,0,1-.54662.38832,2.92667,2.92667,0,0,1-.66975.26822,3.09229,3.09229,0,0,1-.7969.09908,3.722,3.722,0,0,1-1.45965-.27022,2.89163,2.89163,0,0,1-1.0592-.75862,3.42022,3.42022,0,0,1-.65974-1.194,5.06558,5.06558,0,0,1-.23026-1.56629,5.16275,5.16275,0,0,1,.31235-1.8245,4.07279,4.07279,0,0,1,.885-1.42016,3.96558,3.96558,0,0,1,1.40058-.92476,5.00368,5.00368,0,0,1,1.86611-.33227,9.48684,9.48684,0,0,1,.95107.05c.32837.033.64573.07506.95208.1281.30334.05205.59067.11209.857.17715q.29883.07506.5366.14812l-.21124,4.04832c-.014.14412-.021.29525-.021.44137v.27122a3.04042,3.04042,0,0,0,.07408.74261,1.49665,1.49665,0,0,0,.20724.4944.8086.8086,0,0,0,.33838.28524.954.954,0,0,0,.37843.07606,1.07529,1.07529,0,0,0,.78088-.32827,2.315,2.315,0,0,0,.49656-.80466,5.42477,5.42477,0,0,0,.28232-1.12192,8.99117,8.99117,0,0,0,.09511-1.3401,6.41549,6.41549,0,0,0-.41047-2.36394,5.0898,5.0898,0,0,0-1.14729-1.76645,4.93172,4.93172,0,0,0-1.748-1.0989,6.22471,6.22471,0,0,0-2.18146-.37331,7.43086,7.43086,0,0,0-2.89527.52743A5.79818,5.79818,0,0,0,11.63,11.50074a6.40354,6.40354,0,0,0-1.28445,2.24184,8.79046,8.79046,0,0,0-.43249,2.81531,7.79073,7.79073,0,0,0,.37542,2.52007,4.6964,4.6964,0,0,0,2.98738,3.02648,7.436,7.436,0,0,0,2.50082.38732,10.77979,10.77979,0,0,0,1.22539-.07006c.41546-.049.82893-.11209,1.2424-.19516q.62021-.12009,1.21938-.29424c.29633-.08607.58366-.17714.86-.27522v1.49823a11.367,11.367,0,0,1-2.01528.60349A12.56083,12.56083,0,0,1,15.79773,24Zm.60569-10.75683a2.23612,2.23612,0,0,0-1.1483.27923,2.26364,2.26364,0,0,0-.76286.7266,3.1475,3.1475,0,0,0-.41447,1.00382,5.0282,5.0282,0,0,0-.12414,1.11491,2.7701,2.7701,0,0,0,.4415,1.74844,1.48093,1.48093,0,0,0,1.21437.57247,1.624,1.624,0,0,0,.865-.22518,1.7255,1.7255,0,0,0,.59267-.62352,3.23944,3.23944,0,0,0,.33538-.91175,6.97012,6.97012,0,0,0,.14516-1.14193l.13515-2.387-.08309-.02a4.542,4.542,0,0,0-.59968-.10508A5.84877,5.84877,0,0,0,16.40342,13.24317Z" fill="#231f20" opacity="0.7"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/nodes/class@2x.svg b/platform/icons/src/nodes/class@2x.svg
deleted file mode 100644
index 8838cc44dd80..000000000000
--- a/platform/icons/src/nodes/class@2x.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>class@2x</title>
-  <g>
-    <g id="_Group_" data-name="&lt;Group&gt;" opacity="0.6">
-      <circle cx="16" cy="16" r="14" fill="#40b6e0"/>
-    </g>
-    <path d="M21.23186,19.96313l-1.0814-1.10674a4.95512,4.95512,0,0,1-3.76821,1.56092,4.2471,4.2471,0,0,1-4.05469-4.41707V15.967a4.2899,4.2899,0,0,1,4.17062-4.44573A5.2322,5.2322,0,0,1,20.14,12.94259l1.02695-1.10495a6.267,6.267,0,0,0-4.6062-1.8374H16.1971a6.05972,6.05972,0,0,0-6.19718,6V16.033a5.9881,5.9881,0,0,0,6.00476,5.96729h.50721A6.24734,6.24734,0,0,0,21.23186,19.96313Z" fill="#231f20" opacity="0.7"/>
-  </g>
-</svg>
diff --git a/platform/icons/src/nodes/field@2x.svg b/platform/icons/src/nodes/field@2x.svg
deleted file mode 100644
index 46ec3b377073..000000000000
--- a/platform/icons/src/nodes/field@2x.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>field@2x</title>
-  <g>
-    <g id="_Group_" data-name="&lt;Group&gt;" opacity="0.6">
-      <circle cx="16" cy="16" r="14" fill="#f4af3d"/>
-    </g>
-    <g opacity="0.7">
-      <path d="M19.28906,15.10156H16.418v9.435H14.27344v-9.435H12v-.8789l2.27344-.79688v-1.125a6.94953,6.94953,0,0,1,.26367-2.08008,3.16924,3.16924,0,0,1,.76172-1.31836,2.78285,2.78285,0,0,1,1.22461-.69726A6.04216,6.04216,0,0,1,18.16406,8a5.61835,5.61835,0,0,1,1.27149.13477,9.345,9.345,0,0,1,1.03711.29882l-.55078,1.65235a7.36145,7.36145,0,0,0-.791-.22852,3.94156,3.94156,0,0,0-.89648-.09961,2.60881,2.60881,0,0,0-.8086.11133,1.16562,1.16562,0,0,0-.5625.39258,1.9144,1.9144,0,0,0-.334.76758,5.75217,5.75217,0,0,0-.11133,1.248v1.21875h2.87109Z" fill="#231f20"/>
-    </g>
-  </g>
-</svg>
diff --git a/platform/icons/src/nodes/function@2x.svg b/platform/icons/src/nodes/function@2x.svg
deleted file mode 100644
index 073ec7f4429c..000000000000
--- a/platform/icons/src/nodes/function@2x.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>function@2x</title>
-  <g id="_Group_" data-name=" Group " opacity="0.5">
-    <circle cx="16" cy="16" r="14" fill="#f98b9e"/>
-  </g>
-  <path d="M15.2489,9H9.9999v2h3.8692l0.9846,2.0488L9.9999,23h2.3418l3.6582-7.7714L19.6581,23h2.342Z" fill="#231f20" opacity="0.6" style="isolation: isolate"/>
-</svg>
diff --git a/platform/icons/src/nodes/interface@2x.svg b/platform/icons/src/nodes/interface@2x.svg
index c99fcccf31a7..5be2baa47db3 100644
--- a/platform/icons/src/nodes/interface@2x.svg
+++ b/platform/icons/src/nodes/interface@2x.svg
@@ -1,7 +1,6 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>interface@2x</title>
-  <g id="_Group_" data-name="&lt;Group&gt;" opacity="0.6">
-    <circle cx="16" cy="16" r="14" fill="#74bd59"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#62B543" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
+    <polygon fill="#231F20" fill-rule="nonzero" points="8.6 10 8.6 6 10 6 10 5 6 5 6 6 7.4 6 7.4 10 6 10.007 6 11 10 11 10 10" opacity=".7"/>
   </g>
-  <polygon points="17.227 20 17 20 17 12 17.227 12 19 11.327 19 10 13 10 13 11.327 14.773 12 15 12 15 20 14.773 20 14.773 20.013 13 20.687 13 22 19 22 19 20.687 17.227 20.013 17.227 20" fill="#231f20" opacity="0.7"/>
 </svg>
diff --git a/platform/icons/src/nodes/method@2x.svg b/platform/icons/src/nodes/method@2x.svg
index 337f200f0431..27528d292e81 100644
--- a/platform/icons/src/nodes/method@2x.svg
+++ b/platform/icons/src/nodes/method@2x.svg
@@ -1,11 +1,6 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>method@2x</title>
-  <g>
-    <g id="_Group_" data-name="&lt;Group&gt;" opacity="0.6">
-      <circle cx="16" cy="16" r="14" fill="#f98b9e"/>
-    </g>
-    <g opacity="0.7" style="isolation: isolate">
-      <path d="M22.05384,21.99992l-.01022-5.58707a3.39476,3.39476,0,0,0-.53713-2.08464,1.95985,1.95985,0,0,0-1.6573-.69487,3.14927,3.14927,0,0,0-1.32476.25124,2.21537,2.21537,0,0,0-.8913.73764,3.27634,3.27634,0,0,0-.506,1.208,7.71426,7.71426,0,0,0-.158,1.66236l.00876,4.50734H15.02228l-.01021-5.58707a3.4206,3.4206,0,0,0-.53178-2.08464,1.94465,1.94465,0,0,0-1.652-.69486,3.062,3.062,0,0,0-1.37815.278,2.17472,2.17472,0,0,0-.89119.82317,3.83158,3.83158,0,0,0-.47907,1.33631A10.20914,10.20914,0,0,0,9.9381,17.8882L10,22H8.00142L8,12l1.56712.233.28,1.58218H9.954a3.338,3.338,0,0,1,.608-.79644,3.48573,3.48573,0,0,1,.774-.56126,3.56528,3.56528,0,0,1,.8972-.3314,4.39377,4.39377,0,0,1,.967-.10692,4.363,4.363,0,0,1,2.13254.47037,2.83127,2.83127,0,0,1,1.25763,1.47528h.08549a3.45529,3.45529,0,0,1,.66672-.86593,3.82641,3.82641,0,0,1,.85408-.604,4.11929,4.11929,0,0,1,.97731-.35814,4.66986,4.66986,0,0,1,1.0471-.1176A3.65813,3.65813,0,0,1,23.03823,13.04a4.71185,4.71185,0,0,1,.95015,3.26593l.01035,5.694Z" fill="#231f20"/>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F98B9E" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
+    <path fill="#231F20" fill-opacity=".7" d="M7.9922,2 C7.9912,1.251 7.49847412,0.0003 5.881628,0.0003 C5.0919717,0.0003 4.49762904,0.201595671 4.0986,0.604187012 C3.69953333,0.201595671 3.13333333,0.0003 2.4,0.0003 C1.93194173,0.0003 1.46527507,0.133277 1,0.399231 L1,0.0003 L0,0.0003 L0,5.0003 L1,5.0003 C0.966666667,3.1563 0.966666667,2.1562 1,2 C1.05,1.7657 1.25,1 2.2,1 C3.15,1 3.499,1.537 3.5,2 L3.5,5.0003 L4.5,5.0003 L4.5,2 C4.5,1.686 4.7591191,1 5.781628,1 C6.8041369,1 7.00413731,1.73961181 7.00469971,2 C7.00469971,2.79041884 7.00469971,3.38323296 7.00469971,3.77844238 C7.00469971,4.0499663 7.00469971,4.45725217 7.00469971,5.0003 L7.9972,5.0003 L7.9922,2 Z" transform="translate(4 6)"/>
   </g>
 </svg>
diff --git a/platform/icons/src/nodes/methodReference@2x.svg b/platform/icons/src/nodes/methodReference@2x.svg
index 0e66c7a35e9d..5667e05c50ac 100644
--- a/platform/icons/src/nodes/methodReference@2x.svg
+++ b/platform/icons/src/nodes/methodReference@2x.svg
@@ -1,14 +1,7 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>methodReference@2x</title>
-  <g>
-    <g id="_Group_" data-name="&lt;Group&gt;" opacity="0.6">
-      <circle cx="16" cy="16" r="14" fill="#f98b9e"/>
-    </g>
-    <g opacity="0.7">
-      <path d="M22.05384,21.99992l-.01022-5.58707a3.39476,3.39476,0,0,0-.53713-2.08464,1.95985,1.95985,0,0,0-1.6573-.69487,3.14927,3.14927,0,0,0-1.32476.25124,2.21537,2.21537,0,0,0-.8913.73764,3.27634,3.27634,0,0,0-.506,1.208,7.71426,7.71426,0,0,0-.158,1.66236l.00876,4.50734H15.02228l-.01021-5.58707a3.4206,3.4206,0,0,0-.53178-2.08464,1.94465,1.94465,0,0,0-1.652-.69486,3.062,3.062,0,0,0-1.37815.278,2.17472,2.17472,0,0,0-.89119.82317,3.83158,3.83158,0,0,0-.47907,1.33631A10.20914,10.20914,0,0,0,9.9381,17.8882L10,22H8.00142L8,12l1.56712.233.28,1.58218H9.954a3.338,3.338,0,0,1,.608-.79644,3.48573,3.48573,0,0,1,.774-.56126,3.56528,3.56528,0,0,1,.8972-.3314,4.39377,4.39377,0,0,1,.967-.10692,4.363,4.363,0,0,1,2.13254.47037,2.83127,2.83127,0,0,1,1.25763,1.47528h.08549a3.45529,3.45529,0,0,1,.66672-.86593,3.82641,3.82641,0,0,1,.85408-.604,4.11929,4.11929,0,0,1,.97731-.35814,4.66986,4.66986,0,0,1,1.0471-.1176A3.65813,3.65813,0,0,1,23.03823,13.04a4.71185,4.71185,0,0,1,.95015,3.26593l.01035,5.694Z" fill="#231f20"/>
-    </g>
-    <g opacity="0.7">
-      <path d="M10,10l4.88023-4h1.59331L22,10H19.32591l-3.532-2.70168L12.663,10Z" fill="#231f20"/>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F98B9E" fill-opacity=".6" d="M15,8 C15,11.866 11.866,15 8,15 C4.134,15 1,11.866 1,8 C1,4.134 4.134,1 8,1 C11.866,1 15,4.134 15,8"/>
+    <path fill="#231F20" fill-opacity=".7" d="M7.9922,2 C7.9912,1.251 7.49847412,0.0003 5.881628,0.0003 C5.0919717,0.0003 4.49762904,0.201595671 4.0986,0.604187012 C3.69953333,0.201595671 3.13333333,0.0003 2.4,0.0003 C1.93194173,0.0003 1.46527507,0.133277 1,0.399231 L1,0.0003 L0,0.0003 L0,5.0003 L1,5.0003 C0.966666667,3.1563 0.966666667,2.1562 1,2 C1.05,1.7657 1.25,1 2.2,1 C3.15,1 3.499,1.537 3.5,2 L3.5,5.0003 L4.5,5.0003 L4.5,2 C4.5,1.686 4.7591191,1 5.781628,1 C6.8041369,1 7.00413731,1.73961181 7.00469971,2 C7.00469971,2.79041884 7.00469971,3.38323296 7.00469971,3.77844238 C7.00469971,4.0499663 7.00469971,4.45725217 7.00469971,5.0003 L7.9972,5.0003 L7.9922,2 Z" transform="translate(4 6)"/>
+    <polygon fill="#231F20" fill-opacity=".7" points="5 5 7.44 3 8.236 3 11 5 9.663 5 7.896 3.649 6.331 5"/>
   </g>
 </svg>
diff --git a/platform/icons/src/nodes/static@2x.svg b/platform/icons/src/nodes/static@2x.svg
deleted file mode 100644
index 11e02ae3c598..000000000000
--- a/platform/icons/src/nodes/static@2x.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <title>static@2x</title>
-  <g>
-    <g id="_Group_" data-name="&lt;Group&gt;" opacity="0.6">
-      <circle cx="16" cy="16" r="14" fill="#f4af3d"/>
-    </g>
-    <path d="M21,18.61511a2.74867,2.74867,0,0,1-.39136,1.47628,3.14765,3.14765,0,0,1-1.12686,1.05975,5.82806,5.82806,0,0,1-1.77463.638A11.78589,11.78589,0,0,1,15.37247,22a14.8536,14.8536,0,0,1-2.52362-.18453A7.772,7.772,0,0,1,11,21.27241V19.522q.41835.16872.93117.33216t1.07963.29q.56679.12654,1.16734.20563a9.13942,9.13942,0,0,0,1.19433.07908,8.18022,8.18022,0,0,0,1.49123-.116,3.30269,3.30269,0,0,0,.99865-.33216,1.41446,1.41446,0,0,0,.56005-.52724,1.38146,1.38146,0,0,0,.17544-.69069,1.2769,1.2769,0,0,0-.13495-.59051,1.56,1.56,0,0,0-.49258-.522,5.11486,5.11486,0,0,0-.97841-.522q-.62078-.26363-1.59244-.59051t-1.74764-.64324a6.31061,6.31061,0,0,1-1.31579-.7065,2.85516,2.85516,0,0,1-.83-.90158,2.42892,2.42892,0,0,1-.29015-1.21793,2.36666,2.36666,0,0,1,.37112-1.31283,3.00378,3.00378,0,0,1,1.04589-.96485,5.50421,5.50421,0,0,1,1.61943-.59051A10.17422,10.17422,0,0,1,16.35762,10a12.01547,12.01547,0,0,1,2.39542.22144,14.03567,14.03567,0,0,1,2.058.58l-.85021,1.55008q-.87719-.30579-1.80162-.53251a7.87507,7.87507,0,0,0-1.88259-.22671,4.49942,4.49942,0,0,0-2.03778.35325,1.099,1.099,0,0,0-.66127,1.007,1.284,1.284,0,0,0,.15519.64323,1.56011,1.56011,0,0,0,.53307.5167,5.85863,5.85863,0,0,0,1.01214.49033q.63428.2478,1.579.5536.97165.31635,1.73414.63269a6.25538,6.25538,0,0,1,1.3023.71178,2.85206,2.85206,0,0,1,.82321.90158A2.44525,2.44525,0,0,1,21,18.61511Z" fill="#231f20" opacity="0.7"/>
-  </g>
-</svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRight@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRight@2x.svg
index 9fde2a14d726..74ea06cf9046 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRight@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRight@2x.svg
@@ -1,87 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34" height="42" viewBox="0 0 34 42">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17" height="21" viewBox="0 0 17 21">
   <defs>
-    <rect id="comboright@2x-a" width="34" height="42"/>
-    <linearGradient id="comboright@2x-c" x1="50%" x2="50%" y1="0%" y2="100%">
+    <rect id="comboright@2x-a" width="17" height="21"/>
+    <linearGradient id="comboright@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#6BB4FA"/>
       <stop offset="100%" stop-color="#057EFF"/>
     </linearGradient>
-    <linearGradient id="comboright@2x-e" x1="50%" x2="50%" y1="0%" y2="100%">
+    <linearGradient id="comboright@2x-c" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#4CA2F8"/>
       <stop offset="100%" stop-color="#025BFF"/>
     </linearGradient>
-    <rect id="comboright@2x-d" width="130" height="42" x="-96" rx="8"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <mask id="comboright@2x-b" fill="#fff">
+    <mask id="comboright@2x-d" fill="#fff">
       <use xlink:href="#comboright@2x-a"/>
     </mask>
-    <g mask="url(#comboright@2x-b)">
-      <use fill="url(#comboright@2x-c)" xlink:href="#comboright@2x-d"/>
-      <rect width="129" height="41" x="-95.5" y=".5" stroke="url(#comboright@2x-e)" rx="8"/>
-    </g>
-    <g mask="url(#comboright@2x-b)">
-      <g transform="translate(9 23)">
-        <rect width="1" height="1" fill="#B7DAFD"/>
-        <rect width="1" height="1" x="14" fill="#B7DAFD"/>
-        <rect width="1" height="1" x="2" fill="#83BEFE"/>
-        <rect width="1" height="1" x="3" y="1" fill="#83BEFD"/>
-        <rect width="1" height="1" x="4" y="2" fill="#7FBBFF"/>
-        <rect width="1" height="1" x="5" y="3" fill="#74B7FE"/>
-        <rect width="1" height="1" x="6" y="4" fill="#71B6FE"/>
-        <rect width="1" height="1" y="2" fill="#8BC2FD"/>
-        <rect width="1" height="1" x="1" y="3" fill="#95C6FF"/>
-        <rect width="1" height="1" x="2" y="4" fill="#97C9FF"/>
-        <rect width="1" height="1" x="3" y="5" fill="#98C7FE"/>
-        <rect width="1" height="1" x="4" y="6" fill="#9BC9FF"/>
-        <rect width="1" height="1" x="5" y="7" fill="#A1CEFF"/>
-        <rect width="1" height="1" x="6" y="8" fill="#98C9FF"/>
-        <rect width="1" height="1" x="14" y="2" fill="#8BC2FD" transform="matrix(-1 0 0 1 29 0)"/>
-        <rect width="1" height="1" x="13" y="3" fill="#95C6FF" transform="matrix(-1 0 0 1 27 0)"/>
-        <rect width="1" height="1" x="12" y="4" fill="#97C9FF" transform="matrix(-1 0 0 1 25 0)"/>
-        <rect width="1" height="1" x="11" y="5" fill="#98C7FE" transform="matrix(-1 0 0 1 23 0)"/>
-        <rect width="1" height="1" x="10" y="6" fill="#9BC9FF" transform="matrix(-1 0 0 1 21 0)"/>
-        <rect width="1" height="1" x="9" y="7" fill="#A1CEFF" transform="matrix(-1 0 0 1 19 0)"/>
-        <rect width="1" height="1" x="8" y="8" fill="#98C9FF" transform="matrix(-1 0 0 1 17 0)"/>
-        <rect width="1" height="1" x="12" fill="#83BEFE" transform="matrix(-1 0 0 1 25 0)"/>
-        <rect width="1" height="1" x="11" y="1" fill="#83BEFD" transform="matrix(-1 0 0 1 23 0)"/>
-        <rect width="1" height="1" x="10" y="2" fill="#7FBBFF" transform="matrix(-1 0 0 1 21 0)"/>
-        <rect width="1" height="1" x="9" y="3" fill="#74B7FE" transform="matrix(-1 0 0 1 19 0)"/>
-        <rect width="1" height="1" x="8" y="4" fill="#71B6FE" transform="matrix(-1 0 0 1 17 0)"/>
-        <rect width="1" height="1" x="7" y="5" fill="#A6D0FF" transform="matrix(-1 0 0 1 15 0)"/>
-      </g>
-    </g>
-    <path fill="#FFF" d="M23,25 L23,26 L22,26 L22,27 L21,27 L21,28 L20,28 L20,29 L19,29 L19,30 L18,30 L18,31 L17,31 L17,32 L16,32 L16,31 L15,31 L15,30 L14,30 L14,29 L13,29 L13,28 L12,28 L12,27 L11,27 L11,26 L10,26 L10,25 L9,25 L9,24 L10,24 L10,23 L11,23 L11,24 L12,24 L12,25 L13,25 L13,26 L14,26 L14,27 L15,27 L15,28 L16,28 L16,29 L17,29 L17,28 L18,28 L18,27 L19,27 L19,26 L20,26 L20,25 L21,25 L21,24 L22,24 L22,23 L23,23 L23,24 L24,24 L24,25 L23,25 Z" mask="url(#comboright@2x-b)"/>
-    <g mask="url(#comboright@2x-b)">
-      <g transform="matrix(1 0 0 -1 9 17)">
-        <rect width="1" height="1" fill="#B7DAFD"/>
-        <rect width="1" height="1" x="14" fill="#B7DAFD"/>
-        <rect width="1" height="1" x="2" fill="#83BEFE"/>
-        <rect width="1" height="1" x="3" y="1" fill="#83BEFD"/>
-        <rect width="1" height="1" x="4" y="2" fill="#7FBBFF"/>
-        <rect width="1" height="1" x="5" y="3" fill="#74B7FE"/>
-        <rect width="1" height="1" x="6" y="4" fill="#71B6FE"/>
-        <rect width="1" height="1" y="2" fill="#8BC2FD"/>
-        <rect width="1" height="1" x="1" y="3" fill="#95C6FF"/>
-        <rect width="1" height="1" x="2" y="4" fill="#97C9FF"/>
-        <rect width="1" height="1" x="3" y="5" fill="#98C7FE"/>
-        <rect width="1" height="1" x="4" y="6" fill="#9BC9FF"/>
-        <rect width="1" height="1" x="5" y="7" fill="#A1CEFF"/>
-        <rect width="1" height="1" x="6" y="8" fill="#98C9FF"/>
-        <rect width="1" height="1" x="14" y="2" fill="#8BC2FD" transform="matrix(-1 0 0 1 29 0)"/>
-        <rect width="1" height="1" x="13" y="3" fill="#95C6FF" transform="matrix(-1 0 0 1 27 0)"/>
-        <rect width="1" height="1" x="12" y="4" fill="#97C9FF" transform="matrix(-1 0 0 1 25 0)"/>
-        <rect width="1" height="1" x="11" y="5" fill="#98C7FE" transform="matrix(-1 0 0 1 23 0)"/>
-        <rect width="1" height="1" x="10" y="6" fill="#9BC9FF" transform="matrix(-1 0 0 1 21 0)"/>
-        <rect width="1" height="1" x="9" y="7" fill="#A1CEFF" transform="matrix(-1 0 0 1 19 0)"/>
-        <rect width="1" height="1" x="8" y="8" fill="#98C9FF" transform="matrix(-1 0 0 1 17 0)"/>
-        <rect width="1" height="1" x="12" fill="#83BEFE" transform="matrix(-1 0 0 1 25 0)"/>
-        <rect width="1" height="1" x="11" y="1" fill="#83BEFD" transform="matrix(-1 0 0 1 23 0)"/>
-        <rect width="1" height="1" x="10" y="2" fill="#7FBBFF" transform="matrix(-1 0 0 1 21 0)"/>
-        <rect width="1" height="1" x="9" y="3" fill="#74B7FE" transform="matrix(-1 0 0 1 19 0)"/>
-        <rect width="1" height="1" x="8" y="4" fill="#71B6FE" transform="matrix(-1 0 0 1 17 0)"/>
-        <rect width="1" height="1" x="7" y="5" fill="#A6D0FF" transform="matrix(-1 0 0 1 15 0)"/>
-      </g>
-    </g>
-    <path fill="#FFF" d="M23,10 L23,11 L22,11 L22,12 L21,12 L21,13 L20,13 L20,14 L19,14 L19,15 L18,15 L18,16 L17,16 L17,17 L16,17 L16,16 L15,16 L15,15 L14,15 L14,14 L13,14 L13,13 L12,13 L12,12 L11,12 L11,11 L10,11 L10,10 L9,10 L9,9 L10,9 L10,8 L11,8 L11,9 L12,9 L12,10 L13,10 L13,11 L14,11 L14,12 L15,12 L15,13 L16,13 L16,14 L17,14 L17,13 L18,13 L18,12 L19,12 L19,11 L20,11 L20,10 L21,10 L21,9 L22,9 L22,8 L23,8 L23,9 L24,9 L24,10 L23,10 Z" mask="url(#comboright@2x-b)" transform="matrix(1 0 0 -1 0 25)"/>
+    <rect width="64.5" height="20.5" x="-47.75" y=".25" fill="url(#comboright@2x-b)" stroke="url(#comboright@2x-c)" stroke-width=".5" mask="url(#comboright@2x-d)" rx="4"/>
+    <path fill="#FFF" fill-rule="nonzero" d="M8.25,14.0587783 L11.0232082,11.0657884 C11.2671965,10.8024635 11.6784551,10.7867882 11.94178,11.0307765 C12.2051048,11.2747649 12.2207802,11.6860235 11.9767918,11.9493483 L8.72679183,15.4569167 C8.46955187,15.7345434 8.03044813,15.7345434 7.77320817,15.4569167 L4.52320817,11.9493483 C4.27921982,11.6860235 4.29489517,11.2747649 4.55822002,11.0307765 C4.82154488,10.7867882 5.23280349,10.8024635 5.47679183,11.0657884 L8.25,14.0587783 Z M8.25,5.45635842 L5.47679183,8.44934833 C5.23280349,8.71267319 4.82154488,8.72834854 4.55822002,8.48436019 C4.29489517,8.24037185 4.27921982,7.82911324 4.52320817,7.56578838 L7.77320817,4.05822002 C8.03044813,3.78059333 8.46955187,3.78059333 8.72679183,4.05822002 L11.9767918,7.56578838 C12.2207802,7.82911324 12.2051048,8.24037185 11.94178,8.48436019 C11.6784551,8.72834854 11.2671965,8.71267319 11.0232082,8.44934833 L8.25,5.45635842 Z"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightDisabled@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightDisabled@2x.svg
index 6340afa1bfed..c5fceb0e12fd 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightDisabled@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightDisabled@2x.svg
@@ -1,83 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34" height="42" viewBox="0 0 34 42">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17" height="21" viewBox="0 0 17 21">
   <defs>
-    <rect id="comborightdisabled@2x-a" width="34" height="42"/>
-    <linearGradient id="comborightdisabled@2x-d" x1="50%" x2="50%" y1="0%" y2="100%">
+    <rect id="comborightdisabled@2x-a" width="17" height="21"/>
+    <linearGradient id="comborightdisabled@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#D2D2D2"/>
       <stop offset="100%" stop-color="#C3C3C3"/>
     </linearGradient>
-    <rect id="comborightdisabled@2x-c" width="130" height="42" x="-96" rx="8"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <mask id="comborightdisabled@2x-b" fill="#fff">
+    <mask id="comborightdisabled@2x-c" fill="#fff">
       <use xlink:href="#comborightdisabled@2x-a"/>
     </mask>
-    <g mask="url(#comborightdisabled@2x-b)">
-      <use fill="#F1F1F1" xlink:href="#comborightdisabled@2x-c"/>
-      <rect width="129" height="41" x="-95.5" y=".5" stroke="url(#comborightdisabled@2x-d)" rx="8"/>
-    </g>
-    <g mask="url(#comborightdisabled@2x-b)">
-      <g transform="translate(9 8)">
-        <g transform="translate(0 15)">
-          <rect width="1" height="1" fill="#B1B1B1"/>
-          <rect width="1" height="1" x="14" fill="#B1B1B1"/>
-          <rect width="1" height="1" x="2" fill="#CACACA"/>
-          <rect width="1" height="1" x="3" y="1" fill="#CACACA"/>
-          <rect width="1" height="1" x="4" y="2" fill="#CACACA"/>
-          <rect width="1" height="1" x="5" y="3" fill="#CACACA"/>
-          <rect width="1" height="1" x="6" y="4" fill="#CACACA"/>
-          <rect width="1" height="1" y="2" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="1" y="3" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="2" y="4" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="3" y="5" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="4" y="6" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="5" y="7" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="6" y="8" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="14" y="2" fill="#BDBDBD" transform="matrix(-1 0 0 1 29 0)"/>
-          <rect width="1" height="1" x="13" y="3" fill="#BDBDBD" transform="matrix(-1 0 0 1 27 0)"/>
-          <rect width="1" height="1" x="12" y="4" fill="#BDBDBD" transform="matrix(-1 0 0 1 25 0)"/>
-          <rect width="1" height="1" x="11" y="5" fill="#BDBDBD" transform="matrix(-1 0 0 1 23 0)"/>
-          <rect width="1" height="1" x="10" y="6" fill="#BDBDBD" transform="matrix(-1 0 0 1 21 0)"/>
-          <rect width="1" height="1" x="9" y="7" fill="#BDBDBD" transform="matrix(-1 0 0 1 19 0)"/>
-          <rect width="1" height="1" x="8" y="8" fill="#BDBDBD" transform="matrix(-1 0 0 1 17 0)"/>
-          <rect width="1" height="1" x="12" fill="#CACACA" transform="matrix(-1 0 0 1 25 0)"/>
-          <rect width="1" height="1" x="11" y="1" fill="#CACACA" transform="matrix(-1 0 0 1 23 0)"/>
-          <rect width="1" height="1" x="10" y="2" fill="#CACACA" transform="matrix(-1 0 0 1 21 0)"/>
-          <rect width="1" height="1" x="9" y="3" fill="#CACACA" transform="matrix(-1 0 0 1 19 0)"/>
-          <rect width="1" height="1" x="8" y="4" fill="#CACACA" transform="matrix(-1 0 0 1 17 0)"/>
-          <rect width="1" height="1" x="7" y="5" fill="#CACACA" transform="matrix(-1 0 0 1 15 0)"/>
-        </g>
-        <path fill="#919191" d="M14,17 L14,18 L13,18 L13,19 L12,19 L12,20 L11,20 L11,21 L10,21 L10,22 L9,22 L9,23 L8,23 L8,24 L7,24 L7,23 L6,23 L6,22 L5,22 L5,21 L4,21 L4,20 L3,20 L3,19 L2,19 L2,18 L1,18 L1,17 L0,17 L0,16 L1,16 L1,15 L2,15 L2,16 L3,16 L3,17 L4,17 L4,18 L5,18 L5,19 L6,19 L6,20 L7,20 L7,21 L8,21 L8,20 L9,20 L9,19 L10,19 L10,18 L11,18 L11,17 L12,17 L12,16 L13,16 L13,15 L14,15 L14,16 L15,16 L15,17 L14,17 Z"/>
-        <g transform="matrix(1 0 0 -1 0 9)">
-          <rect width="1" height="1" fill="#B1B1B1"/>
-          <rect width="1" height="1" x="14" fill="#B1B1B1"/>
-          <rect width="1" height="1" x="2" fill="#CECECE"/>
-          <rect width="1" height="1" x="3" y="1" fill="#CECECE"/>
-          <rect width="1" height="1" x="4" y="2" fill="#CECECE"/>
-          <rect width="1" height="1" x="5" y="3" fill="#CECECE"/>
-          <rect width="1" height="1" x="6" y="4" fill="#CECECE"/>
-          <rect width="1" height="1" y="2" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="1" y="3" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="2" y="4" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="3" y="5" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="4" y="6" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="5" y="7" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="6" y="8" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="14" y="2" fill="#BDBDBD" transform="matrix(-1 0 0 1 29 0)"/>
-          <rect width="1" height="1" x="13" y="3" fill="#BDBDBD" transform="matrix(-1 0 0 1 27 0)"/>
-          <rect width="1" height="1" x="12" y="4" fill="#BDBDBD" transform="matrix(-1 0 0 1 25 0)"/>
-          <rect width="1" height="1" x="11" y="5" fill="#BDBDBD" transform="matrix(-1 0 0 1 23 0)"/>
-          <rect width="1" height="1" x="10" y="6" fill="#BDBDBD" transform="matrix(-1 0 0 1 21 0)"/>
-          <rect width="1" height="1" x="9" y="7" fill="#BDBDBD" transform="matrix(-1 0 0 1 19 0)"/>
-          <rect width="1" height="1" x="8" y="8" fill="#BDBDBD" transform="matrix(-1 0 0 1 17 0)"/>
-          <rect width="1" height="1" x="12" fill="#CECECE" transform="matrix(-1 0 0 1 25 0)"/>
-          <rect width="1" height="1" x="11" y="1" fill="#CECECE" transform="matrix(-1 0 0 1 23 0)"/>
-          <rect width="1" height="1" x="10" y="2" fill="#CECECE" transform="matrix(-1 0 0 1 21 0)"/>
-          <rect width="1" height="1" x="9" y="3" fill="#CECECE" transform="matrix(-1 0 0 1 19 0)"/>
-          <rect width="1" height="1" x="8" y="4" fill="#CECECE" transform="matrix(-1 0 0 1 17 0)"/>
-          <rect width="1" height="1" x="7" y="5" fill="#CECECE" transform="matrix(-1 0 0 1 15 0)"/>
-        </g>
-        <path fill="#919191" d="M14,2 L14,3 L13,3 L13,4 L12,4 L12,5 L11,5 L11,6 L10,6 L10,7 L9,7 L9,8 L8,8 L8,9 L7,9 L7,8 L6,8 L6,7 L5,7 L5,6 L4,6 L4,5 L3,5 L3,4 L2,4 L2,3 L1,3 L1,2 L0,2 L0,1 L1,1 L1,0 L2,0 L2,1 L3,1 L3,2 L4,2 L4,3 L5,3 L5,4 L6,4 L6,5 L7,5 L7,6 L8,6 L8,5 L9,5 L9,4 L10,4 L10,3 L11,3 L11,2 L12,2 L12,1 L13,1 L13,0 L14,0 L14,1 L15,1 L15,2 L14,2 Z" transform="matrix(1 0 0 -1 0 9)"/>
-      </g>
-    </g>
+    <rect width="64.5" height="20.5" x="-47.75" y=".25" fill="#F1F1F1" stroke="url(#comborightdisabled@2x-b)" stroke-width=".5" mask="url(#comborightdisabled@2x-c)" rx="4"/>
+    <path fill="#A6A6A6" fill-rule="nonzero" d="M8.25,14.0587783 L11.0232082,11.0657884 C11.2671965,10.8024635 11.6784551,10.7867882 11.94178,11.0307765 C12.2051048,11.2747649 12.2207802,11.6860235 11.9767918,11.9493483 L8.72679183,15.4569167 C8.46955187,15.7345434 8.03044813,15.7345434 7.77320817,15.4569167 L4.52320817,11.9493483 C4.27921982,11.6860235 4.29489517,11.2747649 4.55822002,11.0307765 C4.82154488,10.7867882 5.23280349,10.8024635 5.47679183,11.0657884 L8.25,14.0587783 Z M8.25,5.45635842 L5.47679183,8.44934833 C5.23280349,8.71267319 4.82154488,8.72834854 4.55822002,8.48436019 C4.29489517,8.24037185 4.27921982,7.82911324 4.52320817,7.56578838 L7.77320817,4.05822002 C8.03044813,3.78059333 8.46955187,3.78059333 8.72679183,4.05822002 L11.9767918,7.56578838 C12.2207802,7.82911324 12.2051048,8.24037185 11.94178,8.48436019 C11.6784551,8.72834854 11.2671965,8.71267319 11.0232082,8.44934833 L8.25,5.45635842 Z"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightEditable@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightEditable@2x.svg
index a70aa834ea63..f22068a9cc10 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightEditable@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightEditable@2x.svg
@@ -1,47 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="36" height="42" viewBox="0 0 36 42">
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="21" viewBox="0 0 18 21">
   <defs>
     <linearGradient id="comborighteditable@2x-a" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#6BB4FA"/>
       <stop offset="100%" stop-color="#057EFF"/>
     </linearGradient>
-    <linearGradient id="comborighteditable@2x-c" x1="50%" x2="50%" y1="0%" y2="100%">
+    <linearGradient id="comborighteditable@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#4CA2F8"/>
       <stop offset="100%" stop-color="#025BFF"/>
     </linearGradient>
-    <path id="comborighteditable@2x-b" d="M0,0 L28,0 C32.418278,-8.11624501e-16 36,3.581722 36,8 L36,34 C36,38.418278 32.418278,42 28,42 L0,42 L0,0 Z"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <use fill="url(#comborighteditable@2x-a)" xlink:href="#comborighteditable@2x-b"/>
-    <path stroke="url(#comborighteditable@2x-c)" d="M0.5,0.5 L0.5,41.5 L28,41.5 C32.1421356,41.5 35.5,38.1421356 35.5,34 L35.5,8 C35.5,3.85786438 32.1421356,0.5 28,0.5 L0.5,0.5 Z"/>
-    <g transform="translate(10 18)">
-      <rect width="1" height="1" fill="#B7DAFD"/>
-      <rect width="1" height="1" x="14" fill="#B7DAFD"/>
-      <rect width="1" height="1" x="2" fill="#83BEFE"/>
-      <rect width="1" height="1" x="3" y="1" fill="#83BEFD"/>
-      <rect width="1" height="1" x="4" y="2" fill="#7FBBFF"/>
-      <rect width="1" height="1" x="5" y="3" fill="#74B7FE"/>
-      <rect width="1" height="1" x="6" y="4" fill="#71B6FE"/>
-      <rect width="1" height="1" y="2" fill="#8BC2FD"/>
-      <rect width="1" height="1" x="1" y="3" fill="#95C6FF"/>
-      <rect width="1" height="1" x="2" y="4" fill="#97C9FF"/>
-      <rect width="1" height="1" x="3" y="5" fill="#98C7FE"/>
-      <rect width="1" height="1" x="4" y="6" fill="#9BC9FF"/>
-      <rect width="1" height="1" x="5" y="7" fill="#A1CEFF"/>
-      <rect width="1" height="1" x="6" y="8" fill="#98C9FF"/>
-      <rect width="1" height="1" x="14" y="2" fill="#8BC2FD" transform="matrix(-1 0 0 1 29 0)"/>
-      <rect width="1" height="1" x="13" y="3" fill="#95C6FF" transform="matrix(-1 0 0 1 27 0)"/>
-      <rect width="1" height="1" x="12" y="4" fill="#97C9FF" transform="matrix(-1 0 0 1 25 0)"/>
-      <rect width="1" height="1" x="11" y="5" fill="#98C7FE" transform="matrix(-1 0 0 1 23 0)"/>
-      <rect width="1" height="1" x="10" y="6" fill="#9BC9FF" transform="matrix(-1 0 0 1 21 0)"/>
-      <rect width="1" height="1" x="9" y="7" fill="#A1CEFF" transform="matrix(-1 0 0 1 19 0)"/>
-      <rect width="1" height="1" x="8" y="8" fill="#98C9FF" transform="matrix(-1 0 0 1 17 0)"/>
-      <rect width="1" height="1" x="12" fill="#83BEFE" transform="matrix(-1 0 0 1 25 0)"/>
-      <rect width="1" height="1" x="11" y="1" fill="#83BEFD" transform="matrix(-1 0 0 1 23 0)"/>
-      <rect width="1" height="1" x="10" y="2" fill="#7FBBFF" transform="matrix(-1 0 0 1 21 0)"/>
-      <rect width="1" height="1" x="9" y="3" fill="#74B7FE" transform="matrix(-1 0 0 1 19 0)"/>
-      <rect width="1" height="1" x="8" y="4" fill="#71B6FE" transform="matrix(-1 0 0 1 17 0)"/>
-      <rect width="1" height="1" x="7" y="5" fill="#A6D0FF" transform="matrix(-1 0 0 1 15 0)"/>
-    </g>
-    <path fill="#FFF" d="M24,20 L24,21 L23,21 L23,22 L22,22 L22,23 L21,23 L21,24 L20,24 L20,25 L19,25 L19,26 L18,26 L18,27 L17,27 L17,26 L16,26 L16,25 L15,25 L15,24 L14,24 L14,23 L13,23 L13,22 L12,22 L12,21 L11,21 L11,20 L10,20 L10,19 L11,19 L11,18 L12,18 L12,19 L13,19 L13,20 L14,20 L14,21 L15,21 L15,22 L16,22 L16,23 L17,23 L17,24 L18,24 L18,23 L19,23 L19,22 L20,22 L20,21 L21,21 L21,20 L22,20 L22,19 L23,19 L23,18 L24,18 L24,19 L25,19 L25,20 L24,20 Z"/>
+    <path fill="url(#comborighteditable@2x-a)" stroke="url(#comborighteditable@2x-b)" stroke-width=".5" d="M0.25,0.25 L0.25,20.75 L14,20.75 C16.0710678,20.75 17.75,19.0710678 17.75,17 L17.75,4 C17.75,1.92893219 16.0710678,0.25 14,0.25 L0.25,0.25 Z"/>
+    <path fill="#FFF" fill-rule="nonzero" d="M11.5232082,8.55822002 C11.7671965,8.29489517 12.1784551,8.27921982 12.44178,8.52320817 C12.7051048,8.76719651 12.7207802,9.17845512 12.4767918,9.44177998 L9.22679183,12.9493483 C8.96955187,13.226975 8.53044813,13.226975 8.27320817,12.9493483 L5.02320817,9.44177998 C4.77921982,9.17845512 4.79489517,8.76719651 5.05822002,8.52320817 C5.32154488,8.27921982 5.73280349,8.29489517 5.97679183,8.55822002 L8.75,11.5512099 L11.5232082,8.55822002 Z"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightEditableDisabled@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightEditableDisabled@2x.svg
index 5dd896b728be..8397f24f5e07 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightEditableDisabled@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/comboRightEditableDisabled@2x.svg
@@ -1,43 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="36" height="42" viewBox="0 0 36 42">
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="21" viewBox="0 0 18 21">
   <defs>
-    <linearGradient id="comborighteditabledisabled@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
+    <linearGradient id="comborighteditabledisabled@2x-a" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#D2D2D2"/>
       <stop offset="100%" stop-color="#C3C3C3"/>
     </linearGradient>
-    <path id="comborighteditabledisabled@2x-a" d="M0,0 L28,0 C32.418278,-8.11624501e-16 36,3.581722 36,8 L36,34 C36,38.418278 32.418278,42 28,42 L0,42 L0,0 Z"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <use fill="#F1F1F1" xlink:href="#comborighteditabledisabled@2x-a"/>
-    <path stroke="url(#comborighteditabledisabled@2x-b)" d="M0.5,0.5 L0.5,41.5 L28,41.5 C32.1421356,41.5 35.5,38.1421356 35.5,34 L35.5,8 C35.5,3.85786438 32.1421356,0.5 28,0.5 L0.5,0.5 Z"/>
-    <g transform="translate(10 18)">
-      <rect width="1" height="1" fill="#B1B1B1"/>
-      <rect width="1" height="1" x="14" fill="#B1B1B1"/>
-      <rect width="1" height="1" x="2" fill="#CACACA"/>
-      <rect width="1" height="1" x="3" y="1" fill="#CACACA"/>
-      <rect width="1" height="1" x="4" y="2" fill="#CACACA"/>
-      <rect width="1" height="1" x="5" y="3" fill="#CACACA"/>
-      <rect width="1" height="1" x="6" y="4" fill="#CACACA"/>
-      <rect width="1" height="1" y="2" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="1" y="3" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="2" y="4" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="3" y="5" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="4" y="6" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="5" y="7" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="6" y="8" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="14" y="2" fill="#BDBDBD" transform="matrix(-1 0 0 1 29 0)"/>
-      <rect width="1" height="1" x="13" y="3" fill="#BDBDBD" transform="matrix(-1 0 0 1 27 0)"/>
-      <rect width="1" height="1" x="12" y="4" fill="#BDBDBD" transform="matrix(-1 0 0 1 25 0)"/>
-      <rect width="1" height="1" x="11" y="5" fill="#BDBDBD" transform="matrix(-1 0 0 1 23 0)"/>
-      <rect width="1" height="1" x="10" y="6" fill="#BDBDBD" transform="matrix(-1 0 0 1 21 0)"/>
-      <rect width="1" height="1" x="9" y="7" fill="#BDBDBD" transform="matrix(-1 0 0 1 19 0)"/>
-      <rect width="1" height="1" x="8" y="8" fill="#BDBDBD" transform="matrix(-1 0 0 1 17 0)"/>
-      <rect width="1" height="1" x="12" fill="#CACACA" transform="matrix(-1 0 0 1 25 0)"/>
-      <rect width="1" height="1" x="11" y="1" fill="#CACACA" transform="matrix(-1 0 0 1 23 0)"/>
-      <rect width="1" height="1" x="10" y="2" fill="#CACACA" transform="matrix(-1 0 0 1 21 0)"/>
-      <rect width="1" height="1" x="9" y="3" fill="#CACACA" transform="matrix(-1 0 0 1 19 0)"/>
-      <rect width="1" height="1" x="8" y="4" fill="#CACACA" transform="matrix(-1 0 0 1 17 0)"/>
-      <rect width="1" height="1" x="7" y="5" fill="#CACACA" transform="matrix(-1 0 0 1 15 0)"/>
-    </g>
-    <path fill="#919191" d="M24,20 L24,21 L23,21 L23,22 L22,22 L22,23 L21,23 L21,24 L20,24 L20,25 L19,25 L19,26 L18,26 L18,27 L17,27 L17,26 L16,26 L16,25 L15,25 L15,24 L14,24 L14,23 L13,23 L13,22 L12,22 L12,21 L11,21 L11,20 L10,20 L10,19 L11,19 L11,18 L12,18 L12,19 L13,19 L13,20 L14,20 L14,21 L15,21 L15,22 L16,22 L16,23 L17,23 L17,24 L18,24 L18,23 L19,23 L19,22 L20,22 L20,21 L21,21 L21,20 L22,20 L22,19 L23,19 L23,18 L24,18 L24,19 L25,19 L25,20 L24,20 Z"/>
+    <path fill="#F1F1F1" stroke="url(#comborighteditabledisabled@2x-a)" stroke-width=".5" d="M0.25,0.25 L0.25,20.75 L14,20.75 C16.0710678,20.75 17.75,19.0710678 17.75,17 L17.75,4 C17.75,1.92893219 16.0710678,0.25 14,0.25 L0.25,0.25 Z"/>
+    <path fill="#A6A6A6" fill-rule="nonzero" d="M11.5232082,8.55822002 C11.7671965,8.29489517 12.1784551,8.27921982 12.44178,8.52320817 C12.7051048,8.76719651 12.7207802,9.17845512 12.4767918,9.44177998 L9.22679183,12.9493483 C8.96955187,13.226975 8.53044813,13.226975 8.27320817,12.9493483 L5.02320817,9.44177998 C4.77921982,9.17845512 4.79489517,8.76719651 5.05822002,8.52320817 C5.32154488,8.27921982 5.73280349,8.29489517 5.97679183,8.55822002 L8.75,11.5512099 L11.5232082,8.55822002 Z"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRight@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRight@2x.svg
index f8a71ac75958..4e838b924727 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRight@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRight@2x.svg
@@ -1,85 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34" height="42" viewBox="0 0 34 42">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17" height="21" viewBox="0 0 17 21">
   <defs>
-    <rect id="comboright@2x-a" width="34" height="42"/>
-    <linearGradient id="comboright@2x-c" x1="50%" x2="50%" y1="0%" y2="100%">
+    <rect id="comboright@2x-a" width="17" height="21"/>
+    <linearGradient id="comboright@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#B1B2B8"/>
       <stop offset="100%" stop-color="#919095"/>
     </linearGradient>
-    <linearGradient id="comboright@2x-e" x1="50%" x2="50%" y1="0%" y2="100%">
+    <linearGradient id="comboright@2x-c" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#A6A6AD"/>
       <stop offset="100%" stop-color="#7B7D81"/>
     </linearGradient>
-    <rect id="comboright@2x-d" width="130" height="42" x="-96" rx="8"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <mask id="comboright@2x-b" fill="#fff">
+    <mask id="comboright@2x-d" fill="#fff">
       <use xlink:href="#comboright@2x-a"/>
     </mask>
-    <g mask="url(#comboright@2x-b)">
-      <use fill="url(#comboright@2x-c)" xlink:href="#comboright@2x-d"/>
-      <rect width="129" height="41" x="-95.5" y=".5" stroke="url(#comboright@2x-e)" rx="8"/>
-    </g>
-    <g transform="translate(9 8)">
-      <g transform="matrix(1 0 0 -1 0 9)">
-        <rect width="1" height="1" fill="#E1E1E2"/>
-        <rect width="1" height="1" x="14" fill="#E1E1E2"/>
-        <rect width="1" height="1" x="2" fill="#CBCBCE"/>
-        <rect width="1" height="1" x="3" y="1" fill="#CBCBCE"/>
-        <rect width="1" height="1" x="4" y="2" fill="#CBCBCE"/>
-        <rect width="1" height="1" x="5" y="3" fill="#C7C7CA"/>
-        <rect width="1" height="1" x="6" y="4" fill="#C7C7CA"/>
-        <rect width="1" height="1" y="2" fill="#D1CFD2"/>
-        <rect width="1" height="1" x="1" y="3" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="2" y="4" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="3" y="5" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="4" y="6" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="5" y="7" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="6" y="8" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="14" y="2" fill="#DEDDDE" transform="matrix(-1 0 0 1 29 0)"/>
-        <rect width="1" height="1" x="13" y="3" fill="#DEDDDE" transform="matrix(-1 0 0 1 27 0)"/>
-        <rect width="1" height="1" x="12" y="4" fill="#DEDDDE" transform="matrix(-1 0 0 1 25 0)"/>
-        <rect width="1" height="1" x="11" y="5" fill="#DEDDDE" transform="matrix(-1 0 0 1 23 0)"/>
-        <rect width="1" height="1" x="10" y="6" fill="#DEDDDE" transform="matrix(-1 0 0 1 21 0)"/>
-        <rect width="1" height="1" x="9" y="7" fill="#DEDDDE" transform="matrix(-1 0 0 1 19 0)"/>
-        <rect width="1" height="1" x="8" y="8" fill="#DEDDDE" transform="matrix(-1 0 0 1 17 0)"/>
-        <rect width="1" height="1" x="12" fill="#CBCBCE" transform="matrix(-1 0 0 1 25 0)"/>
-        <rect width="1" height="1" x="11" y="1" fill="#CBCBCE" transform="matrix(-1 0 0 1 23 0)"/>
-        <rect width="1" height="1" x="10" y="2" fill="#CBCBCE" transform="matrix(-1 0 0 1 21 0)"/>
-        <rect width="1" height="1" x="9" y="3" fill="#C7C7CA" transform="matrix(-1 0 0 1 19 0)"/>
-        <rect width="1" height="1" x="8" y="4" fill="#C7C7CA" transform="matrix(-1 0 0 1 17 0)"/>
-        <rect width="1" height="1" x="7" y="5" fill="#DEDCDF" transform="matrix(-1 0 0 1 15 0)"/>
-      </g>
-      <path fill="#FFF" d="M14,2 L14,3 L13,3 L13,4 L12,4 L12,5 L11,5 L11,6 L10,6 L10,7 L9,7 L9,8 L8,8 L8,9 L7,9 L7,8 L6,8 L6,7 L5,7 L5,6 L4,6 L4,5 L3,5 L3,4 L2,4 L2,3 L1,3 L1,2 L0,2 L0,1 L1,1 L1,0 L2,0 L2,1 L3,1 L3,2 L4,2 L4,3 L5,3 L5,4 L6,4 L6,5 L7,5 L7,6 L8,6 L8,5 L9,5 L9,4 L10,4 L10,3 L11,3 L11,2 L12,2 L12,1 L13,1 L13,0 L14,0 L14,1 L15,1 L15,2 L14,2 Z" transform="matrix(1 0 0 -1 0 9)"/>
-      <g transform="translate(0 15)">
-        <rect width="1" height="1" fill="#E1E1E2"/>
-        <rect width="1" height="1" x="14" fill="#E1E1E2"/>
-        <rect width="1" height="1" x="2" fill="#CBCBCE"/>
-        <rect width="1" height="1" x="3" y="1" fill="#CBCBCE"/>
-        <rect width="1" height="1" x="4" y="2" fill="#CBCBCE"/>
-        <rect width="1" height="1" x="5" y="3" fill="#C7C7CA"/>
-        <rect width="1" height="1" x="6" y="4" fill="#C7C7CA"/>
-        <rect width="1" height="1" y="2" fill="#D1CFD2"/>
-        <rect width="1" height="1" x="1" y="3" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="2" y="4" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="3" y="5" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="4" y="6" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="5" y="7" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="6" y="8" fill="#D8D8DA"/>
-        <rect width="1" height="1" x="14" y="2" fill="#DEDDDE" transform="matrix(-1 0 0 1 29 0)"/>
-        <rect width="1" height="1" x="13" y="3" fill="#DEDDDE" transform="matrix(-1 0 0 1 27 0)"/>
-        <rect width="1" height="1" x="12" y="4" fill="#DEDDDE" transform="matrix(-1 0 0 1 25 0)"/>
-        <rect width="1" height="1" x="11" y="5" fill="#DEDDDE" transform="matrix(-1 0 0 1 23 0)"/>
-        <rect width="1" height="1" x="10" y="6" fill="#DEDDDE" transform="matrix(-1 0 0 1 21 0)"/>
-        <rect width="1" height="1" x="9" y="7" fill="#DEDDDE" transform="matrix(-1 0 0 1 19 0)"/>
-        <rect width="1" height="1" x="8" y="8" fill="#DEDDDE" transform="matrix(-1 0 0 1 17 0)"/>
-        <rect width="1" height="1" x="12" fill="#CBCBCE" transform="matrix(-1 0 0 1 25 0)"/>
-        <rect width="1" height="1" x="11" y="1" fill="#CBCBCE" transform="matrix(-1 0 0 1 23 0)"/>
-        <rect width="1" height="1" x="10" y="2" fill="#CBCBCE" transform="matrix(-1 0 0 1 21 0)"/>
-        <rect width="1" height="1" x="9" y="3" fill="#C7C7CA" transform="matrix(-1 0 0 1 19 0)"/>
-        <rect width="1" height="1" x="8" y="4" fill="#C7C7CA" transform="matrix(-1 0 0 1 17 0)"/>
-        <rect width="1" height="1" x="7" y="5" fill="#DEDCDF" transform="matrix(-1 0 0 1 15 0)"/>
-      </g>
-      <path fill="#FFF" d="M14,17 L14,18 L13,18 L13,19 L12,19 L12,20 L11,20 L11,21 L10,21 L10,22 L9,22 L9,23 L8,23 L8,24 L7,24 L7,23 L6,23 L6,22 L5,22 L5,21 L4,21 L4,20 L3,20 L3,19 L2,19 L2,18 L1,18 L1,17 L0,17 L0,16 L1,16 L1,15 L2,15 L2,16 L3,16 L3,17 L4,17 L4,18 L5,18 L5,19 L6,19 L6,20 L7,20 L7,21 L8,21 L8,20 L9,20 L9,19 L10,19 L10,18 L11,18 L11,17 L12,17 L12,16 L13,16 L13,15 L14,15 L14,16 L15,16 L15,17 L14,17 Z"/>
-    </g>
+    <rect width="64.5" height="20.5" x="-47.75" y=".25" fill="url(#comboright@2x-b)" stroke="url(#comboright@2x-c)" stroke-width=".5" mask="url(#comboright@2x-d)" rx="4"/>
+    <path fill="#FFF" fill-rule="nonzero" d="M8.25,14.0587783 L11.0232082,11.0657884 C11.2671965,10.8024635 11.6784551,10.7867882 11.94178,11.0307765 C12.2051048,11.2747649 12.2207802,11.6860235 11.9767918,11.9493483 L8.72679183,15.4569167 C8.46955187,15.7345434 8.03044813,15.7345434 7.77320817,15.4569167 L4.52320817,11.9493483 C4.27921982,11.6860235 4.29489517,11.2747649 4.55822002,11.0307765 C4.82154488,10.7867882 5.23280349,10.8024635 5.47679183,11.0657884 L8.25,14.0587783 Z M8.25,5.45635842 L5.47679183,8.44934833 C5.23280349,8.71267319 4.82154488,8.72834854 4.55822002,8.48436019 C4.29489517,8.24037185 4.27921982,7.82911324 4.52320817,7.56578838 L7.77320817,4.05822002 C8.03044813,3.78059333 8.46955187,3.78059333 8.72679183,4.05822002 L11.9767918,7.56578838 C12.2207802,7.82911324 12.2051048,8.24037185 11.94178,8.48436019 C11.6784551,8.72834854 11.2671965,8.71267319 11.0232082,8.44934833 L8.25,5.45635842 Z"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightDisabled@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightDisabled@2x.svg
index 6340afa1bfed..c5fceb0e12fd 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightDisabled@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightDisabled@2x.svg
@@ -1,83 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34" height="42" viewBox="0 0 34 42">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17" height="21" viewBox="0 0 17 21">
   <defs>
-    <rect id="comborightdisabled@2x-a" width="34" height="42"/>
-    <linearGradient id="comborightdisabled@2x-d" x1="50%" x2="50%" y1="0%" y2="100%">
+    <rect id="comborightdisabled@2x-a" width="17" height="21"/>
+    <linearGradient id="comborightdisabled@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#D2D2D2"/>
       <stop offset="100%" stop-color="#C3C3C3"/>
     </linearGradient>
-    <rect id="comborightdisabled@2x-c" width="130" height="42" x="-96" rx="8"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <mask id="comborightdisabled@2x-b" fill="#fff">
+    <mask id="comborightdisabled@2x-c" fill="#fff">
       <use xlink:href="#comborightdisabled@2x-a"/>
     </mask>
-    <g mask="url(#comborightdisabled@2x-b)">
-      <use fill="#F1F1F1" xlink:href="#comborightdisabled@2x-c"/>
-      <rect width="129" height="41" x="-95.5" y=".5" stroke="url(#comborightdisabled@2x-d)" rx="8"/>
-    </g>
-    <g mask="url(#comborightdisabled@2x-b)">
-      <g transform="translate(9 8)">
-        <g transform="translate(0 15)">
-          <rect width="1" height="1" fill="#B1B1B1"/>
-          <rect width="1" height="1" x="14" fill="#B1B1B1"/>
-          <rect width="1" height="1" x="2" fill="#CACACA"/>
-          <rect width="1" height="1" x="3" y="1" fill="#CACACA"/>
-          <rect width="1" height="1" x="4" y="2" fill="#CACACA"/>
-          <rect width="1" height="1" x="5" y="3" fill="#CACACA"/>
-          <rect width="1" height="1" x="6" y="4" fill="#CACACA"/>
-          <rect width="1" height="1" y="2" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="1" y="3" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="2" y="4" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="3" y="5" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="4" y="6" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="5" y="7" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="6" y="8" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="14" y="2" fill="#BDBDBD" transform="matrix(-1 0 0 1 29 0)"/>
-          <rect width="1" height="1" x="13" y="3" fill="#BDBDBD" transform="matrix(-1 0 0 1 27 0)"/>
-          <rect width="1" height="1" x="12" y="4" fill="#BDBDBD" transform="matrix(-1 0 0 1 25 0)"/>
-          <rect width="1" height="1" x="11" y="5" fill="#BDBDBD" transform="matrix(-1 0 0 1 23 0)"/>
-          <rect width="1" height="1" x="10" y="6" fill="#BDBDBD" transform="matrix(-1 0 0 1 21 0)"/>
-          <rect width="1" height="1" x="9" y="7" fill="#BDBDBD" transform="matrix(-1 0 0 1 19 0)"/>
-          <rect width="1" height="1" x="8" y="8" fill="#BDBDBD" transform="matrix(-1 0 0 1 17 0)"/>
-          <rect width="1" height="1" x="12" fill="#CACACA" transform="matrix(-1 0 0 1 25 0)"/>
-          <rect width="1" height="1" x="11" y="1" fill="#CACACA" transform="matrix(-1 0 0 1 23 0)"/>
-          <rect width="1" height="1" x="10" y="2" fill="#CACACA" transform="matrix(-1 0 0 1 21 0)"/>
-          <rect width="1" height="1" x="9" y="3" fill="#CACACA" transform="matrix(-1 0 0 1 19 0)"/>
-          <rect width="1" height="1" x="8" y="4" fill="#CACACA" transform="matrix(-1 0 0 1 17 0)"/>
-          <rect width="1" height="1" x="7" y="5" fill="#CACACA" transform="matrix(-1 0 0 1 15 0)"/>
-        </g>
-        <path fill="#919191" d="M14,17 L14,18 L13,18 L13,19 L12,19 L12,20 L11,20 L11,21 L10,21 L10,22 L9,22 L9,23 L8,23 L8,24 L7,24 L7,23 L6,23 L6,22 L5,22 L5,21 L4,21 L4,20 L3,20 L3,19 L2,19 L2,18 L1,18 L1,17 L0,17 L0,16 L1,16 L1,15 L2,15 L2,16 L3,16 L3,17 L4,17 L4,18 L5,18 L5,19 L6,19 L6,20 L7,20 L7,21 L8,21 L8,20 L9,20 L9,19 L10,19 L10,18 L11,18 L11,17 L12,17 L12,16 L13,16 L13,15 L14,15 L14,16 L15,16 L15,17 L14,17 Z"/>
-        <g transform="matrix(1 0 0 -1 0 9)">
-          <rect width="1" height="1" fill="#B1B1B1"/>
-          <rect width="1" height="1" x="14" fill="#B1B1B1"/>
-          <rect width="1" height="1" x="2" fill="#CECECE"/>
-          <rect width="1" height="1" x="3" y="1" fill="#CECECE"/>
-          <rect width="1" height="1" x="4" y="2" fill="#CECECE"/>
-          <rect width="1" height="1" x="5" y="3" fill="#CECECE"/>
-          <rect width="1" height="1" x="6" y="4" fill="#CECECE"/>
-          <rect width="1" height="1" y="2" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="1" y="3" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="2" y="4" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="3" y="5" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="4" y="6" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="5" y="7" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="6" y="8" fill="#BDBDBD"/>
-          <rect width="1" height="1" x="14" y="2" fill="#BDBDBD" transform="matrix(-1 0 0 1 29 0)"/>
-          <rect width="1" height="1" x="13" y="3" fill="#BDBDBD" transform="matrix(-1 0 0 1 27 0)"/>
-          <rect width="1" height="1" x="12" y="4" fill="#BDBDBD" transform="matrix(-1 0 0 1 25 0)"/>
-          <rect width="1" height="1" x="11" y="5" fill="#BDBDBD" transform="matrix(-1 0 0 1 23 0)"/>
-          <rect width="1" height="1" x="10" y="6" fill="#BDBDBD" transform="matrix(-1 0 0 1 21 0)"/>
-          <rect width="1" height="1" x="9" y="7" fill="#BDBDBD" transform="matrix(-1 0 0 1 19 0)"/>
-          <rect width="1" height="1" x="8" y="8" fill="#BDBDBD" transform="matrix(-1 0 0 1 17 0)"/>
-          <rect width="1" height="1" x="12" fill="#CECECE" transform="matrix(-1 0 0 1 25 0)"/>
-          <rect width="1" height="1" x="11" y="1" fill="#CECECE" transform="matrix(-1 0 0 1 23 0)"/>
-          <rect width="1" height="1" x="10" y="2" fill="#CECECE" transform="matrix(-1 0 0 1 21 0)"/>
-          <rect width="1" height="1" x="9" y="3" fill="#CECECE" transform="matrix(-1 0 0 1 19 0)"/>
-          <rect width="1" height="1" x="8" y="4" fill="#CECECE" transform="matrix(-1 0 0 1 17 0)"/>
-          <rect width="1" height="1" x="7" y="5" fill="#CECECE" transform="matrix(-1 0 0 1 15 0)"/>
-        </g>
-        <path fill="#919191" d="M14,2 L14,3 L13,3 L13,4 L12,4 L12,5 L11,5 L11,6 L10,6 L10,7 L9,7 L9,8 L8,8 L8,9 L7,9 L7,8 L6,8 L6,7 L5,7 L5,6 L4,6 L4,5 L3,5 L3,4 L2,4 L2,3 L1,3 L1,2 L0,2 L0,1 L1,1 L1,0 L2,0 L2,1 L3,1 L3,2 L4,2 L4,3 L5,3 L5,4 L6,4 L6,5 L7,5 L7,6 L8,6 L8,5 L9,5 L9,4 L10,4 L10,3 L11,3 L11,2 L12,2 L12,1 L13,1 L13,0 L14,0 L14,1 L15,1 L15,2 L14,2 Z" transform="matrix(1 0 0 -1 0 9)"/>
-      </g>
-    </g>
+    <rect width="64.5" height="20.5" x="-47.75" y=".25" fill="#F1F1F1" stroke="url(#comborightdisabled@2x-b)" stroke-width=".5" mask="url(#comborightdisabled@2x-c)" rx="4"/>
+    <path fill="#A6A6A6" fill-rule="nonzero" d="M8.25,14.0587783 L11.0232082,11.0657884 C11.2671965,10.8024635 11.6784551,10.7867882 11.94178,11.0307765 C12.2051048,11.2747649 12.2207802,11.6860235 11.9767918,11.9493483 L8.72679183,15.4569167 C8.46955187,15.7345434 8.03044813,15.7345434 7.77320817,15.4569167 L4.52320817,11.9493483 C4.27921982,11.6860235 4.29489517,11.2747649 4.55822002,11.0307765 C4.82154488,10.7867882 5.23280349,10.8024635 5.47679183,11.0657884 L8.25,14.0587783 Z M8.25,5.45635842 L5.47679183,8.44934833 C5.23280349,8.71267319 4.82154488,8.72834854 4.55822002,8.48436019 C4.29489517,8.24037185 4.27921982,7.82911324 4.52320817,7.56578838 L7.77320817,4.05822002 C8.03044813,3.78059333 8.46955187,3.78059333 8.72679183,4.05822002 L11.9767918,7.56578838 C12.2207802,7.82911324 12.2051048,8.24037185 11.94178,8.48436019 C11.6784551,8.72834854 11.2671965,8.71267319 11.0232082,8.44934833 L8.25,5.45635842 Z"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightEditable@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightEditable@2x.svg
index 39695faceb54..9a1c2ce66418 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightEditable@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightEditable@2x.svg
@@ -1,47 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="36" height="42" viewBox="0 0 36 42">
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="21" viewBox="0 0 18 21">
   <defs>
     <linearGradient id="comborighteditable@2x-a" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#B1B2B8"/>
       <stop offset="100%" stop-color="#919095"/>
     </linearGradient>
-    <linearGradient id="comborighteditable@2x-c" x1="50%" x2="50%" y1="0%" y2="100%">
+    <linearGradient id="comborighteditable@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#A6A6AD"/>
       <stop offset="100%" stop-color="#7B7D81"/>
     </linearGradient>
-    <path id="comborighteditable@2x-b" d="M0,0 L28,0 C32.418278,-8.11624501e-16 36,3.581722 36,8 L36,34 C36,38.418278 32.418278,42 28,42 L0,42 L0,0 Z"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <use fill="url(#comborighteditable@2x-a)" xlink:href="#comborighteditable@2x-b"/>
-    <path stroke="url(#comborighteditable@2x-c)" d="M0.5,0.5 L0.5,41.5 L28,41.5 C32.1421356,41.5 35.5,38.1421356 35.5,34 L35.5,8 C35.5,3.85786438 32.1421356,0.5 28,0.5 L0.5,0.5 Z"/>
-    <g transform="translate(10 18)">
-      <rect width="1" height="1" fill="#E1E1E2"/>
-      <rect width="1" height="1" x="14" fill="#E1E1E2"/>
-      <rect width="1" height="1" x="2" fill="#CBCBCE"/>
-      <rect width="1" height="1" x="3" y="1" fill="#CBCBCE"/>
-      <rect width="1" height="1" x="4" y="2" fill="#CBCBCE"/>
-      <rect width="1" height="1" x="5" y="3" fill="#C7C7CA"/>
-      <rect width="1" height="1" x="6" y="4" fill="#C7C7CA"/>
-      <rect width="1" height="1" y="2" fill="#D1CFD2"/>
-      <rect width="1" height="1" x="1" y="3" fill="#D8D8DA"/>
-      <rect width="1" height="1" x="2" y="4" fill="#D8D8DA"/>
-      <rect width="1" height="1" x="3" y="5" fill="#D8D8DA"/>
-      <rect width="1" height="1" x="4" y="6" fill="#D8D8DA"/>
-      <rect width="1" height="1" x="5" y="7" fill="#D8D8DA"/>
-      <rect width="1" height="1" x="6" y="8" fill="#D8D8DA"/>
-      <rect width="1" height="1" x="14" y="2" fill="#DEDDDE" transform="matrix(-1 0 0 1 29 0)"/>
-      <rect width="1" height="1" x="13" y="3" fill="#DEDDDE" transform="matrix(-1 0 0 1 27 0)"/>
-      <rect width="1" height="1" x="12" y="4" fill="#DEDDDE" transform="matrix(-1 0 0 1 25 0)"/>
-      <rect width="1" height="1" x="11" y="5" fill="#DEDDDE" transform="matrix(-1 0 0 1 23 0)"/>
-      <rect width="1" height="1" x="10" y="6" fill="#DEDDDE" transform="matrix(-1 0 0 1 21 0)"/>
-      <rect width="1" height="1" x="9" y="7" fill="#DEDDDE" transform="matrix(-1 0 0 1 19 0)"/>
-      <rect width="1" height="1" x="8" y="8" fill="#DEDDDE" transform="matrix(-1 0 0 1 17 0)"/>
-      <rect width="1" height="1" x="12" fill="#CBCBCE" transform="matrix(-1 0 0 1 25 0)"/>
-      <rect width="1" height="1" x="11" y="1" fill="#CBCBCE" transform="matrix(-1 0 0 1 23 0)"/>
-      <rect width="1" height="1" x="10" y="2" fill="#CBCBCE" transform="matrix(-1 0 0 1 21 0)"/>
-      <rect width="1" height="1" x="9" y="3" fill="#C7C7CA" transform="matrix(-1 0 0 1 19 0)"/>
-      <rect width="1" height="1" x="8" y="4" fill="#C7C7CA" transform="matrix(-1 0 0 1 17 0)"/>
-      <rect width="1" height="1" x="7" y="5" fill="#DEDCDF" transform="matrix(-1 0 0 1 15 0)"/>
-    </g>
-    <path fill="#FFF" d="M24,20 L24,21 L23,21 L23,22 L22,22 L22,23 L21,23 L21,24 L20,24 L20,25 L19,25 L19,26 L18,26 L18,27 L17,27 L17,26 L16,26 L16,25 L15,25 L15,24 L14,24 L14,23 L13,23 L13,22 L12,22 L12,21 L11,21 L11,20 L10,20 L10,19 L11,19 L11,18 L12,18 L12,19 L13,19 L13,20 L14,20 L14,21 L15,21 L15,22 L16,22 L16,23 L17,23 L17,24 L18,24 L18,23 L19,23 L19,22 L20,22 L20,21 L21,21 L21,20 L22,20 L22,19 L23,19 L23,18 L24,18 L24,19 L25,19 L25,20 L24,20 Z"/>
+    <path fill="url(#comborighteditable@2x-a)" stroke="url(#comborighteditable@2x-b)" stroke-width=".5" d="M0.25,0.25 L0.25,20.75 L14,20.75 C16.0710678,20.75 17.75,19.0710678 17.75,17 L17.75,4 C17.75,1.92893219 16.0710678,0.25 14,0.25 L0.25,0.25 Z"/>
+    <path fill="#FFF" fill-rule="nonzero" d="M11.5232082,8.55822002 C11.7671965,8.29489517 12.1784551,8.27921982 12.44178,8.52320817 C12.7051048,8.76719651 12.7207802,9.17845512 12.4767918,9.44177998 L9.22679183,12.9493483 C8.96955187,13.226975 8.53044813,13.226975 8.27320817,12.9493483 L5.02320817,9.44177998 C4.77921982,9.17845512 4.79489517,8.76719651 5.05822002,8.52320817 C5.32154488,8.27921982 5.73280349,8.29489517 5.97679183,8.55822002 L8.75,11.5512099 L11.5232082,8.55822002 Z"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightEditableDisabled@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightEditableDisabled@2x.svg
index 5dd896b728be..8397f24f5e07 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightEditableDisabled@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/comboRightEditableDisabled@2x.svg
@@ -1,43 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="36" height="42" viewBox="0 0 36 42">
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="21" viewBox="0 0 18 21">
   <defs>
-    <linearGradient id="comborighteditabledisabled@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
+    <linearGradient id="comborighteditabledisabled@2x-a" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#D2D2D2"/>
       <stop offset="100%" stop-color="#C3C3C3"/>
     </linearGradient>
-    <path id="comborighteditabledisabled@2x-a" d="M0,0 L28,0 C32.418278,-8.11624501e-16 36,3.581722 36,8 L36,34 C36,38.418278 32.418278,42 28,42 L0,42 L0,0 Z"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <use fill="#F1F1F1" xlink:href="#comborighteditabledisabled@2x-a"/>
-    <path stroke="url(#comborighteditabledisabled@2x-b)" d="M0.5,0.5 L0.5,41.5 L28,41.5 C32.1421356,41.5 35.5,38.1421356 35.5,34 L35.5,8 C35.5,3.85786438 32.1421356,0.5 28,0.5 L0.5,0.5 Z"/>
-    <g transform="translate(10 18)">
-      <rect width="1" height="1" fill="#B1B1B1"/>
-      <rect width="1" height="1" x="14" fill="#B1B1B1"/>
-      <rect width="1" height="1" x="2" fill="#CACACA"/>
-      <rect width="1" height="1" x="3" y="1" fill="#CACACA"/>
-      <rect width="1" height="1" x="4" y="2" fill="#CACACA"/>
-      <rect width="1" height="1" x="5" y="3" fill="#CACACA"/>
-      <rect width="1" height="1" x="6" y="4" fill="#CACACA"/>
-      <rect width="1" height="1" y="2" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="1" y="3" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="2" y="4" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="3" y="5" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="4" y="6" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="5" y="7" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="6" y="8" fill="#BDBDBD"/>
-      <rect width="1" height="1" x="14" y="2" fill="#BDBDBD" transform="matrix(-1 0 0 1 29 0)"/>
-      <rect width="1" height="1" x="13" y="3" fill="#BDBDBD" transform="matrix(-1 0 0 1 27 0)"/>
-      <rect width="1" height="1" x="12" y="4" fill="#BDBDBD" transform="matrix(-1 0 0 1 25 0)"/>
-      <rect width="1" height="1" x="11" y="5" fill="#BDBDBD" transform="matrix(-1 0 0 1 23 0)"/>
-      <rect width="1" height="1" x="10" y="6" fill="#BDBDBD" transform="matrix(-1 0 0 1 21 0)"/>
-      <rect width="1" height="1" x="9" y="7" fill="#BDBDBD" transform="matrix(-1 0 0 1 19 0)"/>
-      <rect width="1" height="1" x="8" y="8" fill="#BDBDBD" transform="matrix(-1 0 0 1 17 0)"/>
-      <rect width="1" height="1" x="12" fill="#CACACA" transform="matrix(-1 0 0 1 25 0)"/>
-      <rect width="1" height="1" x="11" y="1" fill="#CACACA" transform="matrix(-1 0 0 1 23 0)"/>
-      <rect width="1" height="1" x="10" y="2" fill="#CACACA" transform="matrix(-1 0 0 1 21 0)"/>
-      <rect width="1" height="1" x="9" y="3" fill="#CACACA" transform="matrix(-1 0 0 1 19 0)"/>
-      <rect width="1" height="1" x="8" y="4" fill="#CACACA" transform="matrix(-1 0 0 1 17 0)"/>
-      <rect width="1" height="1" x="7" y="5" fill="#CACACA" transform="matrix(-1 0 0 1 15 0)"/>
-    </g>
-    <path fill="#919191" d="M24,20 L24,21 L23,21 L23,22 L22,22 L22,23 L21,23 L21,24 L20,24 L20,25 L19,25 L19,26 L18,26 L18,27 L17,27 L17,26 L16,26 L16,25 L15,25 L15,24 L14,24 L14,23 L13,23 L13,22 L12,22 L12,21 L11,21 L11,20 L10,20 L10,19 L11,19 L11,18 L12,18 L12,19 L13,19 L13,20 L14,20 L14,21 L15,21 L15,22 L16,22 L16,23 L17,23 L17,24 L18,24 L18,23 L19,23 L19,22 L20,22 L20,21 L21,21 L21,20 L22,20 L22,19 L23,19 L23,18 L24,18 L24,19 L25,19 L25,20 L24,20 Z"/>
+    <path fill="#F1F1F1" stroke="url(#comborighteditabledisabled@2x-a)" stroke-width=".5" d="M0.25,0.25 L0.25,20.75 L14,20.75 C16.0710678,20.75 17.75,19.0710678 17.75,17 L17.75,4 C17.75,1.92893219 16.0710678,0.25 14,0.25 L0.25,0.25 Z"/>
+    <path fill="#A6A6A6" fill-rule="nonzero" d="M11.5232082,8.55822002 C11.7671965,8.29489517 12.1784551,8.27921982 12.44178,8.52320817 C12.7051048,8.76719651 12.7207802,9.17845512 12.4767918,9.44177998 L9.22679183,12.9493483 C8.96955187,13.226975 8.53044813,13.226975 8.27320817,12.9493483 L5.02320817,9.44177998 C4.77921982,9.17845512 4.79489517,8.76719651 5.05822002,8.52320817 C5.32154488,8.27921982 5.73280349,8.29489517 5.97679183,8.55822002 L8.75,11.5512099 L11.5232082,8.55822002 Z"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/spinnerRight@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/spinnerRight@2x.svg
index ee67e3d6a603..ced7d87818f1 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/spinnerRight@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/spinnerRight@2x.svg
@@ -1,31 +1,23 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34" height="42" viewBox="0 0 34 42">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17" height="21" viewBox="0 0 17 21">
   <defs>
-    <rect id="spinnerright@2x-a" width="34" height="42"/>
+    <rect id="spinnerright@2x-a" width="17" height="21"/>
+    <linearGradient id="spinnerright@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
+      <stop offset="0%" stop-color="#B1B2B8"/>
+      <stop offset="100%" stop-color="#919095"/>
+    </linearGradient>
     <linearGradient id="spinnerright@2x-c" x1="50%" x2="50%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#B0B0B6"/>
-      <stop offset="100%" stop-color="#929296"/>
+      <stop offset="0%" stop-color="#A6A6AD"/>
+      <stop offset="100%" stop-color="#7B7D81"/>
     </linearGradient>
-    <linearGradient id="spinnerright@2x-e" x1="50%" x2="50%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#A5A5AA"/>
-      <stop offset="100%" stop-color="#7E7D83"/>
-    </linearGradient>
-    <rect id="spinnerright@2x-d" width="130" height="42" x="-96" rx="8"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <mask id="spinnerright@2x-b" fill="#fff">
+    <mask id="spinnerright@2x-d" fill="#fff">
       <use xlink:href="#spinnerright@2x-a"/>
     </mask>
-    <g mask="url(#spinnerright@2x-b)">
-      <use fill="url(#spinnerright@2x-c)" xlink:href="#spinnerright@2x-d"/>
-      <rect width="129" height="41" x="-95.5" y=".5" stroke="url(#spinnerright@2x-e)" rx="8"/>
-    </g>
-    <g transform="translate(10 7)">
-      <rect width="13" height="3" y="22" fill="#D4D4D7"/>
-      <rect width="11" height="1" x="1" y="23" fill="#FFF"/>
-      <rect width="13" height="3" y="5" fill="#D4D4D7"/>
-      <rect width="3" height="13" x="5" fill="#D4D4D7"/>
-      <rect width="1" height="11" x="6" y="1" fill="#FFF"/>
-      <rect width="11" height="1" x="1" y="6" fill="#FFF"/>
-    </g>
+    <rect width="64.5" height="20.5" x="-47.75" y=".25" fill="url(#spinnerright@2x-b)" stroke="url(#spinnerright@2x-c)" stroke-width=".5" mask="url(#spinnerright@2x-d)" rx="4"/>
+    <rect width="6.5" height="1.5" x="5" y="14.5" fill="#D4D4D7" mask="url(#spinnerright@2x-d)"/>
+    <rect width="6.5" height="1.5" x="5" y="6" fill="#D4D4D7" mask="url(#spinnerright@2x-d)"/>
+    <rect width="1.5" height="6.5" x="7.5" y="3.5" fill="#D4D4D7" mask="url(#spinnerright@2x-d)"/>
+    <path fill="#FFF" d="M8.5 6.5L11 6.5 11 7 8.5 7 8.5 9.5 8 9.5 8 7 5.5 7 5.5 6.5 8 6.5 8 4 8.5 4 8.5 6.5zM5.5 15L11 15 11 15.5 5.5 15.5 5.5 15z" mask="url(#spinnerright@2x-d)"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/spinnerRightDisabled@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/spinnerRightDisabled@2x.svg
index b9bcc8b909f1..a0bd9e54aeb5 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/spinnerRightDisabled@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/graphite/spinnerRightDisabled@2x.svg
@@ -1,27 +1,19 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34" height="42" viewBox="0 0 34 42">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17" height="21" viewBox="0 0 17 21">
   <defs>
-    <rect id="spinnerrightdisabled@2x-a" width="34" height="42"/>
-    <linearGradient id="spinnerrightdisabled@2x-d" x1="50%" x2="50%" y1="0%" y2="100%">
+    <rect id="spinnerrightdisabled@2x-a" width="17" height="21"/>
+    <linearGradient id="spinnerrightdisabled@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#D2D2D2"/>
-      <stop offset="100%" stop-color="#C4C4C4"/>
+      <stop offset="100%" stop-color="#C3C3C3"/>
     </linearGradient>
-    <rect id="spinnerrightdisabled@2x-c" width="130" height="42" x="-96" rx="8"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <mask id="spinnerrightdisabled@2x-b" fill="#fff">
+    <mask id="spinnerrightdisabled@2x-c" fill="#fff">
       <use xlink:href="#spinnerrightdisabled@2x-a"/>
     </mask>
-    <g mask="url(#spinnerrightdisabled@2x-b)">
-      <use fill="#F1F1F1" xlink:href="#spinnerrightdisabled@2x-c"/>
-      <rect width="129" height="41" x="-95.5" y=".5" stroke="url(#spinnerrightdisabled@2x-d)" rx="8"/>
-    </g>
-    <g transform="translate(10 7)">
-      <rect width="13" height="3" y="22" fill="#CBCBCB"/>
-      <rect width="11" height="1" x="1" y="23" fill="#8E8D8D"/>
-      <rect width="13" height="3" y="5" fill="#CBCBCB"/>
-      <rect width="3" height="13" x="5" fill="#CBCBCB"/>
-      <rect width="1" height="11" x="6" y="1" fill="#8E8D8D"/>
-      <rect width="11" height="1" x="1" y="6" fill="#8E8D8D"/>
-    </g>
+    <rect width="64.5" height="20.5" x="-47.75" y=".25" fill="#F1F1F1" stroke="url(#spinnerrightdisabled@2x-b)" stroke-width=".5" mask="url(#spinnerrightdisabled@2x-c)" rx="4"/>
+    <rect width="6.5" height="1.5" x="5" y="14.5" fill="#CBCBCB" mask="url(#spinnerrightdisabled@2x-c)"/>
+    <rect width="6.5" height="1.5" x="5" y="6" fill="#CBCBCB" mask="url(#spinnerrightdisabled@2x-c)"/>
+    <rect width="1.5" height="6.5" x="7.5" y="3.5" fill="#CBCBCB" mask="url(#spinnerrightdisabled@2x-c)"/>
+    <path fill="#8E8D8D" d="M8.5 6.5L11 6.5 11 7 8.5 7 8.5 9.5 8 9.5 8 7 5.5 7 5.5 6.5 8 6.5 8 4 8.5 4 8.5 6.5zM5.5 15L11 15 11 15.5 5.5 15.5 5.5 15z" mask="url(#spinnerrightdisabled@2x-c)"/>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/spinnerRight@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/spinnerRight@2x.svg
index c3f2b8783cad..2aa859f7f6ce 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/spinnerRight@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/spinnerRight@2x.svg
@@ -1,31 +1,22 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34" height="42" viewBox="0 0 34 42">
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="21" viewBox="0 0 17 21">
   <defs>
-    <rect id="spinnerright@2x-a" width="34" height="42"/>
-    <linearGradient id="spinnerright@2x-c" x1="50%" x2="50%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#69B1FA"/>
-      <stop offset="100%" stop-color="#0A7FFE"/>
+    <linearGradient id="spinnerright@2x-a" x1="50%" x2="50%" y1="0%" y2="100%">
+      <stop offset="0%" stop-color="#6BB4FA"/>
+      <stop offset="100%" stop-color="#057EFF"/>
     </linearGradient>
-    <linearGradient id="spinnerright@2x-e" x1="50%" x2="50%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#49A0F8"/>
-      <stop offset="100%" stop-color="#025EFF"/>
+    <linearGradient id="spinnerright@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
+      <stop offset="0%" stop-color="#4CA2F8"/>
+      <stop offset="100%" stop-color="#025BFF"/>
     </linearGradient>
-    <rect id="spinnerright@2x-d" width="130" height="42" x="-96" rx="8"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <mask id="spinnerright@2x-b" fill="#fff">
-      <use xlink:href="#spinnerright@2x-a"/>
-    </mask>
-    <g mask="url(#spinnerright@2x-b)">
-      <use fill="url(#spinnerright@2x-c)" xlink:href="#spinnerright@2x-d"/>
-      <rect width="129" height="41" x="-95.5" y=".5" stroke="url(#spinnerright@2x-e)" rx="8"/>
-    </g>
-    <g transform="translate(10 7)">
-      <rect width="13" height="3" y="22" fill="#90C5FE"/>
-      <rect width="11" height="1" x="1" y="23" fill="#FFF"/>
-      <rect width="13" height="3" y="5" fill="#ADD5FD"/>
-      <rect width="3" height="13" x="5" fill="#ADD5FD"/>
-      <rect width="1" height="11" x="6" y="1" fill="#FFF"/>
-      <rect width="11" height="1" x="1" y="6" fill="#FFF"/>
+    <path fill="url(#spinnerright@2x-a)" stroke="url(#spinnerright@2x-b)" stroke-width=".5" d="M0.25,0.25 L0.25,20.75 L13.0001592,20.75 C15.0756006,20.75 16.75,19.0737986 16.75,17.0006308 L16.75,3.99936922 C16.75,1.92857227 15.071192,0.25 13.0001592,0.25 L0.25,0.25 Z"/>
+    <rect width="6.5" height="1.5" x="5" y="6" fill="#ADD5FD"/>
+    <rect width="1.5" height="6.5" x="7.5" y="3.5" fill="#ADD5FD"/>
+    <path fill="#FFF" d="M8.5,6.5 L11,6.5 L11,7 L8.5,7 L8.5,9.5 L8,9.5 L8,7 L5.5,7 L5.5,6.5 L8,6.5 L8,4 L8.5,4 L8.5,6.5 Z"/>
+    <g transform="translate(5 14)">
+      <rect width="6.5" height="1.5" y=".5" fill="#90C5FE"/>
+      <path fill="#FFF" d="M0.5,1 L6,1 L6,1.5 L0.5,1.5 L0.5,1 Z"/>
     </g>
   </g>
 </svg>
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/spinnerRightDisabled@2x.svg b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/spinnerRightDisabled@2x.svg
index b9bcc8b909f1..a0bd9e54aeb5 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/spinnerRightDisabled@2x.svg
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/spinnerRightDisabled@2x.svg
@@ -1,27 +1,19 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="34" height="42" viewBox="0 0 34 42">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17" height="21" viewBox="0 0 17 21">
   <defs>
-    <rect id="spinnerrightdisabled@2x-a" width="34" height="42"/>
-    <linearGradient id="spinnerrightdisabled@2x-d" x1="50%" x2="50%" y1="0%" y2="100%">
+    <rect id="spinnerrightdisabled@2x-a" width="17" height="21"/>
+    <linearGradient id="spinnerrightdisabled@2x-b" x1="50%" x2="50%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#D2D2D2"/>
-      <stop offset="100%" stop-color="#C4C4C4"/>
+      <stop offset="100%" stop-color="#C3C3C3"/>
     </linearGradient>
-    <rect id="spinnerrightdisabled@2x-c" width="130" height="42" x="-96" rx="8"/>
   </defs>
   <g fill="none" fill-rule="evenodd">
-    <mask id="spinnerrightdisabled@2x-b" fill="#fff">
+    <mask id="spinnerrightdisabled@2x-c" fill="#fff">
       <use xlink:href="#spinnerrightdisabled@2x-a"/>
     </mask>
-    <g mask="url(#spinnerrightdisabled@2x-b)">
-      <use fill="#F1F1F1" xlink:href="#spinnerrightdisabled@2x-c"/>
-      <rect width="129" height="41" x="-95.5" y=".5" stroke="url(#spinnerrightdisabled@2x-d)" rx="8"/>
-    </g>
-    <g transform="translate(10 7)">
-      <rect width="13" height="3" y="22" fill="#CBCBCB"/>
-      <rect width="11" height="1" x="1" y="23" fill="#8E8D8D"/>
-      <rect width="13" height="3" y="5" fill="#CBCBCB"/>
-      <rect width="3" height="13" x="5" fill="#CBCBCB"/>
-      <rect width="1" height="11" x="6" y="1" fill="#8E8D8D"/>
-      <rect width="11" height="1" x="1" y="6" fill="#8E8D8D"/>
-    </g>
+    <rect width="64.5" height="20.5" x="-47.75" y=".25" fill="#F1F1F1" stroke="url(#spinnerrightdisabled@2x-b)" stroke-width=".5" mask="url(#spinnerrightdisabled@2x-c)" rx="4"/>
+    <rect width="6.5" height="1.5" x="5" y="14.5" fill="#CBCBCB" mask="url(#spinnerrightdisabled@2x-c)"/>
+    <rect width="6.5" height="1.5" x="5" y="6" fill="#CBCBCB" mask="url(#spinnerrightdisabled@2x-c)"/>
+    <rect width="1.5" height="6.5" x="7.5" y="3.5" fill="#CBCBCB" mask="url(#spinnerrightdisabled@2x-c)"/>
+    <path fill="#8E8D8D" d="M8.5 6.5L11 6.5 11 7 8.5 7 8.5 9.5 8 9.5 8 7 5.5 7 5.5 6.5 8 6.5 8 4 8.5 4 8.5 6.5zM5.5 15L11 15 11 15.5 5.5 15.5 5.5 15z" mask="url(#spinnerrightdisabled@2x-c)"/>
   </g>
 </svg>
diff --git a/platform/platform-tests/testData/ui/abstractClass@2x.svg b/platform/platform-tests/testData/ui/abstractClass@2x.svg
deleted file mode 100644
index 5532b4411142..000000000000
--- a/platform/platform-tests/testData/ui/abstractClass@2x.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>abstractClass@2x</title>
-  <g>
-    <path d="M22,3.36522a13.86717,13.86717,0,0,0-12,0V28.63475a13.86717,13.86717,0,0,0,12,0V3.36522Z" fill="#40b6e0" opacity="0.5" style="isolation: isolate"/>
-    <path d="M21.23186,19.96312l-1.0814-1.10674a4.95515,4.95515,0,0,1-3.76821,1.56092,4.2471,4.2471,0,0,1-4.05469-4.41708V15.967a4.28989,4.28989,0,0,1,4.12959-4.44441l0.041-.00131A5.2348,5.2348,0,0,1,20.14461,12.947l1.02231-1.10934a6.267,6.267,0,0,0-4.6062-1.8374H16.1971a6.05971,6.05971,0,0,0-6.19589,5.9204l-0.00129.0796V16.033a5.9881,5.9881,0,0,0,6.00476,5.96729h0.50721A6.24735,6.24735,0,0,0,21.23186,19.96312Z" fill="#231f20" opacity="0.6" style="isolation: isolate"/>
-    <path d="M8,4.52A13.9825,13.9825,0,0,0,8,27.48V4.52Z" fill="#9aa7b0" opacity="0.6" style="isolation: isolate"/>
-    <path d="M24,4.52V27.48A13.9825,13.9825,0,0,0,24,4.52Z" fill="#9aa7b0" opacity="0.6" style="isolation: isolate"/>
-  </g>
-</svg>
diff --git a/platform/util/src/com/intellij/util/ImageLoader.java b/platform/util/src/com/intellij/util/ImageLoader.java
index fc5ecbbd610c..8167f39ec4d2 100644
--- a/platform/util/src/com/intellij/util/ImageLoader.java
+++ b/platform/util/src/com/intellij/util/ImageLoader.java
@@ -174,7 +174,6 @@ public class ImageLoader implements Serializable {
       void add(boolean retina, boolean dark, ImageDesc.Type type) {
         String _ext = SVG == type ? "svg" : ext;
         double _scale = SVG == type ? scale : retina ? 2 : 1;
-        if (SVG == type && retina) _scale /= 2d;
 
         list.add(new ImageDesc(name + (dark ? "_dark" : "") + (retina ? "@2x" : "") + "." + _ext, cls, _scale, type));
         if (retina && dark) {
diff --git a/python/psi-api/resources/icons/com/jetbrains/python/pythonFile@2x.svg b/python/psi-api/resources/icons/com/jetbrains/python/pythonFile@2x.svg
deleted file mode 100644
index f38ee1fe5eed..000000000000
--- a/python/psi-api/resources/icons/com/jetbrains/python/pythonFile@2x.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>pythonFile@2x</title>
-  <g>
-    <g>
-      <polygon points="12 0 4 8 12 8 12 0" fill="#9aa7b0" opacity="0.7" style="isolation: isolate"/>
-      <path d="M15.16406,29.14453V28.71875H14.9043c-2.22461,0-3.91016-1.47656-4.50781-3.94727a10.811,10.811,0,0,1,0-5.79492,4.97926,4.97926,0,0,1,4.76758-3.94141V14.60742c0-2.55078,1.293-3.96484,4.06641-4.45117A16.03293,16.03293,0,0,1,21.877,9.93359h0.00391a17.225,17.225,0,0,1,2.83984.2207A5.28542,5.28542,0,0,1,26,10.55273V0H14V10H4V30H15.26416A4.012,4.012,0,0,1,15.16406,29.14453Z" fill="#9aa7b0" opacity="0.7" style="isolation: isolate"/>
-    </g>
-    <g>
-      <path id="path1948" d="M21.88091,11.93266a13.92271,13.92271,0,0,0-2.30521.19464c-2.0414.35671-2.412,1.10333-2.412,2.48023V16.426h4.82407v0.60615h-6.6345a3.005,3.005,0,0,0-3.01364,2.41905,8.82486,8.82486,0,0,0,0,4.84923c0.34291,1.41257,1.16183,2.41905,2.56384,2.41905h1.65863V24.53954a3.04914,3.04914,0,0,1,3.01364-2.964h4.81845a2.4168,2.4168,0,0,0,2.412-2.42461V14.60752a2.67657,2.67657,0,0,0-2.412-2.48023A15.209,15.209,0,0,0,21.88091,11.93266Zm-2.60882,1.46255a0.90924,0.90924,0,1,1-.90522.912A0.91016,0.91016,0,0,1,19.27209,13.39521Z" fill="#40a0cf" opacity="0.9"/>
-      <path id="path1950" d="M27.40779,17.03213v2.11876a3.07686,3.07686,0,0,1-3.01364,3.02521H19.57571a2.44707,2.44707,0,0,0-2.412,2.42461v4.54337c0,1.29307,1.13683,2.05364,2.412,2.42461a8.15609,8.15609,0,0,0,4.81845,0c1.21448-.34779,2.412-1.04772,2.412-2.42461V27.32562H21.98774V26.71947h7.23048c1.402,0,1.92445-.96725,2.412-2.41905a8.10308,8.10308,0,0,0,0-4.84923c-0.34648-1.38046-1.00824-2.41905-2.412-2.41905H27.40779Zm-2.71,11.5058a0.90924,0.90924,0,1,1-.90522.90645A0.90539,0.90539,0,0,1,24.69776,28.53793Z" fill="#ffc900" opacity="0.9"/>
-    </g>
-  </g>
-</svg>