diff --git a/intellij-plugin/src/main/resources/ApolloIconsMapping.json b/intellij-plugin/src/main/resources/ApolloIconsMapping.json
new file mode 100644
index 00000000000..36f8ecf845a
--- /dev/null
+++ b/intellij-plugin/src/main/resources/ApolloIconsMapping.json
@@ -0,0 +1,7 @@
+{
+  "icons": {
+    "newui": {
+      "toolwindow-normalized-cache-viewer.svg": "icons/toolwindow-normalized-cache-viewer.svg"
+    }
+  }
+}
diff --git a/intellij-plugin/src/main/resources/META-INF/plugin.xml b/intellij-plugin/src/main/resources/META-INF/plugin.xml
index 81becd40349..9e7ebe8c5f1 100644
--- a/intellij-plugin/src/main/resources/META-INF/plugin.xml
+++ b/intellij-plugin/src/main/resources/META-INF/plugin.xml
@@ -63,6 +63,10 @@
     <!-- icon per element type -->
     <iconProvider implementation="com.apollographql.ijplugin.icons.GraphQLIconProvider" order="first" />
 
+    <!-- Support for the "New UI" -->
+    <!-- See https://plugins.jetbrains.com/docs/intellij/icons.html#new-ui-icons -->
+    <iconMapper mappingFile="ApolloIconsMapping.json" />
+
     <!-- Fields insights inspection ("expensive field") -->
     <!--suppress PluginXmlCapitalization -->
     <localInspection
diff --git a/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer.svg b/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer.svg
new file mode 100644
index 00000000000..f46ad77bb7a
--- /dev/null
+++ b/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    width="16"
+    height="16"
+    viewBox="-.03 -.03 1.2888 1.2888"
+    preserveAspectRatio="xMidYMid"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+      d="m 0.7690896,0.85689453 h 0.132624 L 0.69,0.3074364 H 0.5433648 L 0.3316512,0.85689453 H 0.4642848 L 0.4988832,0.7638222 h 0.20004 L 0.662712,0.66083298 H 0.531 L 0.61668,0.42441285 Z M 1.2064272,0.45008816 a 0.0318768,0.03187693 0 0 0 -0.039288,-0.0222097 0.0319104,0.03191053 0 0 0 -0.022215,0.0392786 0.5503008,0.55030296 0 0 1 0.020055,0.14724538 c 0,0.30359159 -0.2469888,0.55057166 -0.5505792,0.55057166 -0.3035904,0 -0.5505744,-0.24698007 -0.5505744,-0.55057166 0,-0.3035964 0.246984,-0.55058136 0.5505744,-0.55058136 0.1286064,0 0.2530464,0.04568658 0.3512592,0.1269893 a 0.0765024,0.0765027 0 0 0 -0.00594,0.0296305 c 0,0.0424082 0.0343773,0.0767859 0.0767856,0.0767859 0.042408,0 0.076786,-0.0343777 0.076786,-0.0767859 0,-0.0424082 -0.034377,-0.0767859 -0.076786,-0.0767859 -0.00816,0 -0.016023,0.001301 -0.023405,0.003663 C 0.9025056,0.05306901 0.7608624,0 0.6144,0 0.2756208,0 0,0.27561707 0,0.6144024 0,0.95318293 0.2756208,1.2288 0.6144,1.2288 c 0.3387792,0 0.6144,-0.27561707 0.6144,-0.6143976 A 0.61416,0.6141624 0 0 0 1.2064272,0.45008816 Z"
+      fill="#6C707E" stroke-width=".04" stroke="#6C707E"
+  />
+</svg>
diff --git a/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer@20x20.svg b/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer@20x20.svg
new file mode 100644
index 00000000000..f5e5ef5df44
--- /dev/null
+++ b/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer@20x20.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    width="20"
+    height="20"
+    viewBox="-.03 -.03 1.2888 1.2888"
+    preserveAspectRatio="xMidYMid"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+      d="m 0.7690896,0.85689453 h 0.132624 L 0.69,0.3074364 H 0.5433648 L 0.3316512,0.85689453 H 0.4642848 L 0.4988832,0.7638222 h 0.20004 L 0.662712,0.66083298 H 0.531 L 0.61668,0.42441285 Z M 1.2064272,0.45008816 a 0.0318768,0.03187693 0 0 0 -0.039288,-0.0222097 0.0319104,0.03191053 0 0 0 -0.022215,0.0392786 0.5503008,0.55030296 0 0 1 0.020055,0.14724538 c 0,0.30359159 -0.2469888,0.55057166 -0.5505792,0.55057166 -0.3035904,0 -0.5505744,-0.24698007 -0.5505744,-0.55057166 0,-0.3035964 0.246984,-0.55058136 0.5505744,-0.55058136 0.1286064,0 0.2530464,0.04568658 0.3512592,0.1269893 a 0.0765024,0.0765027 0 0 0 -0.00594,0.0296305 c 0,0.0424082 0.0343773,0.0767859 0.0767856,0.0767859 0.042408,0 0.076786,-0.0343777 0.076786,-0.0767859 0,-0.0424082 -0.034377,-0.0767859 -0.076786,-0.0767859 -0.00816,0 -0.016023,0.001301 -0.023405,0.003663 C 0.9025056,0.05306901 0.7608624,0 0.6144,0 0.2756208,0 0,0.27561707 0,0.6144024 0,0.95318293 0.2756208,1.2288 0.6144,1.2288 c 0.3387792,0 0.6144,-0.27561707 0.6144,-0.6143976 A 0.61416,0.6141624 0 0 0 1.2064272,0.45008816 Z"
+      fill="#6C707E" stroke-width=".04" stroke="#6C707E"
+  />
+</svg>
diff --git a/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer@20x20_dark.svg b/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer@20x20_dark.svg
new file mode 100644
index 00000000000..a2fb56e560e
--- /dev/null
+++ b/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer@20x20_dark.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    width="20"
+    height="20"
+    viewBox="-.03 -.03 1.2888 1.2888"
+    preserveAspectRatio="xMidYMid"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+      d="m 0.7690896,0.85689453 h 0.132624 L 0.69,0.3074364 H 0.5433648 L 0.3316512,0.85689453 H 0.4642848 L 0.4988832,0.7638222 h 0.20004 L 0.662712,0.66083298 H 0.531 L 0.61668,0.42441285 Z M 1.2064272,0.45008816 a 0.0318768,0.03187693 0 0 0 -0.039288,-0.0222097 0.0319104,0.03191053 0 0 0 -0.022215,0.0392786 0.5503008,0.55030296 0 0 1 0.020055,0.14724538 c 0,0.30359159 -0.2469888,0.55057166 -0.5505792,0.55057166 -0.3035904,0 -0.5505744,-0.24698007 -0.5505744,-0.55057166 0,-0.3035964 0.246984,-0.55058136 0.5505744,-0.55058136 0.1286064,0 0.2530464,0.04568658 0.3512592,0.1269893 a 0.0765024,0.0765027 0 0 0 -0.00594,0.0296305 c 0,0.0424082 0.0343773,0.0767859 0.0767856,0.0767859 0.042408,0 0.076786,-0.0343777 0.076786,-0.0767859 0,-0.0424082 -0.034377,-0.0767859 -0.076786,-0.0767859 -0.00816,0 -0.016023,0.001301 -0.023405,0.003663 C 0.9025056,0.05306901 0.7608624,0 0.6144,0 0.2756208,0 0,0.27561707 0,0.6144024 0,0.95318293 0.2756208,1.2288 0.6144,1.2288 c 0.3387792,0 0.6144,-0.27561707 0.6144,-0.6143976 A 0.61416,0.6141624 0 0 0 1.2064272,0.45008816 Z"
+      fill="#CED0D6" stroke-width=".04" stroke="#CED0D6"
+  />
+</svg>
diff --git a/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer_dark.svg b/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer_dark.svg
new file mode 100644
index 00000000000..acca68e44a3
--- /dev/null
+++ b/intellij-plugin/src/main/resources/icons/newui/toolwindow-normalized-cache-viewer_dark.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    width="16"
+    height="16"
+    viewBox="-.03 -.03 1.2888 1.2888"
+    preserveAspectRatio="xMidYMid"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+      d="m 0.7690896,0.85689453 h 0.132624 L 0.69,0.3074364 H 0.5433648 L 0.3316512,0.85689453 H 0.4642848 L 0.4988832,0.7638222 h 0.20004 L 0.662712,0.66083298 H 0.531 L 0.61668,0.42441285 Z M 1.2064272,0.45008816 a 0.0318768,0.03187693 0 0 0 -0.039288,-0.0222097 0.0319104,0.03191053 0 0 0 -0.022215,0.0392786 0.5503008,0.55030296 0 0 1 0.020055,0.14724538 c 0,0.30359159 -0.2469888,0.55057166 -0.5505792,0.55057166 -0.3035904,0 -0.5505744,-0.24698007 -0.5505744,-0.55057166 0,-0.3035964 0.246984,-0.55058136 0.5505744,-0.55058136 0.1286064,0 0.2530464,0.04568658 0.3512592,0.1269893 a 0.0765024,0.0765027 0 0 0 -0.00594,0.0296305 c 0,0.0424082 0.0343773,0.0767859 0.0767856,0.0767859 0.042408,0 0.076786,-0.0343777 0.076786,-0.0767859 0,-0.0424082 -0.034377,-0.0767859 -0.076786,-0.0767859 -0.00816,0 -0.016023,0.001301 -0.023405,0.003663 C 0.9025056,0.05306901 0.7608624,0 0.6144,0 0.2756208,0 0,0.27561707 0,0.6144024 0,0.95318293 0.2756208,1.2288 0.6144,1.2288 c 0.3387792,0 0.6144,-0.27561707 0.6144,-0.6143976 A 0.61416,0.6141624 0 0 0 1.2064272,0.45008816 Z"
+      fill="#CED0D6" stroke-width=".04" stroke="#CED0D6"
+  />
+</svg>