diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js
index a14bb31105..0cfeacc1ea 100644
--- a/src-docs/src/views/icon/icons.js
+++ b/src-docs/src/views/icon/icons.js
@@ -179,10 +179,12 @@ export const iconTypes = [
   'plus',
   'plusInCircle',
   'plusInCircleFilled',
+  'polygon',
   'popout',
   'push',
   'questionInCircle',
   'quote',
+  'radius',
   'refresh',
   'reporter',
   'returnKey',
@@ -239,6 +241,8 @@ export const iconTypes = [
   'visBarHorizontalStacked',
   'visBarVertical',
   'visBarVerticalStacked',
+  'visBuilder',
+  'visBuilderSavedObject',
   'visGauge',
   'visGoal',
   'visLine',
@@ -246,6 +250,10 @@ export const iconTypes = [
   'visMapRegion',
   'visMetric',
   'visPie',
+  'visQueryDQL',
+  'visQueryPPL',
+  'visQueryPromQL',
+  'visQuerySQL',
   'visTable',
   'visTagCloud',
   'visText',
diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap
index 2e223a33ab..cbe5a4fb20 100644
--- a/src/components/icon/__snapshots__/icon.test.tsx.snap
+++ b/src/components/icon/__snapshots__/icon.test.tsx.snap
@@ -7052,6 +7052,23 @@ exports[`OuiIcon props type plusInCircleFilled is rendered 1`] = `
 </svg>
 `;
 
+exports[`OuiIcon props type polygon is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
+  focusable="false"
+  height="16"
+  role="img"
+  viewBox="0 0 16 16"
+  width="16"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M1 5V1h4v1.3h6V1h4v4h-2.934l-.808 1H12v4h-.76l.8 1H15v4h-4v-1.5H5V15H1v-4h1.5V5H1zm1-3h2v2H2V2zm9 10.5v-1.2L9.96 10H8V6h1.973L11 4.728V3.3H5V5H3.5v6H5v1.5h6zM12 2h2v2h-2V2zM4 12H2v2h2v-2zm5-5h2v2H9V7zm3 5h2v2h-2v-2z"
+  />
+</svg>
+`;
+
 exports[`OuiIcon props type popout is rendered 1`] = `
 <svg
   aria-hidden="true"
@@ -7123,6 +7140,25 @@ exports[`OuiIcon props type quote is rendered 1`] = `
 </svg>
 `;
 
+exports[`OuiIcon props type radius is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
+  focusable="false"
+  height="16"
+  role="img"
+  viewBox="0 0 16 16"
+  width="16"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    clip-rule="evenodd"
+    d="M3.05 12.95a7 7 0 109.9-9.9 7 7 0 00-9.9 9.9zm.707-.707a6 6 0 008.825-8.118L10 6.707V10H6V6h3.293l2.582-2.582a6 6 0 00-8.118 8.825zM9 7v2H7V7h2z"
+    fill-rule="evenodd"
+  />
+</svg>
+`;
+
 exports[`OuiIcon props type recentlyViewedApp is rendered 1`] = `
 <svg
   aria-hidden="true"
@@ -9375,6 +9411,55 @@ exports[`OuiIcon props type visBarVerticalStacked is rendered 1`] = `
 </svg>
 `;
 
+exports[`OuiIcon props type visBuilder is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
+  focusable="false"
+  height="33"
+  role="img"
+  viewBox="0 0 32 33"
+  width="32"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    clip-rule="evenodd"
+    d="M9 15H5v-1h4v1zM17 8h-4V7h4v1zM20 15h-9v-1h9v1zM28 8h-9V7h9v1z"
+    fill-rule="evenodd"
+  />
+  <path
+    clip-rule="evenodd"
+    d="M10 9V3a1 1 0 011-1h18a1 1 0 011 1v9a1 1 0 01-1 1h-7v4h-1v-7H3v9h9v1H3a1 1 0 01-1-1v-9a1 1 0 011-1h7zm1-6h18v9h-7v-2a1 1 0 00-1-1H11V3z"
+    fill-rule="evenodd"
+  />
+  <path
+    clip-rule="evenodd"
+    d="M19.714 26.286L20.571 28h.858v-.888c0-.34.296-.976.602-1.54.14-.259.281-.502.398-.696.154-.257.264-.427.264-.427.246-.408.45-1.117.45-1.588v-4.046c0-.796-.605-1.445-1.364-1.48a.728.728 0 00-.78.74v.295a1.518 1.518 0 00-.698-1.282 1.461 1.461 0 00-.73-.23.778.778 0 00-.714.772v.296a1.481 1.481 0 00-.704-1.277 1.383 1.383 0 00-.724-.205.728.728 0 00-.715.741v.296a1.482 1.482 0 00-.702-1.276 1.383 1.383 0 00-.726-.205.728.728 0 00-.715.74v4.149h-.857v-2.667a1.668 1.668 0 00-1 .334c-.432.323-.714.85-.714 1.444v3.089c0 .478.307 1.084.686 1.365 0 0 2.743 1.956 2.743 2.658V28h3.428l.857-1.714zm-.857-5.143v3.428h.857v-3.428h-.857zm-.857 0h-.857v3.428H18v-3.428zm2.572 0v3.428h.857v-3.428h-.857zm-8.467 4.126l-.008-.006-.008-.006a2.74 2.74 0 01-.781-.962A2.743 2.743 0 0111 23.089V20c0-1.453 1.109-2.698 2.571-2.774v-.485c0-.927.734-1.741 1.715-1.741.59 0 1.12.21 1.533.556.188-.072.393-.112.61-.112.584 0 1.11.207 1.522.547.17-.07.351-.115.54-.13l.06-.006.06.003c.572.023 1.091.24 1.498.585.187-.07.39-.11.605-.11 1.376 0 2.429 1.146 2.429 2.482v4.046c0 .358-.074.75-.17 1.091-.098.343-.241.712-.425 1.015l-.007.012m-.008.012l-.002.003-.01.015-.036.058a17.848 17.848 0 00-.547.93c-.15.274-.29.552-.39.79-.076.18-.104.282-.114.32-.005.02-.005.02-.005.005V29h-2.476l-.239-.478-.239.478H14.43v-1.724a2.434 2.434 0 00-.168-.202 9.35 9.35 0 00-.847-.789 22.704 22.704 0 00-1.283-.997l-.02-.015-.006-.004m2.372 2.082l-.008-.014.008.014z"
+    fill-rule="evenodd"
+  />
+</svg>
+`;
+
+exports[`OuiIcon props type visBuilderSavedObject is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
+  focusable="false"
+  height="16"
+  role="img"
+  viewBox="0 0 16 16"
+  width="16"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M10.5 2c0 .022 0 .043-.002.064l1.559 1.04a1 1 0 11-.555.832l-1.559-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.559-1.04a1 1 0 11.555-.832l1.559 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z"
+  />
+  <path
+    d="M8.5 13a.5.5 0 01-1 0V8.5h-2V13a.5.5 0 01-1 0V7.5h-2V13a.5.5 0 01-1 0V7.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7v.3h2V6.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7V7h2.3a.7.7 0 01.7.7V13a.5.5 0 01-1 0V8h-2v5a.5.5 0 01-1 0V6.5h-2V13zM.5 14.5A.5.5 0 011 14h14a.5.5 0 010 1H1a.5.5 0 01-.5-.5z"
+  />
+</svg>
+`;
+
 exports[`OuiIcon props type visGauge is rendered 1`] = `
 <svg
   aria-hidden="true"
@@ -9494,6 +9579,106 @@ exports[`OuiIcon props type visPie is rendered 1`] = `
 </svg>
 `;
 
+exports[`OuiIcon props type visQueryDQL is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
+  focusable="false"
+  height="16"
+  role="img"
+  viewBox="0 0 16 16"
+  width="16"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M10.5 2c0 .022 0 .043-.002.064l1.559 1.04a1 1 0 11-.555.832l-1.559-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.559-1.04a1 1 0 11.555-.832l1.559 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z"
+  />
+  <path
+    d="M8.5 6.5h2v8a.5.5 0 001 0V8h2v6.5a.5.5 0 001 0V7.7a.7.7 0 00-.7-.7h-2.3v-.8a.7.7 0 00-.7-.7H8.2a.7.7 0 00-.7.7v1.3h-2v-.3a.7.7 0 00-.7-.7H2.2a.7.7 0 00-.7.7V9a.5.5 0 001 0V7.5h2V9a.5.5 0 001 0v-.5h2V9a.5.5 0 001 0V6.5z"
+  />
+  <path
+    clip-rule="evenodd"
+    d="M1.6 10a.6.6 0 00-.6.6v3.86a.6.6 0 00.6.6h7.476a.6.6 0 00.6-.6V10.6a.6.6 0 00-.6-.6H1.6zm5.545 3.398v-2.675h.579v2.675c0 .16.13.29.289.29h1.229v.578h-1.23a.868.868 0 01-.867-.868zm-.867.336v-2.071a.868.868 0 00-.868-.868h-.289a.868.868 0 00-.868.868v1.735c0 .48.389.868.868.868h.868c.093 0 .215.051.336.132a1.43 1.43 0 01.173.136l.008.008h.001l.205-.204.204-.205h-.001l-.002-.002-.005-.005-.015-.015a2.046 2.046 0 00-.247-.195 1.486 1.486 0 00-.368-.182zm-1.157-2.36a.29.29 0 00-.29.289v1.735c0 .16.13.29.29.29h.578v-2.025a.29.29 0 00-.289-.29h-.289zm-3.398 2.892v-3.47h1.012c.56 0 1.012.453 1.012 1.011v1.446c0 .56-.453 1.013-1.012 1.013H1.723zm.578-2.892v2.313h.434c.24 0 .434-.194.434-.434v-1.446a.434.434 0 00-.434-.433h-.434z"
+    fill-rule="evenodd"
+  />
+</svg>
+`;
+
+exports[`OuiIcon props type visQueryPPL is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
+  focusable="false"
+  height="16"
+  role="img"
+  viewBox="0 0 16 16"
+  width="16"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M10.5 2a.98.98 0 01-.002.064l1.559 1.04a1 1 0 11-.554.832l-1.56-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.558-1.04a1 1 0 11.555-.832l1.558 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z"
+  />
+  <path
+    d="M8.5 9a.5.5 0 01-1 0v-.5h-2V9a.5.5 0 01-1 0V7.5h-2V9a.5.5 0 01-1 0V7.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7v.3h2V6.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7V7h2.3a.7.7 0 01.7.7v6.8a.5.5 0 01-1 0V8h-2v6.5a.5.5 0 01-1 0v-8h-2V9z"
+  />
+  <path
+    clip-rule="evenodd"
+    d="M1.6 10a.6.6 0 00-.6.6v3.86a.6.6 0 00.6.6h7.476a.6.6 0 00.6-.6V10.6a.6.6 0 00-.6-.6H1.6zm5.184.723h.578v2.964H8.88v.579H6.784v-3.543zm-2.53.072H5.41c.48 0 .868.389.868.868v.65c0 .48-.389.868-.868.868h-.578v1.157h-.579v-3.543zm.578 1.808h.578c.16 0 .29-.13.29-.29v-.65a.29.29 0 00-.29-.29h-.578v1.23zm-3.109 1.735v-3.543H2.88c.479 0 .867.389.867.868v.65c0 .48-.388.868-.867.868H2.3v1.157h-.578zm.578-1.735h.579c.16 0 .289-.13.289-.29v-.65a.29.29 0 00-.29-.29h-.578v1.23z"
+    fill-rule="evenodd"
+  />
+</svg>
+`;
+
+exports[`OuiIcon props type visQueryPromQL is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
+  focusable="false"
+  height="16"
+  role="img"
+  viewBox="0 0 16 16"
+  width="16"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M10.5 2c0 .022 0 .043-.002.064l1.559 1.04a1 1 0 11-.555.832l-1.559-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.559-1.04a1 1 0 11.555-.832l1.559 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z"
+  />
+  <path
+    d="M8.5 9a.5.5 0 01-1 0v-.5h-2V9a.5.5 0 01-1 0V7.5h-2V9a.5.5 0 01-1 0V7.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7v.3h2V6.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7V7h2.3a.7.7 0 01.7.7V9a.5.5 0 01-1 0V8h-2v1a.5.5 0 01-1 0V6.5h-2V9z"
+  />
+  <path
+    clip-rule="evenodd"
+    d="M1.6 10c-.331 0-.6.315-.6.704v3.592c0 .389.269.704.6.704h12.8c.331 0 .6-.315.6-.704v-3.592c0-.389-.269-.704-.6-.704H1.6zm10.965.714v2.643c0 .474.327.857.73.857h1.035v-.571h-1.034c-.135 0-.244-.128-.244-.286v-2.643h-.487zm-.73.929v2.046c.124.047.231.12.31.18a1.749 1.749 0 01.207.193l.014.014.004.005.001.002h.001l-.172.203-.172.202v-.001l-.008-.008a1.15 1.15 0 00-.145-.134c-.102-.08-.205-.13-.284-.13h-.73c-.404 0-.73-.384-.73-.858v-1.714c0-.474.326-.857.73-.857h.243c.404 0 .73.383.73.857zm-1.218 0c0-.158.11-.286.244-.286h.243c.135 0 .244.128.244.286v2h-.487c-.135 0-.244-.128-.244-.286v-1.714zm-9.008-.857v3.5h.487v-1.143h.487c.403 0 .73-.384.73-.857v-.643c0-.474-.327-.857-.73-.857h-.974zm.974 1.785h-.487v-1.214h.487c.134 0 .243.128.243.286v.643c0 .158-.109.285-.243.285zm1.643 1.715H3.74v-2.5h.487v.167a.746.746 0 01.365-.096h.305v.572H4.59c-.201 0-.365.191-.365.428v1.429zm3.652 0v-1.668l.498.584c.095.112.249.112.344 0l.497-.584v1.668h.487v-2.012c0-.382-.393-.574-.623-.304l-.533.626-.533-.626c-.23-.27-.624-.078-.624.303v2.013h.487zm-1.887-2.429c-.403 0-.73.384-.73.857v.643c0 .474.327.857.73.857h.244c.403 0 .73-.383.73-.857v-.643c0-.473-.327-.857-.73-.857H5.99zm-.243.857c0-.158.109-.285.243-.285h.244c.134 0 .243.127.243.285v.643c0 .158-.109.286-.243.286H5.99c-.134 0-.243-.128-.243-.286v-.643z"
+    fill-rule="evenodd"
+  />
+</svg>
+`;
+
+exports[`OuiIcon props type visQuerySQL is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
+  focusable="false"
+  height="16"
+  role="img"
+  viewBox="0 0 16 16"
+  width="16"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M10.5 2c0 .022 0 .043-.002.064l1.559 1.04a1 1 0 11-.555.832l-1.559-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.559-1.04a1 1 0 11.555-.832l1.559 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z"
+  />
+  <path
+    d="M8.5 9a.5.5 0 01-1 0v-.5h-2V9a.5.5 0 01-1 0V7.5h-2V9a.5.5 0 01-1 0V7.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7v.3h2V6.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7V7h2.3a.7.7 0 01.7.7v6.8a.5.5 0 01-1 0V8h-2v6.5a.5.5 0 01-1 0v-8h-2V9z"
+  />
+  <path
+    clip-rule="evenodd"
+    d="M1.6 10a.6.6 0 00-.6.6v3.86a.6.6 0 00.6.6h7.476a.6.6 0 00.6-.6V10.6a.6.6 0 00-.6-.6H1.6zm5.618.723v2.675c0 .48.388.868.867.868h1.23v-.579h-1.23a.29.29 0 01-.289-.289v-2.675h-.578zm-5.423 1.084c0-.559.453-1.012 1.012-1.012h1.085v.579H2.807a.434.434 0 100 .867 1.012 1.012 0 010 2.025H1.723v-.579h1.084a.434.434 0 100-.867 1.012 1.012 0 01-1.012-1.013zm4.555-.144v2.071c.148.047.275.12.368.182a2.01 2.01 0 01.247.195l.016.015.005.005.001.001.001.001-.204.205-.205.205v-.001l-.009-.008a1.427 1.427 0 00-.173-.136c-.12-.081-.242-.132-.336-.132h-.868a.868.868 0 01-.867-.868v-1.735c0-.48.388-.868.867-.868h.29c.479 0 .867.389.867.868zm-1.446 0c0-.16.13-.29.29-.29h.288c.16 0 .29.13.29.29v2.024h-.579a.29.29 0 01-.289-.289v-1.735z"
+    fill-rule="evenodd"
+  />
+</svg>
+`;
+
 exports[`OuiIcon props type visTable is rendered 1`] = `
 <svg
   aria-hidden="true"
diff --git a/src/components/icon/assets/polygon.js b/src/components/icon/assets/polygon.js
new file mode 100644
index 0000000000..dcf09c42a7
--- /dev/null
+++ b/src/components/icon/assets/polygon.js
@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+import * as React from 'react';
+
+const OuiIconPolygon = ({ title, titleId, ...props }) => (
+  <svg
+    width={16}
+    height={16}
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby={titleId}
+    {...props}>
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path d="M1 5V1h4v1.3h6V1h4v4h-2.934l-.808 1H12v4h-.76l.8 1H15v4h-4v-1.5H5V15H1v-4h1.5V5H1zm1-3h2v2H2V2zm9 10.5v-1.2L9.96 10H8V6h1.973L11 4.728V3.3H5V5H3.5v6H5v1.5h6zM12 2h2v2h-2V2zM4 12H2v2h2v-2zm5-5h2v2H9V7zm3 5h2v2h-2v-2z" />
+  </svg>
+);
+
+export const icon = OuiIconPolygon;
diff --git a/src/components/icon/assets/polygon.svg b/src/components/icon/assets/polygon.svg
new file mode 100644
index 0000000000..a788c588bd
--- /dev/null
+++ b/src/components/icon/assets/polygon.svg
@@ -0,0 +1,8 @@
+<!--
+  - Copyright OpenSearch Contributors
+  - SPDX-License-Identifier: Apache-2.0
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M1 5V1H5V2.29999H11V1H15V5H12.0658L11.2581 6H12V10H11.2403L12.0403 11H15V15H11V13.5H5V15H1V11H2.5V5H1ZM2 2H4V4H2V2ZM11 12.5V11.3004L9.95972 10H8V6H9.97266L11 4.72806V3.29999H5V5H3.5V11H5V12.5H11ZM12 2H14V4H12V2ZM4 12H2V14H4V12ZM9 7H11V9H9V7ZM12 12H14V14H12V12Z"/>
+</svg>
diff --git a/src/components/icon/assets/radius.js b/src/components/icon/assets/radius.js
new file mode 100644
index 0000000000..85bbb8c280
--- /dev/null
+++ b/src/components/icon/assets/radius.js
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+import * as React from 'react';
+
+const OuiIconRadius = ({ title, titleId, ...props }) => (
+  <svg
+    width={16}
+    height={16}
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby={titleId}
+    {...props}>
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M3.05 12.95a7 7 0 109.9-9.9 7 7 0 00-9.9 9.9zm.707-.707a6 6 0 008.825-8.118L10 6.707V10H6V6h3.293l2.582-2.582a6 6 0 00-8.118 8.825zM9 7v2H7V7h2z"
+    />
+  </svg>
+);
+
+export const icon = OuiIconRadius;
diff --git a/src/components/icon/assets/radius.svg b/src/components/icon/assets/radius.svg
new file mode 100644
index 0000000000..db9a46f4cd
--- /dev/null
+++ b/src/components/icon/assets/radius.svg
@@ -0,0 +1,8 @@
+<!--
+  - Copyright OpenSearch Contributors
+  - SPDX-License-Identifier: Apache-2.0
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.05025 12.9497C5.78391 15.6834 10.2161 15.6834 12.9497 12.9497C15.6834 10.2161 15.6834 5.7839 12.9497 3.05025C10.2161 0.316595 5.78393 0.316574 3.05025 3.05025C0.316581 5.78392 0.316603 10.2161 3.05025 12.9497ZM3.75736 12.2426C6.10052 14.5858 9.89949 14.5858 12.2426 12.2426C14.4667 10.0185 14.5798 6.4828 12.5817 4.12543L10 6.7071V10H6V5.99999H9.2929L11.8746 3.41832C9.51719 1.42024 5.98146 1.53325 3.75736 3.75735C1.41421 6.10051 1.41421 9.89948 3.75736 12.2426ZM9 6.99999L8.99998 8.99997L7 9L7.00002 7.00001L9 6.99999Z"/>
+</svg>
diff --git a/src/components/icon/assets/vis_builder.js b/src/components/icon/assets/vis_builder.js
new file mode 100644
index 0000000000..de69751796
--- /dev/null
+++ b/src/components/icon/assets/vis_builder.js
@@ -0,0 +1,41 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+import * as React from 'react';
+
+const OuiIconVisBuilder = ({ title, titleId, ...props }) => (
+  <svg
+    width={32}
+    height={33}
+    viewBox="0 0 32 33"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby={titleId}
+    {...props}>
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M9 15H5v-1h4v1zM17 8h-4V7h4v1zM20 15h-9v-1h9v1zM28 8h-9V7h9v1z"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M10 9V3a1 1 0 011-1h18a1 1 0 011 1v9a1 1 0 01-1 1h-7v4h-1v-7H3v9h9v1H3a1 1 0 01-1-1v-9a1 1 0 011-1h7zm1-6h18v9h-7v-2a1 1 0 00-1-1H11V3z"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M19.714 26.286L20.571 28h.858v-.888c0-.34.296-.976.602-1.54.14-.259.281-.502.398-.696.154-.257.264-.427.264-.427.246-.408.45-1.117.45-1.588v-4.046c0-.796-.605-1.445-1.364-1.48a.728.728 0 00-.78.74v.295a1.518 1.518 0 00-.698-1.282 1.461 1.461 0 00-.73-.23.778.778 0 00-.714.772v.296a1.481 1.481 0 00-.704-1.277 1.383 1.383 0 00-.724-.205.728.728 0 00-.715.741v.296a1.482 1.482 0 00-.702-1.276 1.383 1.383 0 00-.726-.205.728.728 0 00-.715.74v4.149h-.857v-2.667a1.668 1.668 0 00-1 .334c-.432.323-.714.85-.714 1.444v3.089c0 .478.307 1.084.686 1.365 0 0 2.743 1.956 2.743 2.658V28h3.428l.857-1.714zm-.857-5.143v3.428h.857v-3.428h-.857zm-.857 0h-.857v3.428H18v-3.428zm2.572 0v3.428h.857v-3.428h-.857zm-8.467 4.126l-.008-.006-.008-.006a2.74 2.74 0 01-.781-.962A2.743 2.743 0 0111 23.089V20c0-1.453 1.109-2.698 2.571-2.774v-.485c0-.927.734-1.741 1.715-1.741.59 0 1.12.21 1.533.556.188-.072.393-.112.61-.112.584 0 1.11.207 1.522.547.17-.07.351-.115.54-.13l.06-.006.06.003c.572.023 1.091.24 1.498.585.187-.07.39-.11.605-.11 1.376 0 2.429 1.146 2.429 2.482v4.046c0 .358-.074.75-.17 1.091-.098.343-.241.712-.425 1.015l-.007.012m-.008.012l-.002.003-.01.015-.036.058a17.848 17.848 0 00-.547.93c-.15.274-.29.552-.39.79-.076.18-.104.282-.114.32-.005.02-.005.02-.005.005V29h-2.476l-.239-.478-.239.478H14.43v-1.724a2.434 2.434 0 00-.168-.202 9.35 9.35 0 00-.847-.789 22.704 22.704 0 00-1.283-.997l-.02-.015-.006-.004m2.372 2.082l-.008-.014.008.014z"
+    />
+  </svg>
+);
+
+export const icon = OuiIconVisBuilder;
diff --git a/src/components/icon/assets/vis_builder.svg b/src/components/icon/assets/vis_builder.svg
new file mode 100644
index 0000000000..595da7f565
--- /dev/null
+++ b/src/components/icon/assets/vis_builder.svg
@@ -0,0 +1,13 @@
+<!--
+  - Copyright OpenSearch Contributors
+  - SPDX-License-Identifier: Apache-2.0
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="33" viewBox="0 0 32 33">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M9 15H5V14H9V15Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M17 8H13V7H17V8Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M20 15H11V14H20V15Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M28 8H19V7H28V8Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M10 9V3C10 2.44771 10.4477 2 11 2H29C29.5523 2 30 2.44772 30 3V12C30 12.5523 29.5523 13 29 13H22V17H21V13V12V10H11H10H3V19H12V20H3C2.44772 20 2 19.5523 2 19V10C2 9.44771 2.44772 9 3 9H10ZM11 3H29V12H22V10C22 9.44772 21.5523 9 21 9H11V3Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.7143 26.2857L20.5714 28H21.4286V27.1116C21.4286 26.7716 21.7252 26.1362 22.031 25.5714C22.1707 25.3133 22.3124 25.07 22.4286 24.8763C22.5831 24.6188 22.6925 24.4491 22.6925 24.4491C22.9395 24.041 23.1429 23.3322 23.1429 22.8608V18.8147C23.1429 18.0189 22.5381 17.3699 21.7791 17.3348C21.7577 17.3338 21.7361 17.3333 21.7144 17.3333C21.3197 17.3333 21 17.6649 21 18.0742V18.3702C21 18.2689 20.9902 18.1699 20.9715 18.0742C20.8904 17.6589 20.642 17.3055 20.3024 17.0879C20.1019 16.9595 19.8696 16.8784 19.6211 16.86C19.6047 16.8588 19.5882 16.8578 19.5716 16.8571C19.1769 16.8889 18.8572 17.2204 18.8572 17.6298V17.9258C18.8572 17.8244 18.8473 17.7254 18.8286 17.6298C18.747 17.2122 18.4961 16.8585 18.1533 16.6489C17.958 16.5294 17.7328 16.4568 17.4922 16.4459C17.4712 16.4449 17.45 16.4444 17.4287 16.4444C17.034 16.4444 16.7143 16.776 16.7143 17.1853V17.4813C16.7143 17.38 16.7045 17.281 16.6858 17.1853C16.6043 16.7685 16.3541 16.4153 16.0123 16.2055C15.7995 16.0749 15.5511 16 15.2859 16C14.8912 16 14.5714 16.3316 14.5714 16.7409V20.8889H13.7143V18.2222C13.6662 18.2222 13.6185 18.2243 13.5714 18.2283C13.2531 18.2555 12.9595 18.373 12.7143 18.5559C12.2817 18.8786 12 19.4052 12 20V23.0889C12 23.5666 12.307 24.173 12.6856 24.4544C12.6856 24.4544 15.4286 26.4098 15.4286 27.1116V28H18.8572L19.7143 26.2857ZM18.8571 21.1428V24.5714H19.7143V21.1428H18.8571ZM18 21.1428H17.1429V24.5714H18V21.1428ZM20.5715 21.1428V24.5714H21.4286V21.1428H20.5715ZM12.1051 25.2686L12.0971 25.2629L12.0891 25.257C11.7432 24.9999 11.4816 24.6406 11.3076 24.2949C11.1334 23.9489 11 23.5232 11 23.0889V20C11 18.5475 12.1086 17.3024 13.5714 17.2259V16.7409C13.5714 15.8139 14.3049 15 15.2859 15C15.8754 15 16.4058 15.2105 16.8194 15.5563C17.0069 15.4843 17.2118 15.4444 17.4287 15.4444C18.0131 15.4444 18.5392 15.6512 18.9512 15.9915C19.1204 15.9208 19.3022 15.8756 19.4914 15.8604L19.5515 15.8555L19.6118 15.858C20.1827 15.8809 20.7021 16.0977 21.1095 16.4435C21.2958 16.3725 21.4992 16.3333 21.7144 16.3333C23.0897 16.3333 24.1429 17.4787 24.1429 18.8147V22.8608C24.1429 23.2194 24.0693 23.6111 23.9721 23.9524C23.8746 24.2951 23.7315 24.6638 23.5479 24.967L23.5406 24.979M23.533 24.9908L23.5308 24.9943L23.5217 25.0086L23.4848 25.0669C23.4525 25.1183 23.4057 25.1934 23.3493 25.2861C23.236 25.4724 23.0864 25.7255 22.9379 25.9969C22.7878 26.2715 22.6479 26.5487 22.5482 26.7863C22.472 26.9679 22.4444 27.0694 22.4343 27.1063C22.4288 27.1263 22.4286 27.1272 22.4286 27.1116V29H19.9534L19.7143 28.5218L19.4752 29H14.4286V27.2755C14.3931 27.2266 14.3388 27.1594 14.2611 27.0741C14.0478 26.8403 13.7439 26.563 13.4135 26.2852C13.0883 26.0118 12.7601 25.7567 12.5114 25.5688C12.3875 25.4752 12.2846 25.3992 12.2132 25.347C12.1776 25.3209 12.1498 25.3008 12.1314 25.2875L12.1108 25.2727L12.1051 25.2686M14.4766 27.3513C14.4766 27.3513 14.4734 27.3463 14.4694 27.337C14.475 27.3467 14.4766 27.3513 14.4766 27.3513Z"/>
+</svg>
diff --git a/src/components/icon/assets/vis_builder_saved_object.js b/src/components/icon/assets/vis_builder_saved_object.js
new file mode 100644
index 0000000000..897df73b1a
--- /dev/null
+++ b/src/components/icon/assets/vis_builder_saved_object.js
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+import * as React from 'react';
+
+const OuiIconVisBuilderSavedObject = ({ title, titleId, ...props }) => (
+  <svg
+    width={16}
+    height={16}
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby={titleId}
+    {...props}>
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path d="M10.5 2c0 .022 0 .043-.002.064l1.559 1.04a1 1 0 11-.555.832l-1.559-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.559-1.04a1 1 0 11.555-.832l1.559 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z" />
+    <path d="M8.5 13a.5.5 0 01-1 0V8.5h-2V13a.5.5 0 01-1 0V7.5h-2V13a.5.5 0 01-1 0V7.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7v.3h2V6.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7V7h2.3a.7.7 0 01.7.7V13a.5.5 0 01-1 0V8h-2v5a.5.5 0 01-1 0V6.5h-2V13zM.5 14.5A.5.5 0 011 14h14a.5.5 0 010 1H1a.5.5 0 01-.5-.5z" />
+  </svg>
+);
+
+export const icon = OuiIconVisBuilderSavedObject;
diff --git a/src/components/icon/assets/vis_builder_saved_object.svg b/src/components/icon/assets/vis_builder_saved_object.svg
new file mode 100644
index 0000000000..8ac4f17778
--- /dev/null
+++ b/src/components/icon/assets/vis_builder_saved_object.svg
@@ -0,0 +1,10 @@
+<!--
+  - Copyright OpenSearch Contributors
+  - SPDX-License-Identifier: Apache-2.0
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M10.5 2C10.5 2.02163 10.4993 2.0431 10.498 2.06438L12.0566 3.10345C12.1902 3.03723 12.3408 3 12.5 3C13.0523 3 13.5 3.44772 13.5 4C13.5 4.55228 13.0523 5 12.5 5C11.9477 5 11.5 4.55228 11.5 4C11.5 3.97837 11.5007 3.9569 11.502 3.93562L9.94344 2.89655C9.80981 2.96277 9.65925 3 9.5 3C9.41042 3 9.32359 2.98822 9.24098 2.96613L7.46613 4.74098C7.48822 4.82359 7.5 4.91042 7.5 5C7.5 5.55228 7.05228 6 6.5 6C5.94772 6 5.5 5.55228 5.5 5C5.5 4.97837 5.50069 4.9569 5.50204 4.93562L3.94344 3.89655C3.80981 3.96277 3.65925 4 3.5 4C2.94772 4 2.5 3.55228 2.5 3C2.5 2.44772 2.94772 2 3.5 2C4.05228 2 4.5 2.44772 4.5 3C4.5 3.02163 4.49931 3.0431 4.49796 3.06438L6.05656 4.10345C6.1902 4.03722 6.34075 4 6.5 4C6.58958 4 6.67641 4.01178 6.75902 4.03387L8.53387 2.25902C8.51178 2.17641 8.5 2.08958 8.5 2C8.5 1.44772 8.94771 1 9.5 1C10.0523 1 10.5 1.44772 10.5 2Z"/>
+  <path d="M8.5 13C8.5 13.2761 8.27614 13.5 8 13.5C7.72386 13.5 7.5 13.2761 7.5 13V8.5H5.5V13C5.5 13.2761 5.27614 13.5 5 13.5C4.72386 13.5 4.5 13.2761 4.5 13V7.5H2.5V13C2.5 13.2761 2.27614 13.5 2 13.5C1.72386 13.5 1.5 13.2761 1.5 13V7.2C1.5 6.8134 1.8134 6.5 2.2 6.5H4.8C5.1866 6.5 5.5 6.8134 5.5 7.2V7.5H7.5V6.2C7.5 5.8134 7.8134 5.5 8.2 5.5H10.8C11.1866 5.5 11.5 5.8134 11.5 6.2V7H13.8C14.1866 7 14.5 7.3134 14.5 7.7V13C14.5 13.2761 14.2761 13.5 14 13.5C13.7239 13.5 13.5 13.2761 13.5 13V8H11.5V13C11.5 13.2761 11.2761 13.5 11 13.5C10.7239 13.5 10.5 13.2761 10.5 13V6.5H8.5V13Z"/>
+  <path d="M0.5 14.5C0.5 14.2239 0.723858 14 1 14H15C15.2761 14 15.5 14.2239 15.5 14.5C15.5 14.7761 15.2761 15 15 15H1C0.723858 15 0.5 14.7761 0.5 14.5Z"/>
+</svg>
diff --git a/src/components/icon/assets/vis_query_dql.js b/src/components/icon/assets/vis_query_dql.js
new file mode 100644
index 0000000000..89f16476bc
--- /dev/null
+++ b/src/components/icon/assets/vis_query_dql.js
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+import * as React from 'react';
+
+const OuiIconVisQueryDql = ({ title, titleId, ...props }) => (
+  <svg
+    width={16}
+    height={16}
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby={titleId}
+    {...props}>
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path d="M10.5 2c0 .022 0 .043-.002.064l1.559 1.04a1 1 0 11-.555.832l-1.559-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.559-1.04a1 1 0 11.555-.832l1.559 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z" />
+    <path d="M8.5 6.5h2v8a.5.5 0 001 0V8h2v6.5a.5.5 0 001 0V7.7a.7.7 0 00-.7-.7h-2.3v-.8a.7.7 0 00-.7-.7H8.2a.7.7 0 00-.7.7v1.3h-2v-.3a.7.7 0 00-.7-.7H2.2a.7.7 0 00-.7.7V9a.5.5 0 001 0V7.5h2V9a.5.5 0 001 0v-.5h2V9a.5.5 0 001 0V6.5z" />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M1.6 10a.6.6 0 00-.6.6v3.86a.6.6 0 00.6.6h7.476a.6.6 0 00.6-.6V10.6a.6.6 0 00-.6-.6H1.6zm5.545 3.398v-2.675h.579v2.675c0 .16.13.29.289.29h1.229v.578h-1.23a.868.868 0 01-.867-.868zm-.867.336v-2.071a.868.868 0 00-.868-.868h-.289a.868.868 0 00-.868.868v1.735c0 .48.389.868.868.868h.868c.093 0 .215.051.336.132a1.43 1.43 0 01.173.136l.008.008h.001l.205-.204.204-.205h-.001l-.002-.002-.005-.005-.015-.015a2.046 2.046 0 00-.247-.195 1.486 1.486 0 00-.368-.182zm-1.157-2.36a.29.29 0 00-.29.289v1.735c0 .16.13.29.29.29h.578v-2.025a.29.29 0 00-.289-.29h-.289zm-3.398 2.892v-3.47h1.012c.56 0 1.012.453 1.012 1.011v1.446c0 .56-.453 1.013-1.012 1.013H1.723zm.578-2.892v2.313h.434c.24 0 .434-.194.434-.434v-1.446a.434.434 0 00-.434-.433h-.434z"
+    />
+  </svg>
+);
+
+export const icon = OuiIconVisQueryDql;
diff --git a/src/components/icon/assets/vis_query_dql.svg b/src/components/icon/assets/vis_query_dql.svg
new file mode 100644
index 0000000000..0c184ad2b4
--- /dev/null
+++ b/src/components/icon/assets/vis_query_dql.svg
@@ -0,0 +1,10 @@
+<!--
+  - Copyright OpenSearch Contributors
+  - SPDX-License-Identifier: Apache-2.0
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M10.5 2C10.5 2.02163 10.4993 2.0431 10.498 2.06438L12.0566 3.10345C12.1902 3.03723 12.3408 3 12.5 3C13.0523 3 13.5 3.44772 13.5 4C13.5 4.55228 13.0523 5 12.5 5C11.9477 5 11.5 4.55228 11.5 4C11.5 3.97837 11.5007 3.9569 11.502 3.93562L9.94344 2.89655C9.80981 2.96277 9.65925 3 9.5 3C9.41042 3 9.32359 2.98822 9.24098 2.96613L7.46613 4.74098C7.48822 4.82359 7.5 4.91042 7.5 5C7.5 5.55228 7.05228 6 6.5 6C5.94772 6 5.5 5.55228 5.5 5C5.5 4.97837 5.50069 4.9569 5.50204 4.93562L3.94344 3.89655C3.80981 3.96277 3.65925 4 3.5 4C2.94772 4 2.5 3.55228 2.5 3C2.5 2.44772 2.94772 2 3.5 2C4.05228 2 4.5 2.44772 4.5 3C4.5 3.02163 4.49931 3.0431 4.49796 3.06438L6.05656 4.10345C6.1902 4.03722 6.34075 4 6.5 4C6.58958 4 6.67641 4.01178 6.75902 4.03387L8.53387 2.25902C8.51178 2.17641 8.5 2.08958 8.5 2C8.5 1.44772 8.94771 1 9.5 1C10.0523 1 10.5 1.44772 10.5 2Z"/>
+  <path d="M8.5 6.5H10.5V14.5C10.5 14.7761 10.7239 15 11 15C11.2761 15 11.5 14.7761 11.5 14.5V8H13.5V14.5C13.5 14.7761 13.7239 15 14 15C14.2761 15 14.5 14.7761 14.5 14.5V7.7C14.5 7.3134 14.1866 7 13.8 7H11.5V6.2C11.5 5.8134 11.1866 5.5 10.8 5.5H8.2C7.8134 5.5 7.5 5.8134 7.5 6.2V7.5H5.5V7.2C5.5 6.8134 5.1866 6.5 4.8 6.5H2.2C1.8134 6.5 1.5 6.8134 1.5 7.2V9C1.5 9.27614 1.72386 9.5 2 9.5C2.27614 9.5 2.5 9.27614 2.5 9V7.5H4.5V9C4.5 9.27614 4.72386 9.5 5 9.5C5.27614 9.5 5.5 9.27614 5.5 9V8.5H7.5V9C7.5 9.27614 7.72386 9.5 8 9.5C8.27614 9.5 8.5 9.27614 8.5 9V6.5Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.6 10C1.26863 10 1 10.2686 1 10.6V14.4609C1 14.7922 1.26863 15.0609 1.6 15.0609H9.07576C9.40714 15.0609 9.67576 14.7922 9.67576 14.4609V10.6C9.67576 10.2686 9.40713 10 9.07576 10H1.6ZM7.14533 13.398V10.723H7.72371V13.398C7.72371 13.5577 7.85319 13.6872 8.01291 13.6872H9.24197V14.2656H8.01291C7.53376 14.2656 7.14533 13.8772 7.14533 13.398ZM6.27775 13.7344V11.6629C6.27775 11.1837 5.88933 10.7953 5.41018 10.7953H5.12099C4.64184 10.7953 4.25341 11.1837 4.25341 11.6629V13.398C4.25341 13.8772 4.64184 14.2656 5.12099 14.2656H5.98856C6.08238 14.2656 6.20404 14.317 6.3252 14.3978C6.38107 14.435 6.4282 14.4727 6.46121 14.501C6.47756 14.515 6.49005 14.5264 6.49798 14.5338L6.50628 14.5417L6.50715 14.5425C6.5071 14.5424 6.50705 14.5424 6.71154 14.3379C6.91603 14.1334 6.91598 14.1334 6.91593 14.1333L6.91496 14.1323L6.91334 14.1307L6.9085 14.126L6.89262 14.111C6.87938 14.0986 6.8608 14.0817 6.83761 14.0618C6.79154 14.0224 6.72571 13.9697 6.64603 13.9165C6.55295 13.8545 6.42524 13.7811 6.27775 13.7344ZM5.12099 11.3737C4.96127 11.3737 4.83179 11.5032 4.83179 11.6629V13.398C4.83179 13.5577 4.96127 13.6872 5.12099 13.6872H5.69937V11.6629C5.69937 11.5032 5.56989 11.3737 5.41018 11.3737H5.12099ZM1.72298 14.2656V10.7953H2.73515C3.29416 10.7953 3.74732 11.2485 3.74732 11.8075V13.2534C3.74732 13.8124 3.29416 14.2656 2.73515 14.2656H1.72298ZM2.30136 11.3737V13.6872H2.73515C2.97472 13.6872 3.16894 13.493 3.16894 13.2534V11.8075C3.16894 11.5679 2.97472 11.3737 2.73515 11.3737H2.30136Z"/>
+</svg>
diff --git a/src/components/icon/assets/vis_query_ppl.js b/src/components/icon/assets/vis_query_ppl.js
new file mode 100644
index 0000000000..19be288c57
--- /dev/null
+++ b/src/components/icon/assets/vis_query_ppl.js
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+import * as React from 'react';
+
+const OuiIconVisQueryPpl = ({ title, titleId, ...props }) => (
+  <svg
+    width={16}
+    height={16}
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby={titleId}
+    {...props}>
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path d="M10.5 2a.98.98 0 01-.002.064l1.559 1.04a1 1 0 11-.554.832l-1.56-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.558-1.04a1 1 0 11.555-.832l1.558 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z" />
+    <path d="M8.5 9a.5.5 0 01-1 0v-.5h-2V9a.5.5 0 01-1 0V7.5h-2V9a.5.5 0 01-1 0V7.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7v.3h2V6.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7V7h2.3a.7.7 0 01.7.7v6.8a.5.5 0 01-1 0V8h-2v6.5a.5.5 0 01-1 0v-8h-2V9z" />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M1.6 10a.6.6 0 00-.6.6v3.86a.6.6 0 00.6.6h7.476a.6.6 0 00.6-.6V10.6a.6.6 0 00-.6-.6H1.6zm5.184.723h.578v2.964H8.88v.579H6.784v-3.543zm-2.53.072H5.41c.48 0 .868.389.868.868v.65c0 .48-.389.868-.868.868h-.578v1.157h-.579v-3.543zm.578 1.808h.578c.16 0 .29-.13.29-.29v-.65a.29.29 0 00-.29-.29h-.578v1.23zm-3.109 1.735v-3.543H2.88c.479 0 .867.389.867.868v.65c0 .48-.388.868-.867.868H2.3v1.157h-.578zm.578-1.735h.579c.16 0 .289-.13.289-.29v-.65a.29.29 0 00-.29-.29h-.578v1.23z"
+    />
+  </svg>
+);
+
+export const icon = OuiIconVisQueryPpl;
diff --git a/src/components/icon/assets/vis_query_ppl.svg b/src/components/icon/assets/vis_query_ppl.svg
new file mode 100644
index 0000000000..1171f0f40a
--- /dev/null
+++ b/src/components/icon/assets/vis_query_ppl.svg
@@ -0,0 +1,10 @@
+<!--
+  - Copyright OpenSearch Contributors
+  - SPDX-License-Identifier: Apache-2.0
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M10.5001 2C10.5001 2.02163 10.4994 2.0431 10.498 2.06438L12.0566 3.10345C12.1903 3.03723 12.3408 3 12.5001 3C13.0523 3 13.5001 3.44772 13.5001 4C13.5001 4.55228 13.0523 5 12.5001 5C11.9478 5 11.5001 4.55228 11.5001 4C11.5001 3.97837 11.5007 3.9569 11.5021 3.93562L9.9435 2.89655C9.80986 2.96277 9.65931 3 9.50006 3C9.41048 3 9.32365 2.98822 9.24104 2.96613L7.46619 4.74098C7.48828 4.82359 7.50006 4.91042 7.50006 5C7.50006 5.55228 7.05235 6 6.50006 6C5.94778 6 5.50006 5.55228 5.50006 5C5.50006 4.97837 5.50075 4.9569 5.5021 4.93562L3.9435 3.89655C3.80987 3.96277 3.65931 4 3.50006 4C2.94778 4 2.50006 3.55228 2.50006 3C2.50006 2.44772 2.94778 2 3.50006 2C4.05235 2 4.50006 2.44772 4.50006 3C4.50006 3.02163 4.49937 3.0431 4.49802 3.06438L6.05662 4.10345C6.19026 4.03722 6.34081 4 6.50006 4C6.58964 4 6.67647 4.01178 6.75908 4.03387L8.53393 2.25902C8.51184 2.17641 8.50006 2.08958 8.50006 2C8.50006 1.44772 8.94777 1 9.50006 1C10.0523 1 10.5001 1.44772 10.5001 2Z"/>
+  <path d="M8.50006 9C8.50006 9.27614 8.2762 9.5 8.00006 9.5C7.72392 9.5 7.50006 9.27614 7.50006 9V8.5H5.50006V9C5.50006 9.27614 5.2762 9.5 5.00006 9.5C4.72392 9.5 4.50006 9.27614 4.50006 9V7.5H2.50006V9C2.50006 9.27614 2.2762 9.5 2.00006 9.5C1.72392 9.5 1.50006 9.27614 1.50006 9V7.2C1.50006 6.8134 1.81346 6.5 2.20006 6.5H4.80006C5.18666 6.5 5.50006 6.8134 5.50006 7.2V7.5H7.50006V6.2C7.50006 5.8134 7.81346 5.5 8.20006 5.5H10.8001C11.1867 5.5 11.5001 5.8134 11.5001 6.2V7H13.8001C14.1867 7 14.5001 7.3134 14.5001 7.7V14.5C14.5001 14.7761 14.2762 15 14.0001 15C13.7239 15 13.5001 14.7761 13.5001 14.5V8H11.5001V14.5C11.5001 14.7761 11.2762 15 11.0001 15C10.7239 15 10.5001 14.7761 10.5001 14.5V6.5H8.50006V9Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.6 10C1.26863 10 1 10.2686 1 10.6V14.4609C1 14.7922 1.26863 15.0609 1.6 15.0609H9.07576C9.40713 15.0609 9.67576 14.7922 9.67576 14.4609V10.6C9.67576 10.2686 9.40713 10 9.07576 10H1.6ZM6.78384 10.723H7.36222V13.6872H8.88048V14.2656H6.78384V10.723ZM4.25341 10.7953H5.41018C5.88933 10.7953 6.27775 11.1837 6.27775 11.6629V12.3135C6.27775 12.7927 5.88933 13.1811 5.41018 13.1811H4.83179V14.3379H4.25341V10.7953ZM4.83179 12.6027H5.41018C5.56989 12.6027 5.69937 12.4733 5.69937 12.3135V11.6629C5.69937 11.5031 5.56989 11.3737 5.41018 11.3737H4.83179V12.6027ZM1.72298 14.3379V10.7953H2.87975C3.3589 10.7953 3.74732 11.1837 3.74732 11.6629V12.3135C3.74732 12.7927 3.3589 13.1811 2.87975 13.1811H2.30136V14.3379H1.72298ZM2.30136 12.6027H2.87975C3.03946 12.6027 3.16894 12.4733 3.16894 12.3135V11.6629C3.16894 11.5031 3.03946 11.3737 2.87975 11.3737H2.30136V12.6027Z"/>
+</svg>
diff --git a/src/components/icon/assets/vis_query_promql.js b/src/components/icon/assets/vis_query_promql.js
new file mode 100644
index 0000000000..071c7a74d3
--- /dev/null
+++ b/src/components/icon/assets/vis_query_promql.js
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+import * as React from 'react';
+
+const OuiIconVisQueryPromql = ({ title, titleId, ...props }) => (
+  <svg
+    width={16}
+    height={16}
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby={titleId}
+    {...props}>
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path d="M10.5 2c0 .022 0 .043-.002.064l1.559 1.04a1 1 0 11-.555.832l-1.559-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.559-1.04a1 1 0 11.555-.832l1.559 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z" />
+    <path d="M8.5 9a.5.5 0 01-1 0v-.5h-2V9a.5.5 0 01-1 0V7.5h-2V9a.5.5 0 01-1 0V7.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7v.3h2V6.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7V7h2.3a.7.7 0 01.7.7V9a.5.5 0 01-1 0V8h-2v1a.5.5 0 01-1 0V6.5h-2V9z" />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M1.6 10c-.331 0-.6.315-.6.704v3.592c0 .389.269.704.6.704h12.8c.331 0 .6-.315.6-.704v-3.592c0-.389-.269-.704-.6-.704H1.6zm10.965.714v2.643c0 .474.327.857.73.857h1.035v-.571h-1.034c-.135 0-.244-.128-.244-.286v-2.643h-.487zm-.73.929v2.046c.124.047.231.12.31.18a1.749 1.749 0 01.207.193l.014.014.004.005.001.002h.001l-.172.203-.172.202v-.001l-.008-.008a1.15 1.15 0 00-.145-.134c-.102-.08-.205-.13-.284-.13h-.73c-.404 0-.73-.384-.73-.858v-1.714c0-.474.326-.857.73-.857h.243c.404 0 .73.383.73.857zm-1.218 0c0-.158.11-.286.244-.286h.243c.135 0 .244.128.244.286v2h-.487c-.135 0-.244-.128-.244-.286v-1.714zm-9.008-.857v3.5h.487v-1.143h.487c.403 0 .73-.384.73-.857v-.643c0-.474-.327-.857-.73-.857h-.974zm.974 1.785h-.487v-1.214h.487c.134 0 .243.128.243.286v.643c0 .158-.109.285-.243.285zm1.643 1.715H3.74v-2.5h.487v.167a.746.746 0 01.365-.096h.305v.572H4.59c-.201 0-.365.191-.365.428v1.429zm3.652 0v-1.668l.498.584c.095.112.249.112.344 0l.497-.584v1.668h.487v-2.012c0-.382-.393-.574-.623-.304l-.533.626-.533-.626c-.23-.27-.624-.078-.624.303v2.013h.487zm-1.887-2.429c-.403 0-.73.384-.73.857v.643c0 .474.327.857.73.857h.244c.403 0 .73-.383.73-.857v-.643c0-.473-.327-.857-.73-.857H5.99zm-.243.857c0-.158.109-.285.243-.285h.244c.134 0 .243.127.243.285v.643c0 .158-.109.286-.243.286H5.99c-.134 0-.243-.128-.243-.286v-.643z"
+    />
+  </svg>
+);
+
+export const icon = OuiIconVisQueryPromql;
diff --git a/src/components/icon/assets/vis_query_promql.svg b/src/components/icon/assets/vis_query_promql.svg
new file mode 100644
index 0000000000..95bf67cadf
--- /dev/null
+++ b/src/components/icon/assets/vis_query_promql.svg
@@ -0,0 +1,10 @@
+<!--
+  - Copyright OpenSearch Contributors
+  - SPDX-License-Identifier: Apache-2.0
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M10.5 2C10.5 2.02163 10.4993 2.0431 10.498 2.06438L12.0566 3.10345C12.1902 3.03723 12.3408 3 12.5 3C13.0523 3 13.5 3.44772 13.5 4C13.5 4.55228 13.0523 5 12.5 5C11.9477 5 11.5 4.55228 11.5 4C11.5 3.97837 11.5007 3.9569 11.502 3.93562L9.94344 2.89655C9.80981 2.96277 9.65925 3 9.5 3C9.41042 3 9.32359 2.98822 9.24098 2.96613L7.46613 4.74098C7.48822 4.82359 7.5 4.91042 7.5 5C7.5 5.55228 7.05228 6 6.5 6C5.94772 6 5.5 5.55228 5.5 5C5.5 4.97837 5.50069 4.9569 5.50204 4.93562L3.94344 3.89655C3.80981 3.96277 3.65925 4 3.5 4C2.94772 4 2.5 3.55228 2.5 3C2.5 2.44772 2.94772 2 3.5 2C4.05228 2 4.5 2.44772 4.5 3C4.5 3.02163 4.49931 3.0431 4.49796 3.06438L6.05656 4.10345C6.1902 4.03722 6.34075 4 6.5 4C6.58958 4 6.67641 4.01178 6.75902 4.03387L8.53387 2.25902C8.51178 2.17641 8.5 2.08958 8.5 2C8.5 1.44772 8.94771 1 9.5 1C10.0523 1 10.5 1.44772 10.5 2Z"/>
+  <path d="M8.5 9C8.5 9.27614 8.27614 9.5 8 9.5C7.72386 9.5 7.5 9.27614 7.5 9V8.5H5.5V9C5.5 9.27614 5.27614 9.5 5 9.5C4.72386 9.5 4.5 9.27614 4.5 9V7.5H2.5V9C2.5 9.27614 2.27614 9.5 2 9.5C1.72386 9.5 1.5 9.27614 1.5 9V7.2C1.5 6.8134 1.8134 6.5 2.2 6.5H4.8C5.1866 6.5 5.5 6.8134 5.5 7.2V7.5H7.5V6.2C7.5 5.8134 7.8134 5.5 8.2 5.5H10.8C11.1866 5.5 11.5 5.8134 11.5 6.2V7H13.8C14.1866 7 14.5 7.3134 14.5 7.7V9C14.5 9.27614 14.2761 9.5 14 9.5C13.7239 9.5 13.5 9.27614 13.5 9V8H11.5V9C11.5 9.27614 11.2761 9.5 11 9.5C10.7239 9.5 10.5 9.27614 10.5 9V6.5H8.5V9Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.6 10C1.26863 10 1 10.3152 1 10.7041V14.2959C1 14.6848 1.26863 15 1.6 15H14.4C14.7314 15 15 14.6848 15 14.2959V10.7041C15 10.3152 14.7314 10 14.4 10H1.6ZM12.5652 10.7143V13.3571C12.5652 13.8305 12.8922 14.2143 13.2956 14.2143H14.3304V13.6429H13.2956C13.1612 13.6429 13.0522 13.5149 13.0522 13.3571V10.7143H12.5652ZM11.8348 11.6429V13.6895C11.959 13.7356 12.0665 13.8081 12.1448 13.8694C12.2119 13.9219 12.2674 13.974 12.3061 14.013C12.3257 14.0326 12.3413 14.0493 12.3525 14.0615L12.3658 14.0764L12.3699 14.081L12.3713 14.0826L12.3721 14.0836C12.3721 14.0836 12.3722 14.0837 12.2 14.2857C12.0278 14.4877 12.0279 14.4878 12.0279 14.4878L12.0272 14.487L12.0202 14.4792C12.0135 14.4719 12.003 14.4607 11.9892 14.4468C11.9614 14.4189 11.9218 14.3817 11.8747 14.3449C11.7727 14.2651 11.6703 14.2143 11.5913 14.2143H10.8609C10.4575 14.2143 10.1304 13.8305 10.1304 13.3571V11.6429C10.1304 11.1695 10.4575 10.7857 10.8609 10.7857H11.1043C11.5078 10.7857 11.8348 11.1695 11.8348 11.6429ZM10.6174 11.6429C10.6174 11.4851 10.7264 11.3571 10.8609 11.3571H11.1043C11.2388 11.3571 11.3478 11.4851 11.3478 11.6429V13.6429H10.8609C10.7264 13.6429 10.6174 13.5149 10.6174 13.3571V11.6429ZM1.60869 10.7857V14.2857H2.09565V13.1429H2.58261C2.98601 13.1429 3.31304 12.7591 3.31304 12.2857V11.6429C3.31304 11.1695 2.98601 10.7857 2.58261 10.7857H1.60869ZM2.58261 12.5714H2.09565V11.3571H2.58261C2.71708 11.3571 2.82609 11.4851 2.82609 11.6429V12.2857C2.82609 12.4435 2.71708 12.5714 2.58261 12.5714ZM4.22609 14.2857L3.73913 14.2855V11.7857H4.22609V11.9534C4.33678 11.8917 4.4606 11.8571 4.5913 11.8571H4.89565V12.4286H4.5913C4.3896 12.4286 4.22609 12.6204 4.22609 12.8571V14.2857ZM7.87826 14.2857V12.6183L8.37566 13.202C8.47074 13.3136 8.6249 13.3136 8.71999 13.202L9.21739 12.6183V14.2857H9.70435V12.2735C9.70435 11.8916 9.31096 11.7004 9.08088 11.9704L8.54782 12.5959L8.01477 11.9704C7.78469 11.7004 7.3913 11.8916 7.3913 12.2735V14.2857H7.87826ZM5.9913 11.8571C5.58789 11.8571 5.26087 12.2409 5.26087 12.7143V13.3571C5.26087 13.8305 5.58789 14.2143 5.9913 14.2143H6.23478C6.63819 14.2143 6.96522 13.8305 6.96522 13.3571V12.7143C6.96522 12.2409 6.63819 11.8571 6.23478 11.8571H5.9913ZM5.74782 12.7143C5.74782 12.5565 5.85683 12.4286 5.9913 12.4286H6.23478C6.36925 12.4286 6.47826 12.5565 6.47826 12.7143V13.3571C6.47826 13.5149 6.36925 13.6429 6.23478 13.6429H5.9913C5.85683 13.6429 5.74782 13.5149 5.74782 13.3571V12.7143Z"/>
+</svg>
diff --git a/src/components/icon/assets/vis_query_sql.js b/src/components/icon/assets/vis_query_sql.js
new file mode 100644
index 0000000000..386d0bce9b
--- /dev/null
+++ b/src/components/icon/assets/vis_query_sql.js
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+import * as React from 'react';
+
+const OuiIconVisQuerySql = ({ title, titleId, ...props }) => (
+  <svg
+    width={16}
+    height={16}
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby={titleId}
+    {...props}>
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path d="M10.5 2c0 .022 0 .043-.002.064l1.559 1.04a1 1 0 11-.555.832l-1.559-1.04a.996.996 0 01-.702.07L7.466 4.741A1.001 1.001 0 016.5 6a1 1 0 01-.998-1.064l-1.559-1.04a1 1 0 11.555-.832l1.559 1.04a.996.996 0 01.702-.07l1.775-1.775A1.001 1.001 0 019.5 1a1 1 0 011 1z" />
+    <path d="M8.5 9a.5.5 0 01-1 0v-.5h-2V9a.5.5 0 01-1 0V7.5h-2V9a.5.5 0 01-1 0V7.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7v.3h2V6.2a.7.7 0 01.7-.7h2.6a.7.7 0 01.7.7V7h2.3a.7.7 0 01.7.7v6.8a.5.5 0 01-1 0V8h-2v6.5a.5.5 0 01-1 0v-8h-2V9z" />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M1.6 10a.6.6 0 00-.6.6v3.86a.6.6 0 00.6.6h7.476a.6.6 0 00.6-.6V10.6a.6.6 0 00-.6-.6H1.6zm5.618.723v2.675c0 .48.388.868.867.868h1.23v-.579h-1.23a.29.29 0 01-.289-.289v-2.675h-.578zm-5.423 1.084c0-.559.453-1.012 1.012-1.012h1.085v.579H2.807a.434.434 0 100 .867 1.012 1.012 0 010 2.025H1.723v-.579h1.084a.434.434 0 100-.867 1.012 1.012 0 01-1.012-1.013zm4.555-.144v2.071c.148.047.275.12.368.182a2.01 2.01 0 01.247.195l.016.015.005.005.001.001.001.001-.204.205-.205.205v-.001l-.009-.008a1.427 1.427 0 00-.173-.136c-.12-.081-.242-.132-.336-.132h-.868a.868.868 0 01-.867-.868v-1.735c0-.48.388-.868.867-.868h.29c.479 0 .867.389.867.868zm-1.446 0c0-.16.13-.29.29-.29h.288c.16 0 .29.13.29.29v2.024h-.579a.29.29 0 01-.289-.289v-1.735z"
+    />
+  </svg>
+);
+
+export const icon = OuiIconVisQuerySql;
diff --git a/src/components/icon/assets/vis_query_sql.svg b/src/components/icon/assets/vis_query_sql.svg
new file mode 100644
index 0000000000..3f88cd9149
--- /dev/null
+++ b/src/components/icon/assets/vis_query_sql.svg
@@ -0,0 +1,10 @@
+<!--
+  - Copyright OpenSearch Contributors
+  - SPDX-License-Identifier: Apache-2.0
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M10.5 2C10.5 2.02163 10.4993 2.0431 10.498 2.06438L12.0566 3.10345C12.1902 3.03723 12.3408 3 12.5 3C13.0523 3 13.5 3.44772 13.5 4C13.5 4.55228 13.0523 5 12.5 5C11.9477 5 11.5 4.55228 11.5 4C11.5 3.97837 11.5007 3.9569 11.502 3.93562L9.94344 2.89655C9.80981 2.96277 9.65925 3 9.5 3C9.41042 3 9.32359 2.98822 9.24098 2.96613L7.46613 4.74098C7.48822 4.82359 7.5 4.91042 7.5 5C7.5 5.55228 7.05228 6 6.5 6C5.94772 6 5.5 5.55228 5.5 5C5.5 4.97837 5.50069 4.9569 5.50204 4.93562L3.94344 3.89655C3.80981 3.96277 3.65925 4 3.5 4C2.94772 4 2.5 3.55228 2.5 3C2.5 2.44772 2.94772 2 3.5 2C4.05228 2 4.5 2.44772 4.5 3C4.5 3.02163 4.49931 3.0431 4.49796 3.06438L6.05656 4.10345C6.1902 4.03722 6.34075 4 6.5 4C6.58958 4 6.67641 4.01178 6.75902 4.03387L8.53387 2.25902C8.51178 2.17641 8.5 2.08958 8.5 2C8.5 1.44772 8.94771 1 9.5 1C10.0523 1 10.5 1.44772 10.5 2Z"/>
+  <path d="M8.5 9C8.5 9.27614 8.27614 9.5 8 9.5C7.72386 9.5 7.5 9.27614 7.5 9V8.5H5.5V9C5.5 9.27614 5.27614 9.5 5 9.5C4.72386 9.5 4.5 9.27614 4.5 9V7.5H2.5V9C2.5 9.27614 2.27614 9.5 2 9.5C1.72386 9.5 1.5 9.27614 1.5 9V7.2C1.5 6.8134 1.8134 6.5 2.2 6.5H4.8C5.1866 6.5 5.5 6.8134 5.5 7.2V7.5H7.5V6.2C7.5 5.8134 7.8134 5.5 8.2 5.5H10.8C11.1866 5.5 11.5 5.8134 11.5 6.2V7H13.8C14.1866 7 14.5 7.3134 14.5 7.7V14.5C14.5 14.7761 14.2761 15 14 15C13.7239 15 13.5 14.7761 13.5 14.5V8H11.5V14.5C11.5 14.7761 11.2761 15 11 15C10.7239 15 10.5 14.7761 10.5 14.5V6.5H8.5V9Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1.6 10C1.26863 10 1 10.2686 1 10.6V14.4609C1 14.7922 1.26863 15.0609 1.6 15.0609H9.07576C9.40713 15.0609 9.67576 14.7922 9.67576 14.4609V10.6C9.67576 10.2686 9.40713 10 9.07576 10H1.6ZM7.21763 10.723V13.398C7.21763 13.8772 7.60605 14.2656 8.0852 14.2656H9.31427V13.6872H8.0852C7.92549 13.6872 7.79601 13.5577 7.79601 13.398V10.723H7.21763ZM1.79528 11.8075C1.79528 11.2485 2.24844 10.7953 2.80745 10.7953H3.89192V11.3737H2.80745C2.56788 11.3737 2.37366 11.5679 2.37366 11.8075C2.37366 12.047 2.56788 12.2412 2.80745 12.2412C3.36646 12.2412 3.81962 12.6944 3.81962 13.2534C3.81962 13.8124 3.36646 14.2656 2.80745 14.2656H1.72298V13.6872H2.80745C3.04702 13.6872 3.24124 13.493 3.24124 13.2534C3.24124 13.0138 3.04702 12.8196 2.80745 12.8196C2.24844 12.8196 1.79528 12.3665 1.79528 11.8075ZM6.35005 11.6629V13.7344C6.49754 13.7811 6.62524 13.8545 6.71832 13.9165C6.79801 13.9696 6.86384 14.0223 6.90991 14.0618C6.9331 14.0817 6.95168 14.0986 6.96492 14.1109L6.9808 14.126L6.98564 14.1307L6.98726 14.1323L6.98822 14.1333C6.98828 14.1333 6.98833 14.1334 6.78384 14.3379C6.57935 14.5424 6.5794 14.5424 6.57945 14.5425L6.57858 14.5416L6.57028 14.5338C6.56234 14.5264 6.54986 14.515 6.5335 14.501C6.5005 14.4727 6.45337 14.435 6.39749 14.3978C6.27634 14.317 6.15468 14.2656 6.06086 14.2656H5.19328C4.71413 14.2656 4.32571 13.8772 4.32571 13.398V11.6629C4.32571 11.1837 4.71413 10.7953 5.19328 10.7953H5.48248C5.96162 10.7953 6.35005 11.1837 6.35005 11.6629ZM4.90409 11.6629C4.90409 11.5031 5.03357 11.3737 5.19328 11.3737H5.48248C5.64219 11.3737 5.77167 11.5031 5.77167 11.6629V13.6872H5.19328C5.03357 13.6872 4.90409 13.5577 4.90409 13.398V11.6629Z"/>
+</svg>
diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index 58ae00d14c..c2f1ea61e3 100644
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -329,10 +329,12 @@ const typeToPathMap = {
   plus: 'plus',
   plusInCircle: 'plus_in_circle',
   plusInCircleFilled: 'plus_in_circle_filled',
+  polygon: 'polygon',
   popout: 'popout',
   push: 'push',
   questionInCircle: 'question_in_circle',
   quote: 'quote',
+  radius: 'radius',
   recentlyViewedApp: 'app_recently_viewed',
   refresh: 'refresh',
   regressionJob: 'ml_regression_job',
@@ -403,6 +405,8 @@ const typeToPathMap = {
   visBarHorizontalStacked: 'vis_bar_horizontal_stacked',
   visBarVertical: 'vis_bar_vertical',
   visBarVerticalStacked: 'vis_bar_vertical_stacked',
+  visBuilder: 'vis_builder',
+  visBuilderSavedObject: 'vis_builder_saved_object',
   visGauge: 'vis_gauge',
   visGoal: 'vis_goal',
   visLine: 'vis_line',
@@ -410,6 +414,10 @@ const typeToPathMap = {
   visMapRegion: 'vis_map_region',
   visMetric: 'vis_metric',
   visPie: 'vis_pie',
+  visQueryDQL: 'vis_query_dql',
+  visQueryPPL: 'vis_query_ppl',
+  visQueryPromQL: 'vis_query_promql',
+  visQuerySQL: 'vis_query_sql',
   visTable: 'vis_table',
   visTagCloud: 'vis_tag_cloud',
   visText: 'vis_text',