diff --git a/platform/icons/src/windows/closeActive.png b/platform/icons/src/windows/closeActive.png
deleted file mode 100644
index 9399d0a75cb8..000000000000
Binary files a/platform/icons/src/windows/closeActive.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeActive.svg b/platform/icons/src/windows/closeActive.svg
new file mode 100644
index 000000000000..70791dc3ea44
--- /dev/null
+++ b/platform/icons/src/windows/closeActive.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#050708" fill-rule="evenodd" transform="translate(3 3)">
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="rotate(45 5 5)"/>
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="scale(-1 1) rotate(45 0 -7.071)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/closeActive@2x.png b/platform/icons/src/windows/closeActive@2x.png
deleted file mode 100644
index 0be47a4469c0..000000000000
Binary files a/platform/icons/src/windows/closeActive@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeActive@2x_dark.png b/platform/icons/src/windows/closeActive@2x_dark.png
deleted file mode 100644
index a747d0a87faf..000000000000
Binary files a/platform/icons/src/windows/closeActive@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeActive_dark.png b/platform/icons/src/windows/closeActive_dark.png
deleted file mode 100644
index c7b47d6b1e26..000000000000
Binary files a/platform/icons/src/windows/closeActive_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeActive_dark.svg b/platform/icons/src/windows/closeActive_dark.svg
new file mode 100644
index 000000000000..bbbac55c9ebb
--- /dev/null
+++ b/platform/icons/src/windows/closeActive_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#A9A9A9" fill-rule="evenodd" transform="translate(3 3)">
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="rotate(45 5 5)"/>
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="scale(-1 1) rotate(45 0 -7.071)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/closeHover.png b/platform/icons/src/windows/closeHover.png
deleted file mode 100644
index 6b0095161034..000000000000
Binary files a/platform/icons/src/windows/closeHover.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeHover.svg b/platform/icons/src/windows/closeHover.svg
new file mode 100644
index 000000000000..c437cae94731
--- /dev/null
+++ b/platform/icons/src/windows/closeHover.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#FFF" fill-rule="evenodd" transform="translate(3 3)">
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="rotate(45 5 5)"/>
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="scale(-1 1) rotate(45 0 -7.071)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/closeHover@2x.png b/platform/icons/src/windows/closeHover@2x.png
deleted file mode 100644
index 43fcc2ee912c..000000000000
Binary files a/platform/icons/src/windows/closeHover@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeInactive.png b/platform/icons/src/windows/closeInactive.png
deleted file mode 100644
index a24938407f83..000000000000
Binary files a/platform/icons/src/windows/closeInactive.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeInactive.svg b/platform/icons/src/windows/closeInactive.svg
new file mode 100644
index 000000000000..15957b334269
--- /dev/null
+++ b/platform/icons/src/windows/closeInactive.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#9B9C9C" fill-rule="evenodd" transform="translate(3 3)">
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="rotate(45 5 5)"/>
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="scale(-1 1) rotate(45 0 -7.071)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/closeInactive@2x.png b/platform/icons/src/windows/closeInactive@2x.png
deleted file mode 100644
index a0fcfb2f8d36..000000000000
Binary files a/platform/icons/src/windows/closeInactive@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeInactive@2x_dark.png b/platform/icons/src/windows/closeInactive@2x_dark.png
deleted file mode 100644
index a20aaa1aeadb..000000000000
Binary files a/platform/icons/src/windows/closeInactive@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeInactive_dark.png b/platform/icons/src/windows/closeInactive_dark.png
deleted file mode 100644
index 0be3f457eba8..000000000000
Binary files a/platform/icons/src/windows/closeInactive_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/closeInactive_dark.svg b/platform/icons/src/windows/closeInactive_dark.svg
new file mode 100644
index 000000000000..ea602cef78a3
--- /dev/null
+++ b/platform/icons/src/windows/closeInactive_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#8C8C8C" fill-rule="evenodd" transform="translate(3 3)">
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="rotate(45 5 5)"/>
+    <rect width="13" height="1" x="-1.5" y="4.5" transform="scale(-1 1) rotate(45 0 -7.071)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/closeSmall.svg b/platform/icons/src/windows/closeSmall.svg
new file mode 100644
index 000000000000..c7c50d158de6
--- /dev/null
+++ b/platform/icons/src/windows/closeSmall.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#6E6E6E" fill-rule="evenodd" transform="rotate(-45 9.64 3.286)">
+    <polygon points="4.854 .51 5.854 .51 5.439 10.41 4.439 10.41" transform="rotate(-2 5.146 5.46)"/>
+    <polygon points="4.439 .51 5.439 .51 5.854 10.41 4.854 10.41" transform="rotate(92 5.146 5.46)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/closeSmall_dark.svg b/platform/icons/src/windows/closeSmall_dark.svg
new file mode 100644
index 000000000000..aa8898f8e163
--- /dev/null
+++ b/platform/icons/src/windows/closeSmall_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#AFB1B3" fill-rule="evenodd" transform="rotate(-45 9.64 3.286)">
+    <polygon points="4.854 .51 5.854 .51 5.439 10.41 4.439 10.41" transform="rotate(-2 5.146 5.46)"/>
+    <polygon points="4.439 .51 5.439 .51 5.854 10.41 4.854 10.41" transform="rotate(92 5.146 5.46)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/help.svg b/platform/icons/src/windows/help.svg
new file mode 100644
index 000000000000..cc52fedae94a
--- /dev/null
+++ b/platform/icons/src/windows/help.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#050708" fill-rule="evenodd" transform="translate(5 2)">
+    <path d="M3,0 C0,0 0,2.914678 0,3 C0.666666667,3 1,3 1,3 C1,3 1,1 3,1 C4.1569301,1 5,1.74285714 5,3 C5,5.28571429 2,4.0625 2,8 L3,8 C3,4.625 6,6 6,3 C6,1.58081633 5,0 3,0 Z"/>
+    <rect width="1" height="1" x="2" y="10"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/helpButton.png b/platform/icons/src/windows/helpButton.png
deleted file mode 100644
index 78a5a1b82891..000000000000
Binary files a/platform/icons/src/windows/helpButton.png and /dev/null differ
diff --git a/platform/icons/src/windows/helpButton.svg b/platform/icons/src/windows/helpButton.svg
new file mode 100644
index 000000000000..cc52fedae94a
--- /dev/null
+++ b/platform/icons/src/windows/helpButton.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#050708" fill-rule="evenodd" transform="translate(5 2)">
+    <path d="M3,0 C0,0 0,2.914678 0,3 C0.666666667,3 1,3 1,3 C1,3 1,1 3,1 C4.1569301,1 5,1.74285714 5,3 C5,5.28571429 2,4.0625 2,8 L3,8 C3,4.625 6,6 6,3 C6,1.58081633 5,0 3,0 Z"/>
+    <rect width="1" height="1" x="2" y="10"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/helpButton@2x.png b/platform/icons/src/windows/helpButton@2x.png
deleted file mode 100644
index c27ef020cf89..000000000000
Binary files a/platform/icons/src/windows/helpButton@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/helpButton@2x_dark.png b/platform/icons/src/windows/helpButton@2x_dark.png
deleted file mode 100644
index efc3b3ac2cc2..000000000000
Binary files a/platform/icons/src/windows/helpButton@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/helpButtonInactive.svg b/platform/icons/src/windows/helpButtonInactive.svg
new file mode 100644
index 000000000000..98d4478862c5
--- /dev/null
+++ b/platform/icons/src/windows/helpButtonInactive.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#9B9C9C" fill-rule="evenodd" transform="translate(5 2)">
+    <path d="M3,0 C0,0 0,2.914678 0,3 C0.666666667,3 1,3 1,3 C1,3 1,1 3,1 C4.1569301,1 5,1.74285714 5,3 C5,5.28571429 2,4.0625 2,8 L3,8 C3,4.625 6,6 6,3 C6,1.58081633 5,0 3,0 Z"/>
+    <rect width="1" height="1" x="2" y="10"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/helpButtonInactive_dark.svg b/platform/icons/src/windows/helpButtonInactive_dark.svg
new file mode 100644
index 000000000000..080af6454c9b
--- /dev/null
+++ b/platform/icons/src/windows/helpButtonInactive_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#8C8C8C" fill-rule="evenodd" transform="translate(5 2)">
+    <path d="M3,0 C0,0 0,2.914678 0,3 C0.666666667,3 1,3 1,3 C1,3 1,1 3,1 C4.1569301,1 5,1.74285714 5,3 C5,5.28571429 2,4.0625 2,8 L3,8 C3,4.625 6,6 6,3 C6,1.58081633 5,0 3,0 Z"/>
+    <rect width="1" height="1" x="2" y="10"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/helpButton_dark.png b/platform/icons/src/windows/helpButton_dark.png
deleted file mode 100644
index 42f96a0e297c..000000000000
Binary files a/platform/icons/src/windows/helpButton_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/helpButton_dark.svg b/platform/icons/src/windows/helpButton_dark.svg
new file mode 100644
index 000000000000..90c052b0dc10
--- /dev/null
+++ b/platform/icons/src/windows/helpButton_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#A9A9A9" fill-rule="evenodd" transform="translate(5 2)">
+    <path d="M3,0 C0,0 0,2.914678 0,3 C0.666666667,3 1,3 1,3 C1,3 1,1 3,1 C4.1569301,1 5,1.74285714 5,3 C5,5.28571429 2,4.0625 2,8 L3,8 C3,4.625 6,6 6,3 C6,1.58081633 5,0 3,0 Z"/>
+    <rect width="1" height="1" x="2" y="10"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/helpInactive.svg b/platform/icons/src/windows/helpInactive.svg
new file mode 100644
index 000000000000..98d4478862c5
--- /dev/null
+++ b/platform/icons/src/windows/helpInactive.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#9B9C9C" fill-rule="evenodd" transform="translate(5 2)">
+    <path d="M3,0 C0,0 0,2.914678 0,3 C0.666666667,3 1,3 1,3 C1,3 1,1 3,1 C4.1569301,1 5,1.74285714 5,3 C5,5.28571429 2,4.0625 2,8 L3,8 C3,4.625 6,6 6,3 C6,1.58081633 5,0 3,0 Z"/>
+    <rect width="1" height="1" x="2" y="10"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/helpInactive_dark.svg b/platform/icons/src/windows/helpInactive_dark.svg
new file mode 100644
index 000000000000..080af6454c9b
--- /dev/null
+++ b/platform/icons/src/windows/helpInactive_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#8C8C8C" fill-rule="evenodd" transform="translate(5 2)">
+    <path d="M3,0 C0,0 0,2.914678 0,3 C0.666666667,3 1,3 1,3 C1,3 1,1 3,1 C4.1569301,1 5,1.74285714 5,3 C5,5.28571429 2,4.0625 2,8 L3,8 C3,4.625 6,6 6,3 C6,1.58081633 5,0 3,0 Z"/>
+    <rect width="1" height="1" x="2" y="10"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/help_dark.svg b/platform/icons/src/windows/help_dark.svg
new file mode 100644
index 000000000000..90c052b0dc10
--- /dev/null
+++ b/platform/icons/src/windows/help_dark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#A9A9A9" fill-rule="evenodd" transform="translate(5 2)">
+    <path d="M3,0 C0,0 0,2.914678 0,3 C0.666666667,3 1,3 1,3 C1,3 1,1 3,1 C4.1569301,1 5,1.74285714 5,3 C5,5.28571429 2,4.0625 2,8 L3,8 C3,4.625 6,6 6,3 C6,1.58081633 5,0 3,0 Z"/>
+    <rect width="1" height="1" x="2" y="10"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/maximize.png b/platform/icons/src/windows/maximize.png
deleted file mode 100644
index 6d84f4fd4b6d..000000000000
Binary files a/platform/icons/src/windows/maximize.png and /dev/null differ
diff --git a/platform/icons/src/windows/maximize.svg b/platform/icons/src/windows/maximize.svg
new file mode 100644
index 000000000000..1652ce5cbf7d
--- /dev/null
+++ b/platform/icons/src/windows/maximize.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#050708" fill-rule="evenodd" d="M3,3 L13,3 L13,13 L3,13 L3,3 Z M4,4 L4,12 L12,12 L12,4 L4,4 Z"/>
+</svg>
diff --git a/platform/icons/src/windows/maximize@2x.png b/platform/icons/src/windows/maximize@2x.png
deleted file mode 100644
index a9dc5c1eaeb3..000000000000
Binary files a/platform/icons/src/windows/maximize@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/maximize@2x_dark.png b/platform/icons/src/windows/maximize@2x_dark.png
deleted file mode 100644
index c12370c18563..000000000000
Binary files a/platform/icons/src/windows/maximize@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/maximizeInactive.png b/platform/icons/src/windows/maximizeInactive.png
deleted file mode 100644
index 688e4e3fc0b6..000000000000
Binary files a/platform/icons/src/windows/maximizeInactive.png and /dev/null differ
diff --git a/platform/icons/src/windows/maximizeInactive.svg b/platform/icons/src/windows/maximizeInactive.svg
new file mode 100644
index 000000000000..2f9bbf71015c
--- /dev/null
+++ b/platform/icons/src/windows/maximizeInactive.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#9B9C9C" fill-rule="evenodd" d="M3,3 L13,3 L13,13 L3,13 L3,3 Z M4,4 L4,12 L12,12 L12,4 L4,4 Z"/>
+</svg>
diff --git a/platform/icons/src/windows/maximizeInactive@2x.png b/platform/icons/src/windows/maximizeInactive@2x.png
deleted file mode 100644
index 1b8ba51e0556..000000000000
Binary files a/platform/icons/src/windows/maximizeInactive@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/maximizeInactive@2x_dark.png b/platform/icons/src/windows/maximizeInactive@2x_dark.png
deleted file mode 100644
index a335b14ef756..000000000000
Binary files a/platform/icons/src/windows/maximizeInactive@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/maximizeInactive_dark.png b/platform/icons/src/windows/maximizeInactive_dark.png
deleted file mode 100644
index 23d7af2614e5..000000000000
Binary files a/platform/icons/src/windows/maximizeInactive_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/maximizeInactive_dark.svg b/platform/icons/src/windows/maximizeInactive_dark.svg
new file mode 100644
index 000000000000..ac4d37f75f5f
--- /dev/null
+++ b/platform/icons/src/windows/maximizeInactive_dark.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#8C8C8C" fill-rule="evenodd" d="M3,3 L13,3 L13,13 L3,13 L3,3 Z M4,4 L4,12 L12,12 L12,4 L4,4 Z"/>
+</svg>
diff --git a/platform/icons/src/windows/maximizeSmall.svg b/platform/icons/src/windows/maximizeSmall.svg
new file mode 100644
index 000000000000..2f69f38ffa4d
--- /dev/null
+++ b/platform/icons/src/windows/maximizeSmall.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#6E6E6E" fill-rule="evenodd" d="M4,4 L12,4 L12,12 L4,12 L4,4 Z M5,5 L5,11 L11,11 L11,5 L5,5 Z"/>
+</svg>
diff --git a/platform/icons/src/windows/maximizeSmall_dark.svg b/platform/icons/src/windows/maximizeSmall_dark.svg
new file mode 100644
index 000000000000..32ec4ed3ee69
--- /dev/null
+++ b/platform/icons/src/windows/maximizeSmall_dark.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#AFB1B3" fill-rule="evenodd" d="M4,4 L12,4 L12,12 L4,12 L4,4 Z M5,5 L5,11 L11,11 L11,5 L5,5 Z"/>
+</svg>
diff --git a/platform/icons/src/windows/maximize_dark.png b/platform/icons/src/windows/maximize_dark.png
deleted file mode 100644
index ff9b20695970..000000000000
Binary files a/platform/icons/src/windows/maximize_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/maximize_dark.svg b/platform/icons/src/windows/maximize_dark.svg
new file mode 100644
index 000000000000..1a95c67cb926
--- /dev/null
+++ b/platform/icons/src/windows/maximize_dark.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#A9A9A9" fill-rule="evenodd" d="M3,3 L13,3 L13,13 L3,13 L3,3 Z M4,4 L4,12 L12,12 L12,4 L4,4 Z"/>
+</svg>
diff --git a/platform/icons/src/windows/minimize.png b/platform/icons/src/windows/minimize.png
deleted file mode 100644
index f21aafd5314b..000000000000
Binary files a/platform/icons/src/windows/minimize.png and /dev/null differ
diff --git a/platform/icons/src/windows/minimize.svg b/platform/icons/src/windows/minimize.svg
new file mode 100644
index 000000000000..2c92b8acb1b4
--- /dev/null
+++ b/platform/icons/src/windows/minimize.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect width="10" height="1" x="3" y="8" fill="#050708" fill-rule="evenodd"/>
+</svg>
diff --git a/platform/icons/src/windows/minimize@2x.png b/platform/icons/src/windows/minimize@2x.png
deleted file mode 100644
index fa32e78f8176..000000000000
Binary files a/platform/icons/src/windows/minimize@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/minimize@2x_dark.png b/platform/icons/src/windows/minimize@2x_dark.png
deleted file mode 100644
index f463d2d83d41..000000000000
Binary files a/platform/icons/src/windows/minimize@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/minimizeInactive.png b/platform/icons/src/windows/minimizeInactive.png
deleted file mode 100644
index 49be621e23a8..000000000000
Binary files a/platform/icons/src/windows/minimizeInactive.png and /dev/null differ
diff --git a/platform/icons/src/windows/minimizeInactive.svg b/platform/icons/src/windows/minimizeInactive.svg
new file mode 100644
index 000000000000..a99ff193bbf4
--- /dev/null
+++ b/platform/icons/src/windows/minimizeInactive.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect width="10" height="1" x="3" y="8" fill="#9B9C9C" fill-rule="evenodd"/>
+</svg>
diff --git a/platform/icons/src/windows/minimizeInactive@2x.png b/platform/icons/src/windows/minimizeInactive@2x.png
deleted file mode 100644
index afe98f8b3a40..000000000000
Binary files a/platform/icons/src/windows/minimizeInactive@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/minimizeInactive@2x_dark.png b/platform/icons/src/windows/minimizeInactive@2x_dark.png
deleted file mode 100644
index a4fd6cebfdd0..000000000000
Binary files a/platform/icons/src/windows/minimizeInactive@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/minimizeInactive_dark.png b/platform/icons/src/windows/minimizeInactive_dark.png
deleted file mode 100644
index c5ff31352b07..000000000000
Binary files a/platform/icons/src/windows/minimizeInactive_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/minimizeInactive_dark.svg b/platform/icons/src/windows/minimizeInactive_dark.svg
new file mode 100644
index 000000000000..7152a85f1f68
--- /dev/null
+++ b/platform/icons/src/windows/minimizeInactive_dark.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect width="10" height="1" x="3" y="8" fill="#8C8C8C" fill-rule="evenodd"/>
+</svg>
diff --git a/platform/icons/src/windows/minimizeSmall.svg b/platform/icons/src/windows/minimizeSmall.svg
new file mode 100644
index 000000000000..d32f86217494
--- /dev/null
+++ b/platform/icons/src/windows/minimizeSmall.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect width="8" height="1" x="4" y="12" fill="#6E6E6E" fill-rule="evenodd"/>
+</svg>
diff --git a/platform/icons/src/windows/minimizeSmall_dark.svg b/platform/icons/src/windows/minimizeSmall_dark.svg
new file mode 100644
index 000000000000..415ac1effc8a
--- /dev/null
+++ b/platform/icons/src/windows/minimizeSmall_dark.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect width="8" height="1" x="4" y="12" fill="#AFB1B3" fill-rule="evenodd"/>
+</svg>
diff --git a/platform/icons/src/windows/minimize_dark.png b/platform/icons/src/windows/minimize_dark.png
deleted file mode 100644
index 01275e1af39b..000000000000
Binary files a/platform/icons/src/windows/minimize_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/minimize_dark.svg b/platform/icons/src/windows/minimize_dark.svg
new file mode 100644
index 000000000000..363bf2ec63fe
--- /dev/null
+++ b/platform/icons/src/windows/minimize_dark.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect width="10" height="1" x="3" y="8" fill="#A9A9A9" fill-rule="evenodd"/>
+</svg>
diff --git a/platform/icons/src/windows/restore.png b/platform/icons/src/windows/restore.png
deleted file mode 100644
index 9dcafef6a1a7..000000000000
Binary files a/platform/icons/src/windows/restore.png and /dev/null differ
diff --git a/platform/icons/src/windows/restore.svg b/platform/icons/src/windows/restore.svg
new file mode 100644
index 000000000000..174249e0de3b
--- /dev/null
+++ b/platform/icons/src/windows/restore.svg
@@ -0,0 +1,6 @@
+<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="#050708" d="M5,8 L5,7 L7,7 L7,1 L1,1 L1,3 L0,3 L0,0 L8,0 L8,8 L5,8 Z" transform="translate(5 3)"/>
+    <path fill="#050708" d="M0,0 L8,0 L8,8 L0,8 L0,0 Z M1,1 L1,7 L7,7 L7,1 L1,1 Z" transform="translate(3 5)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/restore@2x.png b/platform/icons/src/windows/restore@2x.png
deleted file mode 100644
index 2d1fc2b55664..000000000000
Binary files a/platform/icons/src/windows/restore@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/restore@2x_dark.png b/platform/icons/src/windows/restore@2x_dark.png
deleted file mode 100644
index 0fa65cd5b7c1..000000000000
Binary files a/platform/icons/src/windows/restore@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/restoreInactive.png b/platform/icons/src/windows/restoreInactive.png
deleted file mode 100644
index 6e25f284583d..000000000000
Binary files a/platform/icons/src/windows/restoreInactive.png and /dev/null differ
diff --git a/platform/icons/src/windows/restoreInactive.svg b/platform/icons/src/windows/restoreInactive.svg
new file mode 100644
index 000000000000..42d93305735e
--- /dev/null
+++ b/platform/icons/src/windows/restoreInactive.svg
@@ -0,0 +1,6 @@
+<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="#9B9C9C" d="M5,8 L5,7 L7,7 L7,1 L1,1 L1,3 L0,3 L0,0 L8,0 L8,8 L5,8 Z" transform="translate(5 3)"/>
+    <path fill="#9B9C9C" d="M0,0 L8,0 L8,8 L0,8 L0,0 Z M1,1 L1,7 L7,7 L7,1 L1,1 Z" transform="translate(3 5)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/restoreInactive@2x.png b/platform/icons/src/windows/restoreInactive@2x.png
deleted file mode 100644
index 2faaa2b60268..000000000000
Binary files a/platform/icons/src/windows/restoreInactive@2x.png and /dev/null differ
diff --git a/platform/icons/src/windows/restoreInactive@2x_dark.png b/platform/icons/src/windows/restoreInactive@2x_dark.png
deleted file mode 100644
index 056a3a5aebc8..000000000000
Binary files a/platform/icons/src/windows/restoreInactive@2x_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/restoreInactive_dark.png b/platform/icons/src/windows/restoreInactive_dark.png
deleted file mode 100644
index 718897b7bdea..000000000000
Binary files a/platform/icons/src/windows/restoreInactive_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/restoreInactive_dark.svg b/platform/icons/src/windows/restoreInactive_dark.svg
new file mode 100644
index 000000000000..386faf0efe13
--- /dev/null
+++ b/platform/icons/src/windows/restoreInactive_dark.svg
@@ -0,0 +1,6 @@
+<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="#8C8C8C" d="M5,8 L5,7 L7,7 L7,1 L1,1 L1,3 L0,3 L0,0 L8,0 L8,8 L5,8 Z" transform="translate(5 3)"/>
+    <path fill="#8C8C8C" d="M0,0 L8,0 L8,8 L0,8 L0,0 Z M1,1 L1,7 L7,7 L7,1 L1,1 Z" transform="translate(3 5)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/restoreSmall.svg b/platform/icons/src/windows/restoreSmall.svg
new file mode 100644
index 000000000000..c7f477ea2411
--- /dev/null
+++ b/platform/icons/src/windows/restoreSmall.svg
@@ -0,0 +1,6 @@
+<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="#6E6E6E" d="M4,6 L4,5 L5,5 L5,1 L1,1 L1,2 L0,2 L0,0 L6,0 L6,6 L4,6 Z" transform="translate(6 4)"/>
+    <path fill="#6E6E6E" d="M0,0 L6,0 L6,6 L0,6 L0,0 Z M1,1 L1,5 L5,5 L5,1 L1,1 Z" transform="translate(4 6)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/restoreSmall_dark.svg b/platform/icons/src/windows/restoreSmall_dark.svg
new file mode 100644
index 000000000000..6bc12fd1d500
--- /dev/null
+++ b/platform/icons/src/windows/restoreSmall_dark.svg
@@ -0,0 +1,6 @@
+<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="#AFB1B3" d="M4,6 L4,5 L5,5 L5,1 L1,1 L1,2 L0,2 L0,0 L6,0 L6,6 L4,6 Z" transform="translate(6 4)"/>
+    <path fill="#AFB1B3" d="M0,0 L6,0 L6,6 L0,6 L0,0 Z M1,1 L1,5 L5,5 L5,1 L1,1 Z" transform="translate(4 6)"/>
+  </g>
+</svg>
diff --git a/platform/icons/src/windows/restore_dark.png b/platform/icons/src/windows/restore_dark.png
deleted file mode 100644
index ae6ffc89101b..000000000000
Binary files a/platform/icons/src/windows/restore_dark.png and /dev/null differ
diff --git a/platform/icons/src/windows/restore_dark.svg b/platform/icons/src/windows/restore_dark.svg
new file mode 100644
index 000000000000..ec13266cbcd0
--- /dev/null
+++ b/platform/icons/src/windows/restore_dark.svg
@@ -0,0 +1,6 @@
+<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="#A9A9A9" d="M5,8 L5,7 L7,7 L7,1 L1,1 L1,3 L0,3 L0,0 L8,0 L8,8 L5,8 Z" transform="translate(5 3)"/>
+    <path fill="#A9A9A9" d="M0,0 L8,0 L8,8 L0,8 L0,0 Z M1,1 L1,7 L7,7 L7,1 L1,1 Z" transform="translate(3 5)"/>
+  </g>
+</svg>
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 764b5a74fe09..a216c738a7b7 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -1927,16 +1927,23 @@ public class AllIcons {
   }
 
   public static class Windows {
-    public static final Icon CloseActive = IconLoader.getIcon("/windows/closeActive.png"); // 16x16
-    public static final Icon CloseHover = IconLoader.getIcon("/windows/closeHover.png"); // 16x16
-    public static final Icon CloseInactive = IconLoader.getIcon("/windows/closeInactive.png"); // 16x16
-    public static final Icon HelpButton = IconLoader.getIcon("/windows/helpButton.png"); // 16x16
-    public static final Icon Maximize = IconLoader.getIcon("/windows/maximize.png"); // 16x16
-    public static final Icon MaximizeInactive = IconLoader.getIcon("/windows/maximizeInactive.png"); // 16x16
-    public static final Icon Minimize = IconLoader.getIcon("/windows/minimize.png"); // 16x16
-    public static final Icon MinimizeInactive = IconLoader.getIcon("/windows/minimizeInactive.png"); // 16x16
-    public static final Icon Restore = IconLoader.getIcon("/windows/restore.png"); // 16x16
-    public static final Icon RestoreInactive = IconLoader.getIcon("/windows/restoreInactive.png"); // 16x16
+    public static final Icon CloseActive = IconLoader.getIcon("/windows/closeActive.svg"); // 16x16
+    public static final Icon CloseHover = IconLoader.getIcon("/windows/closeHover.svg"); // 16x16
+    public static final Icon CloseInactive = IconLoader.getIcon("/windows/closeInactive.svg"); // 16x16
+    public static final Icon CloseSmall = IconLoader.getIcon("/windows/closeSmall.svg"); // 16x16
+    public static final Icon Help = IconLoader.getIcon("/windows/help.svg"); // 16x16
+    public static final Icon HelpButton = IconLoader.getIcon("/windows/helpButton.svg"); // 16x16
+    public static final Icon HelpButtonInactive = IconLoader.getIcon("/windows/helpButtonInactive.svg"); // 16x16
+    public static final Icon HelpInactive = IconLoader.getIcon("/windows/helpInactive.svg"); // 16x16
+    public static final Icon Maximize = IconLoader.getIcon("/windows/maximize.svg"); // 16x16
+    public static final Icon MaximizeInactive = IconLoader.getIcon("/windows/maximizeInactive.svg"); // 16x16
+    public static final Icon MaximizeSmall = IconLoader.getIcon("/windows/maximizeSmall.svg"); // 16x16
+    public static final Icon Minimize = IconLoader.getIcon("/windows/minimize.svg"); // 16x16
+    public static final Icon MinimizeInactive = IconLoader.getIcon("/windows/minimizeInactive.svg"); // 16x16
+    public static final Icon MinimizeSmall = IconLoader.getIcon("/windows/minimizeSmall.svg"); // 16x16
+    public static final Icon Restore = IconLoader.getIcon("/windows/restore.svg"); // 16x16
+    public static final Icon RestoreInactive = IconLoader.getIcon("/windows/restoreInactive.svg"); // 16x16
+    public static final Icon RestoreSmall = IconLoader.getIcon("/windows/restoreSmall.svg"); // 16x16
 
     public static class Shadow {
       public static final Icon Bottom = IconLoader.getIcon("/windows/shadow/bottom.png"); // 1x13