diff --git a/platform/icons/src/PlatformIconMappings.json b/platform/icons/src/PlatformIconMappings.json
index 23b59bf521ca..a45fb3d5281f 100644
--- a/platform/icons/src/PlatformIconMappings.json
+++ b/platform/icons/src/PlatformIconMappings.json
@@ -650,6 +650,7 @@
       "classAnonymous.svg": "nodes/anonymousClass.svg",
       "classInitializer.svg": "nodes/classInitializer.svg",
       "constant.svg": "nodes/constant.svg",
+      "constructor.svg": "nodes/constructor.svg",
       "controller.svg": "nodes/controller.svg",
       "copyOfFolder.svg": ["nodes/copyOfFolder.svg", "vcs/folders.svg"],
       "dataColumn.svg": "nodes/dataColumn.svg",
@@ -923,6 +924,7 @@
       "build.svg": "toolwindows/toolWindowBuild.svg",
       "commit.svg": "toolwindows/toolWindowCommit.svg",
       "coverage.svg": "toolwindows/toolWindowCoverage.svg",
+      "dataflow.svg": "toolwindows/toolWindowAnalyzeDataflow.svg",
       "debug.svg": "toolwindows/toolWindowDebugger.svg",
       "documentation.svg": "toolwindows/documentation.svg",
       "find.svg": "toolwindows/toolWindowFind.svg",
@@ -951,7 +953,8 @@
       "web.svg": [
         "toolwindows/webToolWindow.svg",
         "general/web.svg"
-      ]
+      ],
+      "webServer.svg": "toolwindows/toolWindowServer.svg"
     },
     "vcs": {
       "arrowLeft.svg": "vcs/arrow_left.svg",
diff --git a/platform/icons/src/expui/nodes/constructor.svg b/platform/icons/src/expui/nodes/constructor.svg
new file mode 100644
index 000000000000..96b6cc25149d
--- /dev/null
+++ b/platform/icons/src/expui/nodes/constructor.svg
@@ -0,0 +1,7 @@
+<!-- Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 8L13.1125 10.8123L16 11.0557L13.8 13.0372L14.4721 16L12 14.4123L9.52786 16L10.2 13.0372L8 11.0557L10.8875 10.8123L12 8Z" fill="#6C707E"/>
+<path d="M15 8C15 8.67483 14.9045 9.32736 14.7263 9.94482L13.8143 9.86794L12.9299 7.63217C12.7789 7.25063 12.4103 7 12 7C11.5897 7 11.221 7.25063 11.0701 7.63217L10.1857 9.86794L7.91598 10.0593C7.51872 10.0927 7.17931 10.359 7.05218 10.7368C6.92506 11.1147 7.03451 11.532 7.33073 11.7988L9.09503 13.3879L8.73801 14.9616C8.49548 14.987 8.24926 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8Z" fill="#FFF7F7"/>
+<path d="M8 14C8.33164 14 8.65699 13.9731 8.974 13.9213L8.73801 14.9616C8.49548 14.987 8.24926 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8C15 8.67483 14.9045 9.32736 14.7263 9.94482L13.8143 9.86794L13.7524 9.71147C13.9135 9.16912 14 8.59466 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" fill="#DB3B4B"/>
+<path d="M8.29593 6.31537C8.636 5.6473 9.25361 5.24573 10.0657 5.24573C11.1061 5.24573 11.8459 5.91981 11.9786 7.00023C11.5769 7.00875 11.2184 7.25726 11.0701 7.63217L11.0013 7.80602V7.43758C11.0013 6.61761 10.5756 6.10775 9.82392 6.10775C9.01971 6.10775 8.49409 6.68068 8.49409 7.59001V10.0105L7.91598 10.0593C7.76872 10.0717 7.62941 10.1161 7.50591 10.1863V7.43758C7.50591 6.61761 7.0749 6.10775 6.32852 6.10775C5.5138 6.10775 4.99869 6.68068 4.99869 7.59001V10.7543H4V5.37188H4.96189V6.24862C5.28147 5.60946 5.84915 5.24573 6.6071 5.24573C7.40552 5.24573 8.00368 5.64257 8.29593 6.31537Z" fill="#DB3B4B"/>
+</svg>
diff --git a/platform/icons/src/expui/nodes/constructor_dark.svg b/platform/icons/src/expui/nodes/constructor_dark.svg
new file mode 100644
index 000000000000..25a47e1dd91d
--- /dev/null
+++ b/platform/icons/src/expui/nodes/constructor_dark.svg
@@ -0,0 +1,7 @@
+<!-- Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 8L13.1125 10.8123L16 11.0557L13.8 13.0372L14.4721 16L12 14.4123L9.52786 16L10.2 13.0372L8 11.0557L10.8875 10.8123L12 8Z" fill="#CED0D6"/>
+<path d="M15 8C15 8.67483 14.9045 9.32736 14.7263 9.94482L13.8143 9.86794L12.9299 7.63217C12.7789 7.25063 12.4103 7 12 7C11.5897 7 11.221 7.25063 11.0701 7.63217L10.1857 9.86794L7.91598 10.0593C7.51872 10.0927 7.17931 10.359 7.05218 10.7368C6.92506 11.1147 7.03451 11.532 7.33073 11.7988L9.09503 13.3879L8.73801 14.9616C8.49548 14.987 8.24926 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8Z" fill="#402929"/>
+<path d="M8 14C8.33164 14 8.65699 13.9731 8.974 13.9213L8.73801 14.9616C8.49548 14.987 8.24926 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8C15 8.67483 14.9045 9.32736 14.7263 9.94482L13.8143 9.86794L13.7524 9.71147C13.9135 9.16912 14 8.59466 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" fill="#DB5C5C"/>
+<path d="M8.29593 6.31537C8.636 5.6473 9.25361 5.24573 10.0657 5.24573C11.1061 5.24573 11.8459 5.91981 11.9786 7.00023C11.5769 7.00875 11.2184 7.25726 11.0701 7.63217L11.0013 7.80602V7.43758C11.0013 6.61761 10.5756 6.10775 9.82392 6.10775C9.01971 6.10775 8.49409 6.68068 8.49409 7.59001V10.0105L7.91598 10.0593C7.76872 10.0717 7.62941 10.1161 7.50591 10.1863V7.43758C7.50591 6.61761 7.0749 6.10775 6.32852 6.10775C5.5138 6.10775 4.99869 6.68068 4.99869 7.59001V10.7543H4V5.37188H4.96189V6.24862C5.28147 5.60946 5.84915 5.24573 6.6071 5.24573C7.40552 5.24573 8.00368 5.64257 8.29593 6.31537Z" fill="#DB5C5C"/>
+</svg>
diff --git a/platform/icons/src/expui/toolwindows/dataflow.svg b/platform/icons/src/expui/toolwindows/dataflow.svg
new file mode 100644
index 000000000000..9f48d8b1e439
--- /dev/null
+++ b/platform/icons/src/expui/toolwindows/dataflow.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.8536 3.14645C11.6583 2.95118 11.3417 2.95118 11.1464 3.14645L8.14645 6.14645C7.95118 6.34171 7.95118 6.65829 8.14645 6.85355C8.34171 7.04882 8.65829 7.04882 8.85355 6.85355L11 4.70711V12.5C11 12.7761 11.2239 13 11.5 13C11.7761 13 12 12.7761 12 12.5V4.70711L14.1464 6.85355C14.3417 7.04882 14.6583 7.04882 14.8536 6.85355C15.0488 6.65829 15.0488 6.34171 14.8536 6.14645L11.8536 3.14645Z" fill="#6C707E"/>
+<path d="M5 3.5C5 3.22386 4.77614 3 4.5 3C4.22386 3 4 3.22386 4 3.5V11.2929L1.85355 9.14645C1.65829 8.95118 1.34171 8.95118 1.14645 9.14645C0.951184 9.34171 0.951184 9.65829 1.14645 9.85355L4.14645 12.8536C4.34171 13.0488 4.65829 13.0488 4.85355 12.8536L7.85355 9.85355C8.04882 9.65829 8.04882 9.34171 7.85355 9.14645C7.65829 8.95118 7.34171 8.95118 7.14645 9.14645L5 11.2929V3.5Z" fill="#6C707E"/>
+</svg>
diff --git a/platform/icons/src/expui/toolwindows/dataflow@20x20.svg b/platform/icons/src/expui/toolwindows/dataflow@20x20.svg
new file mode 100644
index 000000000000..78e10dc00dd9
--- /dev/null
+++ b/platform/icons/src/expui/toolwindows/dataflow@20x20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.25 4.5C6.25 4.08579 5.91421 3.75 5.5 3.75C5.08579 3.75 4.75 4.08579 4.75 4.5V13.6893L2.53033 11.4697C2.23744 11.1768 1.76256 11.1768 1.46967 11.4697C1.17678 11.7626 1.17678 12.2374 1.46967 12.5303L4.96967 16.0303C5.26256 16.3232 5.73744 16.3232 6.03033 16.0303L9.53033 12.5303C9.82322 12.2374 9.82322 11.7626 9.53033 11.4697C9.23744 11.1768 8.76256 11.1768 8.46967 11.4697L6.25 13.6893V4.5Z" fill="#6C707E"/>
+<path d="M15.0303 3.96967C14.7374 3.67678 14.2626 3.67678 13.9697 3.96967L10.4697 7.46967C10.1768 7.76256 10.1768 8.23744 10.4697 8.53033C10.7626 8.82322 11.2374 8.82322 11.5303 8.53033L13.75 6.31066V15.5C13.75 15.9142 14.0858 16.25 14.5 16.25C14.9142 16.25 15.25 15.9142 15.25 15.5V6.31066L17.4697 8.53033C17.7626 8.82322 18.2374 8.82322 18.5303 8.53033C18.8232 8.23744 18.8232 7.76256 18.5303 7.46967L15.0303 3.96967Z" fill="#6C707E"/>
+</svg>
diff --git a/platform/icons/src/expui/toolwindows/dataflow@20x20_dark.svg b/platform/icons/src/expui/toolwindows/dataflow@20x20_dark.svg
new file mode 100644
index 000000000000..627b3e02f045
--- /dev/null
+++ b/platform/icons/src/expui/toolwindows/dataflow@20x20_dark.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.25 4.5C6.25 4.08579 5.91421 3.75 5.5 3.75C5.08579 3.75 4.75 4.08579 4.75 4.5V13.6893L2.53033 11.4697C2.23744 11.1768 1.76256 11.1768 1.46967 11.4697C1.17678 11.7626 1.17678 12.2374 1.46967 12.5303L4.96967 16.0303C5.26256 16.3232 5.73744 16.3232 6.03033 16.0303L9.53033 12.5303C9.82322 12.2374 9.82322 11.7626 9.53033 11.4697C9.23744 11.1768 8.76256 11.1768 8.46967 11.4697L6.25 13.6893V4.5Z" fill="#CED0D6"/>
+<path d="M15.0303 3.96967C14.7374 3.67678 14.2626 3.67678 13.9697 3.96967L10.4697 7.46967C10.1768 7.76256 10.1768 8.23744 10.4697 8.53033C10.7626 8.82322 11.2374 8.82322 11.5303 8.53033L13.75 6.31066V15.5C13.75 15.9142 14.0858 16.25 14.5 16.25C14.9142 16.25 15.25 15.9142 15.25 15.5V6.31066L17.4697 8.53033C17.7626 8.82322 18.2374 8.82322 18.5303 8.53033C18.8232 8.23744 18.8232 7.76256 18.5303 7.46967L15.0303 3.96967Z" fill="#CED0D6"/>
+</svg>
diff --git a/platform/icons/src/expui/toolwindows/dataflow_dark.svg b/platform/icons/src/expui/toolwindows/dataflow_dark.svg
new file mode 100644
index 000000000000..aecd83789d5f
--- /dev/null
+++ b/platform/icons/src/expui/toolwindows/dataflow_dark.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.8536 3.14645C11.6583 2.95118 11.3417 2.95118 11.1464 3.14645L8.14645 6.14645C7.95118 6.34171 7.95118 6.65829 8.14645 6.85355C8.34171 7.04882 8.65829 7.04882 8.85355 6.85355L11 4.70711V12.5C11 12.7761 11.2239 13 11.5 13C11.7761 13 12 12.7761 12 12.5V4.70711L14.1464 6.85355C14.3417 7.04882 14.6583 7.04882 14.8536 6.85355C15.0488 6.65829 15.0488 6.34171 14.8536 6.14645L11.8536 3.14645Z" fill="#CED0D6"/>
+<path d="M5 3.5C5 3.22386 4.77614 3 4.5 3C4.22386 3 4 3.22386 4 3.5V11.2929L1.85355 9.14645C1.65829 8.95118 1.34171 8.95118 1.14645 9.14645C0.951184 9.34171 0.951184 9.65829 1.14645 9.85355L4.14645 12.8536C4.34171 13.0488 4.65829 13.0488 4.85355 12.8536L7.85355 9.85355C8.04882 9.65829 8.04882 9.34171 7.85355 9.14645C7.65829 8.95118 7.34171 8.95118 7.14645 9.14645L5 11.2929V3.5Z" fill="#CED0D6"/>
+</svg>
diff --git a/platform/icons/src/expui/toolwindows/webServer.svg b/platform/icons/src/expui/toolwindows/webServer.svg
new file mode 100644
index 000000000000..f4d860871ff7
--- /dev/null
+++ b/platform/icons/src/expui/toolwindows/webServer.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 4H6V5H4V4Z" fill="#6C707E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 3V6C2 6.55228 2.44772 7 3 7H13C13.5523 7 14 6.55228 14 6V3C14 2.44772 13.5523 2 13 2H3C2.44772 2 2 2.44772 2 3ZM3 6V3H13L13 6H3Z" fill="#6C707E"/>
+<path d="M6 11H4V12H6V11Z" fill="#6C707E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 10V13C2 13.5523 2.44772 14 3 14H13C13.5523 14 14 13.5523 14 13V10C14 9.44772 13.5523 9 13 9H3C2.44772 9 2 9.44771 2 10ZM3 13V10H13L13 13H3Z" fill="#6C707E"/>
+</svg>
diff --git a/platform/icons/src/expui/toolwindows/webServer@20x20.svg b/platform/icons/src/expui/toolwindows/webServer@20x20.svg
new file mode 100644
index 000000000000..67a09d2e825a
--- /dev/null
+++ b/platform/icons/src/expui/toolwindows/webServer@20x20.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 4V7C3.5 7.27614 3.72386 7.5 4 7.5H16C16.2761 7.5 16.5 7.27614 16.5 7V4C16.5 3.72386 16.2761 3.5 16 3.5H4C3.72386 3.5 3.5 3.72386 3.5 4ZM2 7V4C2 2.89543 2.89543 2 4 2H16C17.1046 2 18 2.89543 18 4V7C18 8.10457 17.1046 9 16 9H4C2.89543 9 2 8.10457 2 7Z" fill="#6C707E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 13V16C3.5 16.2761 3.72386 16.5 4 16.5H16C16.2761 16.5 16.5 16.2761 16.5 16V13C16.5 12.7239 16.2761 12.5 16 12.5H4C3.72386 12.5 3.5 12.7239 3.5 13ZM2 16V13C2 11.8954 2.89543 11 4 11H16C17.1046 11 18 11.8954 18 13V16C18 17.1046 17.1046 18 16 18H4C2.89543 18 2 17.1046 2 16Z" fill="#6C707E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6.25H5V4.75H8V6.25Z" fill="#6C707E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15.25H5V13.75H8V15.25Z" fill="#6C707E"/>
+</svg>
diff --git a/platform/icons/src/expui/toolwindows/webServer@20x20_dark.svg b/platform/icons/src/expui/toolwindows/webServer@20x20_dark.svg
new file mode 100644
index 000000000000..d5dff96be166
--- /dev/null
+++ b/platform/icons/src/expui/toolwindows/webServer@20x20_dark.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 4V7C3.5 7.27614 3.72386 7.5 4 7.5H16C16.2761 7.5 16.5 7.27614 16.5 7V4C16.5 3.72386 16.2761 3.5 16 3.5H4C3.72386 3.5 3.5 3.72386 3.5 4ZM2 7V4C2 2.89543 2.89543 2 4 2H16C17.1046 2 18 2.89543 18 4V7C18 8.10457 17.1046 9 16 9H4C2.89543 9 2 8.10457 2 7Z" fill="#CED0D6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 13V16C3.5 16.2761 3.72386 16.5 4 16.5H16C16.2761 16.5 16.5 16.2761 16.5 16V13C16.5 12.7239 16.2761 12.5 16 12.5H4C3.72386 12.5 3.5 12.7239 3.5 13ZM2 16V13C2 11.8954 2.89543 11 4 11H16C17.1046 11 18 11.8954 18 13V16C18 17.1046 17.1046 18 16 18H4C2.89543 18 2 17.1046 2 16Z" fill="#CED0D6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6.25H5V4.75H8V6.25Z" fill="#CED0D6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15.25H5V13.75H8V15.25Z" fill="#CED0D6"/>
+</svg>
diff --git a/platform/icons/src/expui/toolwindows/webServer_dark.svg b/platform/icons/src/expui/toolwindows/webServer_dark.svg
new file mode 100644
index 000000000000..300b6d48313a
--- /dev/null
+++ b/platform/icons/src/expui/toolwindows/webServer_dark.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 4H6V5H4V4Z" fill="#CED0D6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 3V6C2 6.55228 2.44772 7 3 7H13C13.5523 7 14 6.55228 14 6V3C14 2.44772 13.5523 2 13 2H3C2.44772 2 2 2.44772 2 3ZM3 6V3H13L13 6H3Z" fill="#CED0D6"/>
+<path d="M6 11H4V12H6V11Z" fill="#CED0D6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 10V13C2 13.5523 2.44772 14 3 14H13C13.5523 14 14 13.5523 14 13V10C14 9.44772 13.5523 9 13 9H3C2.44772 9 2 9.44771 2 10ZM3 13V10H13L13 13H3Z" fill="#CED0D6"/>
+</svg>
diff --git a/platform/icons/src/nodes/constructor.svg b/platform/icons/src/nodes/constructor.svg
new file mode 100644
index 000000000000..acb5b4c59468
--- /dev/null
+++ b/platform/icons/src/nodes/constructor.svg
@@ -0,0 +1,7 @@
+<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="M14.7279065,9.93922898 L13.2249195,9.85558898 L11.9495635,6.5 L11.0406489,6.5 L9.77115318,9.85558898 L6.01939023,10.0717163 L6.01939023,10.8769531 L8.70388068,13.140316 L8.21285589,14.9968255 C8.14216225,14.9989368 8.07120528,15 8,15 C4.13400675,15 1,11.8659932 1,8 C1,4.13400675 4.13400675,1 8,1 C11.8659932,1 15,4.13400675 15,8 C15,8.6727991 14.905082,9.32342891 14.7279065,9.93922898 Z"/>
+    <polygon fill="#9AA7B0" points="11.498 14.163 8.718 15.956 9.564 12.758 7 10.668 10.303 10.484 11.498 7.4 12.693 10.484 15.996 10.668 13.432 12.758 14.278 15.956"/>
+    <path fill="#231F20" fill-opacity=".7" d="M10.7568959,7.25002881 C10.6072458,7.10510886 10.3670933,7 9.98162842,7 C8.95911952,7 9,7.686 9,8 L9,9.9000127 L8,9.95761957 L8,8 C7.999,7.537 7.95,7 7,7 C6.05,7 6.05,7.7657 6,8 C5.96666667,8.1562 5.96666667,9.1563 6,11.0003 L5,11.0003 L5,6.0003 L6,6.0003 L6,6.299231 C6.26527507,6.09994367 6.63194173,6.0003 7.1,6.0003 C7.94411621,6.0003 8.28363037,6.19411621 8.5986,6.6 C8.6576,6.502 9.11224365,6.0003 9.98162842,6.0003 C10.6518091,6.0003 11.1088526,6.20575975 11.415504,6.5 L11.0406489,6.5 L10.7568959,7.25002881 Z"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/toolwindows/toolWindowServer.svg b/platform/icons/src/toolwindows/toolWindowServer.svg
new file mode 100644
index 000000000000..a11e73130359
--- /dev/null
+++ b/platform/icons/src/toolwindows/toolWindowServer.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#6E6E6E" d="M2 1.20000005L11 1.20000005 11 4 2 4 2 1.20000005zM3 2.10000002L3 3.10000002 5 3.10000002 5 2.10000002 3 2.10000002zM2 5.0999999L11 5.0999999 11 7.89999986 2 7.89999986 2 5.0999999zM3 5.99999988L3 6.99999988 5 6.99999988 5 5.99999988 3 5.99999988zM2 9L11 9 11 11.8 2 11.8 2 9zM3 9.89999998L3 10.9 5 10.9 5 9.89999998 3 9.89999998z"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/toolwindows/toolWindowServer_dark.svg b/platform/icons/src/toolwindows/toolWindowServer_dark.svg
new file mode 100644
index 000000000000..90654c4c7262
--- /dev/null
+++ b/platform/icons/src/toolwindows/toolWindowServer_dark.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#AFB1B3" d="M2 1.20000005L11 1.20000005 11 4 2 4 2 1.20000005zM3 2.10000002L3 3.10000002 5 3.10000002 5 2.10000002 3 2.10000002zM2 5.0999999L11 5.0999999 11 7.89999986 2 7.89999986 2 5.0999999zM3 5.99999988L3 6.99999988 5 6.99999988 5 5.99999988 3 5.99999988zM2 9L11 9 11 11.8 2 11.8 2 9zM3 9.89999998L3 10.9 5 10.9 5 9.89999998 3 9.89999998z"/>
+  </g>
+</svg>
diff --git a/platform/remote-servers/impl/api-dump.txt b/platform/remote-servers/impl/api-dump.txt
index 01c0750dd4ad..1a14048ecaa5 100644
--- a/platform/remote-servers/impl/api-dump.txt
+++ b/platform/remote-servers/impl/api-dump.txt
@@ -1,5 +1,4 @@
 f:icons.RemoteServersIcons
 - sf:ResumeScaled:javax.swing.Icon
-- sf:ServersToolWindow:javax.swing.Icon
 - sf:SuspendScaled:javax.swing.Icon
 - <init>():V
diff --git a/platform/remote-servers/impl/resources/icons/serversToolWindow.svg b/platform/remote-servers/impl/resources/icons/serversToolWindow.svg
deleted file mode 100644
index 9ab8ade39cf0..000000000000
--- a/platform/remote-servers/impl/resources/icons/serversToolWindow.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-  <g fill="none" fill-rule="evenodd">
-    <g fill="#6E6E6E" transform="translate(1 1.2)">
-      <path d="M0 0L9 0 9 2.79999995 0 2.79999995 0 0zM1 .899999976L1 1.89999998 3 1.89999998 3 .899999976 1 .899999976zM4 3.5999999L4 6.39999986 0 6.39999986 0 3.5999999 4 3.5999999zM9 3.5999999L9 6.39999986 9 3.5999999zM1 4.49999988L1 5.49999988 3 5.49999988 3 4.49999988 1 4.49999988zM4 7.19999981L4 9.99999976 0 9.99999976 0 7.19999981 4 7.19999981zM9 7.19999981L9 9.99999976 9 7.19999981zM1 8.09999979L1 9.09999979 3 9.09999979 3 8.09999979 1 8.09999979z"/>
-    </g>
-    <polygon fill="#6E6E6E" points="7 5 13 9 7 13"/>
-  </g>
-</svg>
diff --git a/platform/remote-servers/impl/resources/icons/serversToolWindow_dark.svg b/platform/remote-servers/impl/resources/icons/serversToolWindow_dark.svg
deleted file mode 100644
index 468b87df9f16..000000000000
--- a/platform/remote-servers/impl/resources/icons/serversToolWindow_dark.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
-  <g fill="none" fill-rule="evenodd">
-    <g fill="#AFB1B3" transform="translate(1 1.2)">
-      <path d="M0 0L9 0 9 2.79999995 0 2.79999995 0 0zM1 .899999976L1 1.89999998 3 1.89999998 3 .899999976 1 .899999976zM4 3.5999999L4 6.39999986 0 6.39999986 0 3.5999999 4 3.5999999zM9 3.5999999L9 6.39999986 9 3.5999999zM1 4.49999988L1 5.49999988 3 5.49999988 3 4.49999988 1 4.49999988zM4 7.19999981L4 9.99999976 0 9.99999976 0 7.19999981 4 7.19999981zM9 7.19999981L9 9.99999976 9 7.19999981zM1 8.09999979L1 9.09999979 3 9.09999979 3 8.09999979 1 8.09999979z"/>
-    </g>
-    <polygon fill="#AFB1B3" points="7 5 13 9 7 13"/>
-  </g>
-</svg>
diff --git a/platform/remote-servers/impl/src/icons/RemoteServersIcons.java b/platform/remote-servers/impl/src/icons/RemoteServersIcons.java
index 6e859de0017c..9e3fd0c15385 100644
--- a/platform/remote-servers/impl/src/icons/RemoteServersIcons.java
+++ b/platform/remote-servers/impl/src/icons/RemoteServersIcons.java
@@ -15,6 +15,5 @@ public final class RemoteServersIcons {
     return IconManager.getInstance().loadRasterizedIcon(path, RemoteServersIcons.class.getClassLoader(), cacheKey, flags);
   }
   /** 16x16 */ public static final @NotNull Icon ResumeScaled = load("icons/resumeScaled.svg", -397781337, 0);
-  /** 13x13 */ public static final @NotNull Icon ServersToolWindow = load("icons/serversToolWindow.svg", -310128575, 2);
   /** 16x16 */ public static final @NotNull Icon SuspendScaled = load("icons/suspendScaled.svg", 1727665128, 0);
 }
diff --git a/platform/util/ui/api-dump.txt b/platform/util/ui/api-dump.txt
index 64b30d2fcda6..9f3714355746 100644
--- a/platform/util/ui/api-dump.txt
+++ b/platform/util/ui/api-dump.txt
@@ -855,6 +855,7 @@ f:com.intellij.icons.AllIcons$Nodes
 - sf:ConfigFolder:javax.swing.Icon
 - sf:Console:javax.swing.Icon
 - sf:Constant:javax.swing.Icon
+- sf:Constructor:javax.swing.Icon
 - sf:Controller:javax.swing.Icon
 - sf:CopyOfFolder:javax.swing.Icon
 - sf:CustomRegion:javax.swing.Icon
@@ -1276,6 +1277,7 @@ f:com.intellij.icons.AllIcons$Toolwindows
 - sf:ToolWindowProject:javax.swing.Icon
 - sf:ToolWindowRun:javax.swing.Icon
 - sf:ToolWindowRunWithCoverage:javax.swing.Icon
+- sf:ToolWindowServer:javax.swing.Icon
 - sf:ToolWindowServices:javax.swing.Icon
 - sf:ToolWindowStructure:javax.swing.Icon
 - sf:ToolWindowTodo:javax.swing.Icon
diff --git a/platform/util/ui/src/com/intellij/icons/AllIcons.java b/platform/util/ui/src/com/intellij/icons/AllIcons.java
index d30a401f2d49..ed4aeab9a4e2 100644
--- a/platform/util/ui/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/ui/src/com/intellij/icons/AllIcons.java
@@ -920,6 +920,7 @@ public class AllIcons {
     /** 16x16 */ public static final @NotNull Icon ConfigFolder = load("expui/build/taskGroup.svg", "nodes/configFolder.svg", -1322890185, 0);
     /** 16x16 */ public static final @NotNull Icon Console = load("expui/fileTypes/shell.svg", "nodes/console.svg", 1497553448, 0);
     /** 16x16 */ public static final @NotNull Icon Constant = load("expui/nodes/constant.svg", "nodes/constant.svg", -1342227936, 0);
+    /** 16x16 */ public static final @NotNull Icon Constructor = load("expui/nodes/constructor.svg", "nodes/constructor.svg", 1815954927, 0);
     /** 16x16 */ public static final @NotNull Icon Controller = load("expui/nodes/controller.svg", "nodes/controller.svg", 1122138685, 0);
     /** 16x16 */ public static final @NotNull Icon CopyOfFolder = load("expui/nodes/copyOfFolder.svg", "nodes/copyOfFolder.svg", 992788029, 0);
     /** 16x16 */ public static final @NotNull Icon CustomRegion = load("nodes/customRegion.svg", 254535518, 0);
@@ -1361,7 +1362,7 @@ public class AllIcons {
     /** 16x16 */ public static final @NotNull Icon Repositories = load("expui/toolwindows/repositories.svg", 974555029, 2);
     /** 13x13 */ public static final @NotNull Icon SettingSync = load("expui/toolwindows/settingSync.svg", "toolwindows/settingSync.svg", -1037362170, 2);
     /** 16x16 */ public static final @NotNull Icon Task = load("expui/toolwindows/task.svg", -1024942290, 2);
-    /** 13x13 */ public static final @NotNull Icon ToolWindowAnalyzeDataflow = load("toolwindows/toolWindowAnalyzeDataflow.svg", -1971803045, 2);
+    /** 13x13 */ public static final @NotNull Icon ToolWindowAnalyzeDataflow = load("expui/toolwindows/dataflow.svg", "toolwindows/toolWindowAnalyzeDataflow.svg", -1971803045, 2);
     /** 13x13 */ public static final @NotNull Icon ToolWindowAnt = load("expui/toolwindows/ant.svg", "toolwindows/toolWindowAnt.svg", -835486132, 2);
     /** 13x13 */ public static final @NotNull Icon ToolWindowBookmarks = load("expui/toolwindows/bookmarks.svg", "toolwindows/toolWindowBookmarks.svg", 1090576904, 2);
     /** 13x13 */ public static final @NotNull Icon ToolWindowBuild = load("expui/toolwindows/build.svg", "toolwindows/toolWindowBuild.svg", -477872521, 2);
@@ -1388,6 +1389,7 @@ public class AllIcons {
     /** 13x13 */ public static final @NotNull Icon ToolWindowProject = load("expui/toolwindows/project.svg", "toolwindows/toolWindowProject.svg", 373456992, 2);
     /** 13x13 */ public static final @NotNull Icon ToolWindowRun = load("expui/toolwindows/run.svg", "toolwindows/toolWindowRun.svg", 562367487, 2);
     /** 13x13 */ public static final @NotNull Icon ToolWindowRunWithCoverage = load("expui/toolwindows/toolWindowRunWithCoverage.svg", "toolwindows/toolWindowRunWithCoverage.svg", -2005199929, 2);
+    /** 13x13 */ public static final @NotNull Icon ToolWindowServer = load("expui/toolwindows/webServer.svg", "toolwindows/toolWindowServer.svg", 79377911, 2);
     /** 13x13 */ public static final @NotNull Icon ToolWindowServices = load("expui/toolwindows/services.svg", "toolwindows/toolWindowServices.svg", 116892796, 2);
     /** 13x13 */ public static final @NotNull Icon ToolWindowStructure = load("expui/toolwindows/structure.svg", "toolwindows/toolWindowStructure.svg", -1465620418, 2);
     /** 13x13 */ public static final @NotNull Icon ToolWindowTodo = load("expui/toolwindows/todo.svg", "toolwindows/toolWindowTodo.svg", -2027082181, 2);