From 0d895ea07f04fab9d3992436d43a055886b06b09 Mon Sep 17 00:00:00 2001
From: Scott Dickerson <swiftfoot@hotmail.com>
Date: Wed, 27 May 2020 17:42:02 -0500
Subject: [PATCH 1/8] fix(table): set toolbar buttons to correct size

---
 .../Table/TableToolbar/TableToolbar.jsx       | 36 ++++++++++++-------
 .../TableToolbar/TableToolbarSVGButton.jsx    | 20 ++++++-----
 .../_table-toolbar-svg-button.scss            | 31 ++++------------
 .../Table/TableToolbar/_table-toolbar.scss    |  6 ----
 .../TableToolbarSearch/TableToolbarSearch.jsx | 12 +++++--
 5 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/src/components/Table/TableToolbar/TableToolbar.jsx b/src/components/Table/TableToolbar/TableToolbar.jsx
index 077ddabeef..0f8e036d68 100644
--- a/src/components/Table/TableToolbar/TableToolbar.jsx
+++ b/src/components/Table/TableToolbar/TableToolbar.jsx
@@ -205,24 +205,36 @@ const TableToolbar = ({
           </Button>
         ) : null}
         {onDownloadCSV ? (
-          <TableToolbarSVGButton onClick={onDownloadCSV} testId="download-button">
-            <Download20 description={i18n.downloadIconDescription} />
-          </TableToolbarSVGButton>
+          <TableToolbarSVGButton
+            onClick={onDownloadCSV}
+            description={i18n.downloadIconDescription}
+            testId="download-button"
+            renderIcon={Download20}
+          />
         ) : null}
         {hasColumnSelection ? (
-          <TableToolbarSVGButton onClick={onToggleColumnSelection} testId="column-selection-button">
-            <Column20 description={i18n.columnSelectionButtonAria} />
-          </TableToolbarSVGButton>
+          <TableToolbarSVGButton
+            onClick={onToggleColumnSelection}
+            description={i18n.columnSelectionButtonAria}
+            testId="column-selection-button"
+            renderIcon={Column20}
+          />
         ) : null}
         {hasFilter ? (
-          <TableToolbarSVGButton onClick={onToggleFilter} testId="filter-button">
-            <Filter20 description={i18n.filterButtonAria} />
-          </TableToolbarSVGButton>
+          <TableToolbarSVGButton
+            onClick={onToggleFilter}
+            description={i18n.filterButtonAria}
+            testId="filter-button"
+            renderIcon={Filter20}
+          />
         ) : null}
         {hasRowEdit ? (
-          <TableToolbarSVGButton onClick={onShowRowEdit} testId="row-edit-button">
-            <Edit20 description={i18n.editButtonAria} />
-          </TableToolbarSVGButton>
+          <TableToolbarSVGButton
+            description={i18n.editButtonAria}
+            onClick={onShowRowEdit}
+            testId="row-edit-button"
+            renderIcon={Edit20}
+          />
         ) : null}
 
         {// Default card header actions should be to the right of the table-specific actions
diff --git a/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx b/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
index df6a922489..850053fe27 100644
--- a/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
+++ b/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Button } from 'carbon-components-react';
 
 import { settings } from '../../../constants/Settings';
 import { keyCodes } from '../../../constants/KeyCodeConstants';
@@ -9,26 +10,29 @@ const { iotPrefix } = settings;
 const propTypes = {
   onClick: PropTypes.func.isRequired,
   testId: PropTypes.string.isRequired,
-  children: PropTypes.node.isRequired,
+  renderIcon: PropTypes.func.isRequired,
+  description: PropTypes.node.isRequired,
 };
 
 /**
  * Toolbar button that accepts a Carbon react icon as children
  */
-const TableToolbarSVGButton = ({ onClick, testId, children }) => {
+const TableToolbarSVGButton = ({ onClick, testId, description, renderIcon }) => {
   return (
-    <div
+    <Button
       className={`${iotPrefix}--tooltip-svg-wrapper`}
+      hasIconOnly
       onClick={onClick}
-      role="button"
-      tabIndex={0}
+      kind="ghost"
+      renderIcon={renderIcon}
+      tooltipAlignment="center"
+      tooltipPosition="top"
       onKeyDown={e => {
         if (e.keyCode === keyCodes.ENTER) onClick();
       }}
+      iconDescription={description}
       data-testid={testId}
-    >
-      {children}
-    </div>
+    />
   );
 };
 
diff --git a/src/components/Table/TableToolbar/_table-toolbar-svg-button.scss b/src/components/Table/TableToolbar/_table-toolbar-svg-button.scss
index 0df8c2c49e..2172527a86 100644
--- a/src/components/Table/TableToolbar/_table-toolbar-svg-button.scss
+++ b/src/components/Table/TableToolbar/_table-toolbar-svg-button.scss
@@ -1,28 +1,9 @@
 @import '../../../globals/vars';
 
-.#{$iot-prefix}--tooltip-svg-wrapper {
-  background: transparent;
-  border: none;
-  display: flex;
-  cursor: pointer;
-  height: auto;
-  min-width: $spacing-09;
-  outline: 2px solid transparent;
-
-  &:hover {
-    background: $hover-ui;
-  }
-
-  &:active,
-  &:focus {
-    outline: 2px solid $focus;
-    outline-offset: -2px;
-  }
-
-  svg {
-    margin: 0 auto;
-    height: auto;
-    width: auto;
-    fill: $carbon--gray-70;
-  }
+button.#{$iot-prefix}--tooltip-svg-wrapper,
+.#{$iot-prefix}--tooltip-svg-wrapper.#{$prefix}--btn--ghost:hover {
+  color: $carbon--gray-70;
+}
+button.bx--btn.#{$iot-prefix}--tooltip-svg-wrapper.#{$prefix}--btn--ghost {
+  border: 0;
 }
diff --git a/src/components/Table/TableToolbar/_table-toolbar.scss b/src/components/Table/TableToolbar/_table-toolbar.scss
index f95fbc0c92..5b48da3bc6 100644
--- a/src/components/Table/TableToolbar/_table-toolbar.scss
+++ b/src/components/Table/TableToolbar/_table-toolbar.scss
@@ -4,12 +4,6 @@
 div.#{$prefix}--toolbar-action.#{$prefix}--toolbar-search-container-expandable {
   > div.#{$prefix}--search.#{$prefix}--search--sm.table-toolbar-search {
     flex-grow: 2;
-
-    > svg.#{$prefix}--search-magnifier {
-      height: 20px;
-      fill: $icon-02;
-      padding: 0;
-    }
   }
 }
 
diff --git a/src/components/Table/TableToolbarSearch/TableToolbarSearch.jsx b/src/components/Table/TableToolbarSearch/TableToolbarSearch.jsx
index 172d86d531..9e14e89915 100644
--- a/src/components/Table/TableToolbarSearch/TableToolbarSearch.jsx
+++ b/src/components/Table/TableToolbarSearch/TableToolbarSearch.jsx
@@ -53,7 +53,7 @@ const TableToolbarSearch = ({
 
   useEffect(
     () => {
-      if (focusTarget) {
+      if (focusTarget && focusTarget.current) {
         focusTarget.current.querySelector('input').focus();
         setFocusTarget(null);
       }
@@ -76,8 +76,13 @@ const TableToolbarSearch = ({
   };
 
   const onClick = e => {
-    setFocusTarget(toolbarSearch);
-    handleExpand(e, true);
+    if (
+      !expanded && // if we're not already expanded or focused
+      !focusTarget
+    ) {
+      setFocusTarget(toolbarSearch);
+      handleExpand(e, true);
+    }
   };
 
   const onBlur = e => {
@@ -97,6 +102,7 @@ const TableToolbarSearch = ({
       className={classnames(`${iotPrefix}--table-toolbar-search`, {
         [`${iotPrefix}--table-toolbar-search__expanded`]: expanded,
       })}
+      onFocus={onClick}
       onClick={onClick}
       onKeyDown={onKeyDown}
       role="button"

From 5289496c89a49b3d99348fe06d97c9793b02969d Mon Sep 17 00:00:00 2001
From: Scott Dickerson <swiftfoot@hotmail.com>
Date: Thu, 28 May 2020 11:27:53 -0500
Subject: [PATCH 2/8] chore(carbon): upgrade carbon components

---
 .../__snapshots__/Welcome.story.storyshot     |   39 +-
 package.json                                  |    6 +-
 .../AccordionItemDefer.story.storyshot        |   22 +-
 .../Card/__snapshots__/Card.story.storyshot   |    5 +-
 .../ComposedModal.story.storyshot             |   36 +-
 .../__snapshots__/Dashboard.story.storyshot   |  921 ++---
 .../__snapshots__/FileDrop.story.storyshot    |   12 +-
 .../__snapshots__/Header.story.storyshot      |  100 +-
 .../Header/__snapshots__/Header.test.jsx.snap |   25 +-
 .../HotspotContent.story.storyshot            |   20 +-
 .../NavigationBar.story.storyshot             |   16 +-
 .../PageTitleBar.story.storyshot              |    8 +-
 .../ProgressIndicator.story.storyshot         |    4 +-
 .../__snapshots__/SideNav.story.storyshot     |   37 +-
 src/components/StorybookSnapshots.test.js     |    8 +
 src/components/Table/Table.test.jsx           |   29 +-
 .../TableBodyRow.story.storyshot              |   16 +-
 .../TableDetailWizard.story.storyshot         |    8 +-
 .../Table/TableToolbar/TableToolbar.jsx       |   11 +-
 .../TableToolbar/TableToolbarSVGButton.jsx    |    2 +-
 .../TableToolbarSearch/TableToolbarSearch.jsx |  124 -
 .../_table-toolbar-search.scss                |   27 -
 .../Table/__snapshots__/Table.story.storyshot | 3528 +++++++++--------
 src/components/Table/baseTableReducer.js      |    2 +-
 src/components/Table/tableReducer.test.jsx    |    2 +-
 .../__snapshots__/TableCard.story.storyshot   | 2982 +++++++-------
 .../__snapshots__/TileCatalog.story.storyshot |    4 +-
 .../TileGallery/TileGallerySection.jsx        |   10 +-
 .../WizardInline.story.storyshot              |   24 +-
 .../__snapshots__/WizardModal.story.storyshot |   20 +-
 src/index.js                                  |    1 -
 src/styles.scss                               |    1 -
 .../__snapshots__/publicAPI.test.js.snap      |  197 +-
 yarn.lock                                     |   35 +-
 34 files changed, 4174 insertions(+), 4108 deletions(-)
 delete mode 100644 src/components/Table/TableToolbarSearch/TableToolbarSearch.jsx
 delete mode 100644 src/components/Table/TableToolbarSearch/_table-toolbar-search.scss

diff --git a/.storybook/__snapshots__/Welcome.story.storyshot b/.storybook/__snapshots__/Welcome.story.storyshot
index 875546b6a0..7998d74dd7 100644
--- a/.storybook/__snapshots__/Welcome.story.storyshot
+++ b/.storybook/__snapshots__/Welcome.story.storyshot
@@ -59,26 +59,26 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
           onAnimationEnd={[Function]}
         >
           <button
+            aria-controls="accordion-item-1"
             aria-expanded={false}
             className="bx--accordion__heading"
             onClick={[Function]}
             onKeyDown={[Function]}
-            title="Expand/Collapse"
+            title="Exports table"
             type="button"
           >
             <svg
-              aria-label="Expand/Collapse"
+              aria-hidden={true}
               className="bx--accordion__arrow"
               focusable="false"
               height={16}
               preserveAspectRatio="xMidYMid meet"
-              role="img"
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+              <path
+                d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
               />
             </svg>
             <div
@@ -89,6 +89,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
           </button>
           <div
             className="bx--accordion__content"
+            id="accordion-item-1"
           >
             <p>
               The following table shows a comparison of exports from carbon-components-react and this library. These are primarily used for snapshot purposes to track and ensure that as the exports change upstream in Carbon we continue to provide parity with their package.
@@ -591,9 +592,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
                   </div>
                   <div
                     className="bx--structured-list-td"
-                  >
-                    TableToolbarSearch
-                  </div>
+                  />
                 </div>
                 <div
                   className="bx--structured-list-row"
@@ -757,6 +756,18 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
                     Form
                   </div>
                 </div>
+                <div
+                  className="bx--structured-list-row"
+                >
+                  <div
+                    className="bx--structured-list-td"
+                  >
+                    FluidForm
+                  </div>
+                  <div
+                    className="bx--structured-list-td"
+                  />
+                </div>
                 <div
                   className="bx--structured-list-row"
                 >
@@ -1913,6 +1924,18 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0/Getting Starte
                     NumberInputSkeleton
                   </div>
                 </div>
+                <div
+                  className="bx--structured-list-row"
+                >
+                  <div
+                    className="bx--structured-list-td"
+                  >
+                    PaginationSkeleton
+                  </div>
+                  <div
+                    className="bx--structured-list-td"
+                  />
+                </div>
                 <div
                   className="bx--structured-list-row"
                 >
diff --git a/package.json b/package.json
index 2c82edce17..779ec5253c 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "lint:stylelint": "stylelint './src/**/*.scss' --syntax scss --ignorePath .gitignore",
     "prepare": "yarn build",
     "publish-npm": "yarn semantic-release",
-    "start": "yarn test:engines && yarn storybook",
+    "start": "yarn test:engines && NODE_OPTIONS='--max-old-space-size=16384' yarn storybook",
     "storybook": "yarn test:engines && start-storybook -p 3000 -s public/development",
     "test": "yarn test:engines && yarn test:a11y && yarn test:base",
     "test:base": "yarn test:engines && cross-env NODE_ICU_DATA=node_modules/full-icu TZ=America/Chicago jest --testPathPattern='.*\\.test\\.js(x)?' --coverage",
@@ -86,8 +86,8 @@
     "@carbon/layout": "10.7.1",
     "@carbon/motion": "10.6.0",
     "@carbon/themes": "10.10.3",
-    "carbon-components": "10.10.3",
-    "carbon-components-react": "7.10.3",
+    "carbon-components": "^10.12.0",
+    "carbon-components-react": "^7.12.0",
     "carbon-icons": "7.0.7",
     "classnames": "^2.2.5",
     "core-js": "3.6.4",
diff --git a/src/components/Accordion/__snapshots__/AccordionItemDefer.story.storyshot b/src/components/Accordion/__snapshots__/AccordionItemDefer.story.storyshot
index 89628254b5..15ee1169f3 100644
--- a/src/components/Accordion/__snapshots__/AccordionItemDefer.story.storyshot
+++ b/src/components/Accordion/__snapshots__/AccordionItemDefer.story.storyshot
@@ -28,26 +28,26 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Accor
           onAnimationEnd={[Function]}
         >
           <button
+            aria-controls="accordion-item-2"
             aria-expanded={false}
             className="bx--accordion__heading"
             onClick={[Function]}
             onKeyDown={[Function]}
-            title="Expand/Collapse"
+            title="A section without deferred content rendering"
             type="button"
           >
             <svg
-              aria-label="Expand/Collapse"
+              aria-hidden={true}
               className="bx--accordion__arrow"
               focusable="false"
               height={16}
               preserveAspectRatio="xMidYMid meet"
-              role="img"
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+              <path
+                d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
               />
             </svg>
             <div
@@ -58,6 +58,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Accor
           </button>
           <div
             className="bx--accordion__content"
+            id="accordion-item-2"
           >
             <p>
               This content is always rendered to the DOM, no matter if the accordion item has been open or closed.
@@ -71,26 +72,26 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Accor
           onAnimationEnd={[Function]}
         >
           <button
+            aria-controls="accordion-item-3"
             aria-expanded={false}
             className="bx--accordion__heading"
             onClick={[Function]}
             onKeyDown={[Function]}
-            title="Expand/Collapse"
+            title="A section with deferred content rendering"
             type="button"
           >
             <svg
-              aria-label="Expand/Collapse"
+              aria-hidden={true}
               className="bx--accordion__arrow"
               focusable="false"
               height={16}
               preserveAspectRatio="xMidYMid meet"
-              role="img"
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+              <path
+                d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
               />
             </svg>
             <div
@@ -101,6 +102,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Accor
           </button>
           <div
             className="bx--accordion__content"
+            id="accordion-item-3"
           />
         </li>
       </ul>
diff --git a/src/components/Card/__snapshots__/Card.story.storyshot b/src/components/Card/__snapshots__/Card.story.storyshot
index 5cbb977d61..a6c524d62a 100644
--- a/src/components/Card/__snapshots__/Card.story.storyshot
+++ b/src/components/Card/__snapshots__/Card.story.storyshot
@@ -1920,11 +1920,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Card
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <polygon
-                    points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                  />
                   <path
-                    d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                    d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                   />
                   <path
                     d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
diff --git a/src/components/ComposedModal/__snapshots__/ComposedModal.story.storyshot b/src/components/ComposedModal/__snapshots__/ComposedModal.story.storyshot
index 6d5a5ebdfd..83901e390a 100644
--- a/src/components/ComposedModal/__snapshots__/ComposedModal.story.storyshot
+++ b/src/components/ComposedModal/__snapshots__/ComposedModal.story.storyshot
@@ -63,8 +63,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -195,8 +195,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -309,8 +309,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -378,8 +378,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -575,8 +575,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -702,8 +702,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -807,8 +807,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -925,8 +925,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -1090,8 +1090,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Compo
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
diff --git a/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot b/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
index e65cb48dd3..a386466c24 100644
--- a/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
+++ b/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
@@ -915,11 +915,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                          />
                           <path
-                            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                           />
                           <path
                             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -1318,96 +1315,95 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                         className="bx--toolbar-content iot--table-toolbar-content"
                       >
                         <div
-                          className="iot--table-toolbar-search"
+                          className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                          onBlur={[Function]}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
-                          role="button"
-                          tabIndex="-1"
+                          onFocus={[Function]}
+                          tabIndex="0"
                         >
                           <div
-                            className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                            onBlur={[Function]}
-                            onClick={[Function]}
-                            onFocus={[Function]}
-                            tabIndex="0"
+                            aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
+                            className="bx--search bx--search--sm table-toolbar-search"
+                            role="search"
                           >
-                            <div
-                              aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
-                              className="bx--search bx--search--sm table-toolbar-search"
-                              role="search"
+                            <svg
+                              aria-hidden={true}
+                              className="bx--search-magnifier"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                              />
+                            </svg>
+                            <label
+                              className="bx--label"
+                              htmlFor="table-for-card-alert-table1-toolbar-search"
+                              id="table-for-card-alert-table1-toolbar-search-search"
+                            >
+                              Search
+                            </label>
+                            <input
+                              aria-hidden={true}
+                              autoComplete="off"
+                              className="bx--search-input"
+                              disabled={false}
+                              id="table-for-card-alert-table1-toolbar-search"
+                              onChange={[Function]}
+                              placeholder="Search"
+                              role="searchbox"
+                              tabIndex="-1"
+                              type="text"
+                              value=""
+                            />
+                            <button
+                              aria-label="Clear search input"
+                              className="bx--search-close bx--search-close--hidden"
+                              onClick={[Function]}
+                              type="button"
                             >
                               <svg
                                 aria-hidden={true}
-                                className="bx--search-magnifier"
                                 focusable="false"
                                 height={16}
                                 preserveAspectRatio="xMidYMid meet"
-                                viewBox="0 0 16 16"
+                                viewBox="0 0 32 32"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
                               >
                                 <path
-                                  d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                                  d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                                 />
                               </svg>
-                              <label
-                                className="bx--label"
-                                htmlFor="table-for-card-alert-table1-toolbar-search"
-                                id="table-for-card-alert-table1-toolbar-search-search"
-                              >
-                                Search
-                              </label>
-                              <input
-                                aria-hidden={true}
-                                autoComplete="off"
-                                className="bx--search-input"
-                                disabled={false}
-                                id="table-for-card-alert-table1-toolbar-search"
-                                onBlur={[Function]}
-                                onChange={[Function]}
-                                placeholder="Search"
-                                role="searchbox"
-                                tabIndex="-1"
-                                type="text"
-                                value=""
-                              />
-                              <button
-                                aria-label="Clear search input"
-                                className="bx--search-close bx--search-close--hidden"
-                                onClick={[Function]}
-                                type="button"
-                              >
-                                <svg
-                                  aria-hidden={true}
-                                  focusable="false"
-                                  height={16}
-                                  preserveAspectRatio="xMidYMid meet"
-                                  viewBox="0 0 32 32"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <polygon
-                                    points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                                  />
-                                </svg>
-                              </button>
-                            </div>
+                            </button>
                           </div>
                         </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Download table content
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Download table content"
+                            aria-hidden="true"
+                            aria-label="Download table content"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -1419,21 +1415,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                             />
                           </svg>
-                        </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        </button>
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Filters
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Filters"
+                            aria-hidden="true"
+                            aria-label="Filters"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -1442,7 +1446,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                             />
                           </svg>
-                        </div>
+                        </button>
                         <div
                           className="react-grid-item iot--card--toolbar"
                         >
@@ -3120,11 +3124,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                          />
                           <path
-                            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                           />
                           <path
                             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -3523,96 +3524,95 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                         className="bx--toolbar-content iot--table-toolbar-content"
                       >
                         <div
-                          className="iot--table-toolbar-search"
+                          className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                          onBlur={[Function]}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
-                          role="button"
-                          tabIndex="-1"
+                          onFocus={[Function]}
+                          tabIndex="0"
                         >
                           <div
-                            className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                            onBlur={[Function]}
-                            onClick={[Function]}
-                            onFocus={[Function]}
-                            tabIndex="0"
+                            aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
+                            className="bx--search bx--search--sm table-toolbar-search"
+                            role="search"
                           >
-                            <div
-                              aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
-                              className="bx--search bx--search--sm table-toolbar-search"
-                              role="search"
+                            <svg
+                              aria-hidden={true}
+                              className="bx--search-magnifier"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                              />
+                            </svg>
+                            <label
+                              className="bx--label"
+                              htmlFor="table-for-card-alert-table1-toolbar-search"
+                              id="table-for-card-alert-table1-toolbar-search-search"
+                            >
+                              Search
+                            </label>
+                            <input
+                              aria-hidden={true}
+                              autoComplete="off"
+                              className="bx--search-input"
+                              disabled={false}
+                              id="table-for-card-alert-table1-toolbar-search"
+                              onChange={[Function]}
+                              placeholder="Search"
+                              role="searchbox"
+                              tabIndex="-1"
+                              type="text"
+                              value=""
+                            />
+                            <button
+                              aria-label="Clear search input"
+                              className="bx--search-close bx--search-close--hidden"
+                              onClick={[Function]}
+                              type="button"
                             >
                               <svg
                                 aria-hidden={true}
-                                className="bx--search-magnifier"
                                 focusable="false"
                                 height={16}
                                 preserveAspectRatio="xMidYMid meet"
-                                viewBox="0 0 16 16"
+                                viewBox="0 0 32 32"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
                               >
                                 <path
-                                  d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                                  d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                                 />
                               </svg>
-                              <label
-                                className="bx--label"
-                                htmlFor="table-for-card-alert-table1-toolbar-search"
-                                id="table-for-card-alert-table1-toolbar-search-search"
-                              >
-                                Search
-                              </label>
-                              <input
-                                aria-hidden={true}
-                                autoComplete="off"
-                                className="bx--search-input"
-                                disabled={false}
-                                id="table-for-card-alert-table1-toolbar-search"
-                                onBlur={[Function]}
-                                onChange={[Function]}
-                                placeholder="Search"
-                                role="searchbox"
-                                tabIndex="-1"
-                                type="text"
-                                value=""
-                              />
-                              <button
-                                aria-label="Clear search input"
-                                className="bx--search-close bx--search-close--hidden"
-                                onClick={[Function]}
-                                type="button"
-                              >
-                                <svg
-                                  aria-hidden={true}
-                                  focusable="false"
-                                  height={16}
-                                  preserveAspectRatio="xMidYMid meet"
-                                  viewBox="0 0 32 32"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <polygon
-                                    points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                                  />
-                                </svg>
-                              </button>
-                            </div>
+                            </button>
                           </div>
                         </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Download table content
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Download table content"
+                            aria-hidden="true"
+                            aria-label="Download table content"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -3624,21 +3624,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                             />
                           </svg>
-                        </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        </button>
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Filters
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Filters"
+                            aria-hidden="true"
+                            aria-label="Filters"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -3647,7 +3655,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                             />
                           </svg>
-                        </div>
+                        </button>
                         <div
                           className="react-grid-item iot--card--toolbar"
                         >
@@ -5357,11 +5365,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                          />
                           <path
-                            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                           />
                           <path
                             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -5760,96 +5765,95 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                         className="bx--toolbar-content iot--table-toolbar-content"
                       >
                         <div
-                          className="iot--table-toolbar-search"
+                          className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                          onBlur={[Function]}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
-                          role="button"
-                          tabIndex="-1"
+                          onFocus={[Function]}
+                          tabIndex="0"
                         >
                           <div
-                            className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                            onBlur={[Function]}
-                            onClick={[Function]}
-                            onFocus={[Function]}
-                            tabIndex="0"
+                            aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
+                            className="bx--search bx--search--sm table-toolbar-search"
+                            role="search"
                           >
-                            <div
-                              aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
-                              className="bx--search bx--search--sm table-toolbar-search"
-                              role="search"
+                            <svg
+                              aria-hidden={true}
+                              className="bx--search-magnifier"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                              />
+                            </svg>
+                            <label
+                              className="bx--label"
+                              htmlFor="table-for-card-alert-table1-toolbar-search"
+                              id="table-for-card-alert-table1-toolbar-search-search"
+                            >
+                              Search
+                            </label>
+                            <input
+                              aria-hidden={true}
+                              autoComplete="off"
+                              className="bx--search-input"
+                              disabled={false}
+                              id="table-for-card-alert-table1-toolbar-search"
+                              onChange={[Function]}
+                              placeholder="Search"
+                              role="searchbox"
+                              tabIndex="-1"
+                              type="text"
+                              value=""
+                            />
+                            <button
+                              aria-label="Clear search input"
+                              className="bx--search-close bx--search-close--hidden"
+                              onClick={[Function]}
+                              type="button"
                             >
                               <svg
                                 aria-hidden={true}
-                                className="bx--search-magnifier"
                                 focusable="false"
                                 height={16}
                                 preserveAspectRatio="xMidYMid meet"
-                                viewBox="0 0 16 16"
+                                viewBox="0 0 32 32"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
                               >
                                 <path
-                                  d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                                  d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                                 />
                               </svg>
-                              <label
-                                className="bx--label"
-                                htmlFor="table-for-card-alert-table1-toolbar-search"
-                                id="table-for-card-alert-table1-toolbar-search-search"
-                              >
-                                Search
-                              </label>
-                              <input
-                                aria-hidden={true}
-                                autoComplete="off"
-                                className="bx--search-input"
-                                disabled={false}
-                                id="table-for-card-alert-table1-toolbar-search"
-                                onBlur={[Function]}
-                                onChange={[Function]}
-                                placeholder="Search"
-                                role="searchbox"
-                                tabIndex="-1"
-                                type="text"
-                                value=""
-                              />
-                              <button
-                                aria-label="Clear search input"
-                                className="bx--search-close bx--search-close--hidden"
-                                onClick={[Function]}
-                                type="button"
-                              >
-                                <svg
-                                  aria-hidden={true}
-                                  focusable="false"
-                                  height={16}
-                                  preserveAspectRatio="xMidYMid meet"
-                                  viewBox="0 0 32 32"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <polygon
-                                    points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                                  />
-                                </svg>
-                              </button>
-                            </div>
+                            </button>
                           </div>
                         </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Download table content
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Download table content"
+                            aria-hidden="true"
+                            aria-label="Download table content"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -5861,21 +5865,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                             />
                           </svg>
-                        </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        </button>
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Filters
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Filters"
+                            aria-hidden="true"
+                            aria-label="Filters"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -5884,7 +5896,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                             />
                           </svg>
-                        </div>
+                        </button>
                         <div
                           className="react-grid-item iot--card--toolbar"
                         >
@@ -7410,95 +7422,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                         className="bx--toolbar-content iot--table-toolbar-content"
                       >
                         <div
-                          className="iot--table-toolbar-search"
+                          className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                          onBlur={[Function]}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
-                          role="button"
-                          tabIndex="-1"
+                          onFocus={[Function]}
+                          tabIndex="0"
                         >
                           <div
-                            className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                            onBlur={[Function]}
-                            onClick={[Function]}
-                            onFocus={[Function]}
-                            tabIndex="0"
+                            aria-labelledby="table-for-card-expandedcard-toolbar-search-search"
+                            className="bx--search bx--search--sm table-toolbar-search"
+                            role="search"
                           >
-                            <div
-                              aria-labelledby="table-for-card-expandedcard-toolbar-search-search"
-                              className="bx--search bx--search--sm table-toolbar-search"
-                              role="search"
+                            <svg
+                              aria-hidden={true}
+                              className="bx--search-magnifier"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                              />
+                            </svg>
+                            <label
+                              className="bx--label"
+                              htmlFor="table-for-card-expandedcard-toolbar-search"
+                              id="table-for-card-expandedcard-toolbar-search-search"
+                            >
+                              Search
+                            </label>
+                            <input
+                              aria-hidden={true}
+                              autoComplete="off"
+                              className="bx--search-input"
+                              id="table-for-card-expandedcard-toolbar-search"
+                              onChange={[Function]}
+                              placeholder="Search"
+                              role="searchbox"
+                              tabIndex="-1"
+                              type="text"
+                              value=""
+                            />
+                            <button
+                              aria-label="Clear search input"
+                              className="bx--search-close bx--search-close--hidden"
+                              onClick={[Function]}
+                              type="button"
                             >
                               <svg
                                 aria-hidden={true}
-                                className="bx--search-magnifier"
                                 focusable="false"
                                 height={16}
                                 preserveAspectRatio="xMidYMid meet"
-                                viewBox="0 0 16 16"
+                                viewBox="0 0 32 32"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
                               >
                                 <path
-                                  d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                                  d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                                 />
                               </svg>
-                              <label
-                                className="bx--label"
-                                htmlFor="table-for-card-expandedcard-toolbar-search"
-                                id="table-for-card-expandedcard-toolbar-search-search"
-                              >
-                                Search
-                              </label>
-                              <input
-                                aria-hidden={true}
-                                autoComplete="off"
-                                className="bx--search-input"
-                                id="table-for-card-expandedcard-toolbar-search"
-                                onBlur={[Function]}
-                                onChange={[Function]}
-                                placeholder="Search"
-                                role="searchbox"
-                                tabIndex="-1"
-                                type="text"
-                                value=""
-                              />
-                              <button
-                                aria-label="Clear search input"
-                                className="bx--search-close bx--search-close--hidden"
-                                onClick={[Function]}
-                                type="button"
-                              >
-                                <svg
-                                  aria-hidden={true}
-                                  focusable="false"
-                                  height={16}
-                                  preserveAspectRatio="xMidYMid meet"
-                                  viewBox="0 0 32 32"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <polygon
-                                    points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                                  />
-                                </svg>
-                              </button>
-                            </div>
+                            </button>
                           </div>
                         </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Download table content
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Download table content"
+                            aria-hidden="true"
+                            aria-label="Download table content"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -7510,21 +7521,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                             />
                           </svg>
-                        </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        </button>
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Filters
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Filters"
+                            aria-hidden="true"
+                            aria-label="Filters"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -7533,7 +7552,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                             />
                           </svg>
-                        </div>
+                        </button>
                         <div
                           className="react-grid-item iot--card--toolbar"
                         >
@@ -8952,8 +8971,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                                   width={16}
                                   xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <polygon
-                                    points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                                  <path
+                                    d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                                   />
                                 </svg>
                               </div>
@@ -9037,8 +9056,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                                   width={16}
                                   xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <polygon
-                                    points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                                  <path
+                                    d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                                   />
                                 </svg>
                               </div>
@@ -9066,8 +9085,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                             width={24}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="20,24 10,16 20,8"
+                            <path
+                              d="M20 24L10 16 20 8z"
                             />
                           </svg>
                         </button>
@@ -9087,8 +9106,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                             width={24}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="12,8 22,16 12,24"
+                            <path
+                              d="M12 8L22 16 12 24z"
                             />
                           </svg>
                         </button>
@@ -10051,11 +10070,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                          />
                           <path
-                            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                           />
                           <path
                             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -10454,96 +10470,95 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                         className="bx--toolbar-content iot--table-toolbar-content"
                       >
                         <div
-                          className="iot--table-toolbar-search"
+                          className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                          onBlur={[Function]}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
-                          role="button"
-                          tabIndex="-1"
+                          onFocus={[Function]}
+                          tabIndex="0"
                         >
                           <div
-                            className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                            onBlur={[Function]}
-                            onClick={[Function]}
-                            onFocus={[Function]}
-                            tabIndex="0"
+                            aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
+                            className="bx--search bx--search--sm table-toolbar-search"
+                            role="search"
                           >
-                            <div
-                              aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
-                              className="bx--search bx--search--sm table-toolbar-search"
-                              role="search"
+                            <svg
+                              aria-hidden={true}
+                              className="bx--search-magnifier"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                              />
+                            </svg>
+                            <label
+                              className="bx--label"
+                              htmlFor="table-for-card-alert-table1-toolbar-search"
+                              id="table-for-card-alert-table1-toolbar-search-search"
+                            >
+                              Search
+                            </label>
+                            <input
+                              aria-hidden={true}
+                              autoComplete="off"
+                              className="bx--search-input"
+                              disabled={false}
+                              id="table-for-card-alert-table1-toolbar-search"
+                              onChange={[Function]}
+                              placeholder="Search"
+                              role="searchbox"
+                              tabIndex="-1"
+                              type="text"
+                              value=""
+                            />
+                            <button
+                              aria-label="Clear search input"
+                              className="bx--search-close bx--search-close--hidden"
+                              onClick={[Function]}
+                              type="button"
                             >
                               <svg
                                 aria-hidden={true}
-                                className="bx--search-magnifier"
                                 focusable="false"
                                 height={16}
                                 preserveAspectRatio="xMidYMid meet"
-                                viewBox="0 0 16 16"
+                                viewBox="0 0 32 32"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
                               >
                                 <path
-                                  d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                                  d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                                 />
                               </svg>
-                              <label
-                                className="bx--label"
-                                htmlFor="table-for-card-alert-table1-toolbar-search"
-                                id="table-for-card-alert-table1-toolbar-search-search"
-                              >
-                                Search
-                              </label>
-                              <input
-                                aria-hidden={true}
-                                autoComplete="off"
-                                className="bx--search-input"
-                                disabled={false}
-                                id="table-for-card-alert-table1-toolbar-search"
-                                onBlur={[Function]}
-                                onChange={[Function]}
-                                placeholder="Search"
-                                role="searchbox"
-                                tabIndex="-1"
-                                type="text"
-                                value=""
-                              />
-                              <button
-                                aria-label="Clear search input"
-                                className="bx--search-close bx--search-close--hidden"
-                                onClick={[Function]}
-                                type="button"
-                              >
-                                <svg
-                                  aria-hidden={true}
-                                  focusable="false"
-                                  height={16}
-                                  preserveAspectRatio="xMidYMid meet"
-                                  viewBox="0 0 32 32"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <polygon
-                                    points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                                  />
-                                </svg>
-                              </button>
-                            </div>
+                            </button>
                           </div>
                         </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Download table content
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Download table content"
+                            aria-hidden="true"
+                            aria-label="Download table content"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -10555,21 +10570,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                             />
                           </svg>
-                        </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        </button>
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Filters
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Filters"
+                            aria-hidden="true"
+                            aria-label="Filters"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -10578,7 +10601,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                             />
                           </svg>
-                        </div>
+                        </button>
                         <div
                           className="react-grid-item iot--card--toolbar"
                         >
@@ -24380,11 +24403,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                          />
                           <path
-                            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                           />
                           <path
                             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -24783,96 +24803,95 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                         className="bx--toolbar-content iot--table-toolbar-content"
                       >
                         <div
-                          className="iot--table-toolbar-search"
+                          className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                          onBlur={[Function]}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
-                          role="button"
-                          tabIndex="-1"
+                          onFocus={[Function]}
+                          tabIndex="0"
                         >
                           <div
-                            className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                            onBlur={[Function]}
-                            onClick={[Function]}
-                            onFocus={[Function]}
-                            tabIndex="0"
+                            aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
+                            className="bx--search bx--search--sm table-toolbar-search"
+                            role="search"
                           >
-                            <div
-                              aria-labelledby="table-for-card-alert-table1-toolbar-search-search"
-                              className="bx--search bx--search--sm table-toolbar-search"
-                              role="search"
+                            <svg
+                              aria-hidden={true}
+                              className="bx--search-magnifier"
+                              focusable="false"
+                              height={16}
+                              preserveAspectRatio="xMidYMid meet"
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                              />
+                            </svg>
+                            <label
+                              className="bx--label"
+                              htmlFor="table-for-card-alert-table1-toolbar-search"
+                              id="table-for-card-alert-table1-toolbar-search-search"
+                            >
+                              Search
+                            </label>
+                            <input
+                              aria-hidden={true}
+                              autoComplete="off"
+                              className="bx--search-input"
+                              disabled={false}
+                              id="table-for-card-alert-table1-toolbar-search"
+                              onChange={[Function]}
+                              placeholder="Search"
+                              role="searchbox"
+                              tabIndex="-1"
+                              type="text"
+                              value=""
+                            />
+                            <button
+                              aria-label="Clear search input"
+                              className="bx--search-close bx--search-close--hidden"
+                              onClick={[Function]}
+                              type="button"
                             >
                               <svg
                                 aria-hidden={true}
-                                className="bx--search-magnifier"
                                 focusable="false"
                                 height={16}
                                 preserveAspectRatio="xMidYMid meet"
-                                viewBox="0 0 16 16"
+                                viewBox="0 0 32 32"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
                               >
                                 <path
-                                  d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                                  d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                                 />
                               </svg>
-                              <label
-                                className="bx--label"
-                                htmlFor="table-for-card-alert-table1-toolbar-search"
-                                id="table-for-card-alert-table1-toolbar-search-search"
-                              >
-                                Search
-                              </label>
-                              <input
-                                aria-hidden={true}
-                                autoComplete="off"
-                                className="bx--search-input"
-                                disabled={false}
-                                id="table-for-card-alert-table1-toolbar-search"
-                                onBlur={[Function]}
-                                onChange={[Function]}
-                                placeholder="Search"
-                                role="searchbox"
-                                tabIndex="-1"
-                                type="text"
-                                value=""
-                              />
-                              <button
-                                aria-label="Clear search input"
-                                className="bx--search-close bx--search-close--hidden"
-                                onClick={[Function]}
-                                type="button"
-                              >
-                                <svg
-                                  aria-hidden={true}
-                                  focusable="false"
-                                  height={16}
-                                  preserveAspectRatio="xMidYMid meet"
-                                  viewBox="0 0 32 32"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <polygon
-                                    points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                                  />
-                                </svg>
-                              </button>
-                            </div>
+                            </button>
                           </div>
                         </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Download table content
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Download table content"
+                            aria-hidden="true"
+                            aria-label="Download table content"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -24884,21 +24903,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                             />
                           </svg>
-                        </div>
-                        <div
-                          className="iot--tooltip-svg-wrapper"
+                        </button>
+                        <button
+                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
+                          disabled={false}
                           onClick={[Function]}
                           onKeyDown={[Function]}
-                          role="button"
                           tabIndex={0}
+                          type="button"
                         >
+                          <span
+                            className="bx--assistive-text"
+                          >
+                            Filters
+                          </span>
                           <svg
-                            aria-hidden={true}
-                            description="Filters"
+                            aria-hidden="true"
+                            aria-label="Filters"
+                            className="bx--btn__icon"
                             focusable="false"
                             height={20}
                             preserveAspectRatio="xMidYMid meet"
+                            role="img"
                             viewBox="0 0 32 32"
                             width={20}
                             xmlns="http://www.w3.org/2000/svg"
@@ -24907,7 +24934,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                               d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                             />
                           </svg>
-                        </div>
+                        </button>
                         <div
                           className="react-grid-item iot--card--toolbar"
                         >
diff --git a/src/components/FileDrop/__snapshots__/FileDrop.story.storyshot b/src/components/FileDrop/__snapshots__/FileDrop.story.storyshot
index b546596694..5280ed48c4 100644
--- a/src/components/FileDrop/__snapshots__/FileDrop.story.storyshot
+++ b/src/components/FileDrop/__snapshots__/FileDrop.story.storyshot
@@ -121,9 +121,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/FileD
       <label
         aria-disabled={false}
         className="bx--btn bx--btn--secondary"
-        htmlFor="id2"
-        onChange={[Function]}
-        onClick={[Function]}
+        htmlFor="id1"
         onKeyDown={[Function]}
         tabIndex={0}
       >
@@ -137,7 +135,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/FileD
         accept={Array []}
         className="bx--visually-hidden"
         disabled={false}
-        id="id2"
+        id="id1"
         multiple={true}
         onChange={[Function]}
         onClick={[Function]}
@@ -204,9 +202,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/FileD
       <label
         aria-disabled={false}
         className="bx--btn bx--btn--secondary"
-        htmlFor="id3"
-        onChange={[Function]}
-        onClick={[Function]}
+        htmlFor="id2"
         onKeyDown={[Function]}
         tabIndex={0}
       >
@@ -220,7 +216,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/FileD
         accept={Array []}
         className="bx--visually-hidden"
         disabled={false}
-        id="id3"
+        id="id2"
         multiple={false}
         onChange={[Function]}
         onClick={[Function]}
diff --git a/src/components/Header/__snapshots__/Header.story.storyshot b/src/components/Header/__snapshots__/Header.story.storyshot
index 98219833c5..1e1dd548df 100644
--- a/src/components/Header/__snapshots__/Header.story.storyshot
+++ b/src/components/Header/__snapshots__/Header.story.storyshot
@@ -47,29 +47,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Heade
             width={20}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="14.8"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="11.2"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="7.6"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="4"
+            <path
+              d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
             />
           </svg>
         </button>
@@ -485,29 +464,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Heade
           width={20}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <rect
-            height="1.2"
-            width="16"
-            x="2"
-            y="14.8"
-          />
-          <rect
-            height="1.2"
-            width="16"
-            x="2"
-            y="11.2"
-          />
-          <rect
-            height="1.2"
-            width="16"
-            x="2"
-            y="7.6"
-          />
-          <rect
-            height="1.2"
-            width="16"
-            x="2"
-            y="4"
+          <path
+            d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
           />
         </svg>
       </button>
@@ -627,29 +585,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Heade
             width={20}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="14.8"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="11.2"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="7.6"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="4"
+            <path
+              d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
             />
           </svg>
         </button>
@@ -843,29 +780,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Heade
             width={20}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="14.8"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="11.2"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="7.6"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="4"
+            <path
+              d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
             />
           </svg>
         </button>
diff --git a/src/components/Header/__snapshots__/Header.test.jsx.snap b/src/components/Header/__snapshots__/Header.test.jsx.snap
index d67d318553..4ae13ab685 100644
--- a/src/components/Header/__snapshots__/Header.test.jsx.snap
+++ b/src/components/Header/__snapshots__/Header.test.jsx.snap
@@ -28,29 +28,8 @@ exports[`Header should render 1`] = `
         width="20"
         xmlns="http://www.w3.org/2000/svg"
       >
-        <rect
-          height="1.2"
-          width="16"
-          x="2"
-          y="14.8"
-        />
-        <rect
-          height="1.2"
-          width="16"
-          x="2"
-          y="11.2"
-        />
-        <rect
-          height="1.2"
-          width="16"
-          x="2"
-          y="7.6"
-        />
-        <rect
-          height="1.2"
-          width="16"
-          x="2"
-          y="4"
+        <path
+          d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
         />
       </svg>
     </button>
diff --git a/src/components/ImageCard/__snapshots__/HotspotContent.story.storyshot b/src/components/ImageCard/__snapshots__/HotspotContent.story.storyshot
index cd5ba5e13d..c7a5b778a3 100644
--- a/src/components/ImageCard/__snapshots__/HotspotContent.story.storyshot
+++ b/src/components/ImageCard/__snapshots__/HotspotContent.story.storyshot
@@ -41,11 +41,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Hotsp
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <polygon
-            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-          />
           <path
-            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
           />
           <path
             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -240,11 +237,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Hotsp
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <polygon
-            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-          />
           <path
-            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
           />
           <path
             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -449,11 +443,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Hotsp
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <polygon
-            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-          />
           <path
-            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
           />
           <path
             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -714,11 +705,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Hotsp
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <polygon
-            points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-          />
           <path
-            d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+            d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
           />
           <path
             d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
diff --git a/src/components/NavigationBar/__snapshots__/NavigationBar.story.storyshot b/src/components/NavigationBar/__snapshots__/NavigationBar.story.storyshot
index 689cce42ff..bcb562b916 100644
--- a/src/components/NavigationBar/__snapshots__/NavigationBar.story.storyshot
+++ b/src/components/NavigationBar/__snapshots__/NavigationBar.story.storyshot
@@ -92,8 +92,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Navig
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+              <path
+                d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
               />
               <title>
                 show menu options
@@ -303,8 +303,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Navig
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+              <path
+                d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
               />
               <title>
                 show menu options
@@ -501,8 +501,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Navig
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+              <path
+                d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
               />
               <title>
                 show menu options
@@ -699,8 +699,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Navig
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+              <path
+                d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
               />
               <title>
                 show menu options
diff --git a/src/components/PageTitleBar/__snapshots__/PageTitleBar.story.storyshot b/src/components/PageTitleBar/__snapshots__/PageTitleBar.story.storyshot
index e0083043ca..47583ce2e4 100644
--- a/src/components/PageTitleBar/__snapshots__/PageTitleBar.story.storyshot
+++ b/src/components/PageTitleBar/__snapshots__/PageTitleBar.story.storyshot
@@ -389,8 +389,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/PageT
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                <path
+                  d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                 />
                 <title>
                   show menu options
@@ -939,8 +939,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/PageT
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                <path
+                  d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                 />
                 <title>
                   show menu options
diff --git a/src/components/ProgressIndicator/__snapshots__/ProgressIndicator.story.storyshot b/src/components/ProgressIndicator/__snapshots__/ProgressIndicator.story.storyshot
index 3b5dbca4bc..f56d09cd60 100644
--- a/src/components/ProgressIndicator/__snapshots__/ProgressIndicator.story.storyshot
+++ b/src/components/ProgressIndicator/__snapshots__/ProgressIndicator.story.storyshot
@@ -335,8 +335,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Progr
             <path
               d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
             />
-            <polygon
-              points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+            <path
+              d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
             />
             <title>
               This is displayed when step icon is hovered
diff --git a/src/components/SideNav/__snapshots__/SideNav.story.storyshot b/src/components/SideNav/__snapshots__/SideNav.story.storyshot
index 2142efa84d..0b67b5502d 100644
--- a/src/components/SideNav/__snapshots__/SideNav.story.storyshot
+++ b/src/components/SideNav/__snapshots__/SideNav.story.storyshot
@@ -51,29 +51,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/SideN
             width={20}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="14.8"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="11.2"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="7.6"
-            />
-            <rect
-              height="1.2"
-              width="16"
-              x="2"
-              y="4"
+            <path
+              d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
             />
           </svg>
         </button>
@@ -234,8 +213,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/SideN
                   width={20}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <polygon
-                    points="16,22 6,12 7.4,10.6 16,19.2 24.6,10.6 26,12"
+                  <path
+                    d="M16 22L6 12 7.4 10.6 16 19.2 24.6 10.6 26 12z"
                   />
                 </svg>
               </div>
@@ -360,8 +339,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/SideN
                   width={20}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <polygon
-                    points="16,22 6,12 7.4,10.6 16,19.2 24.6,10.6 26,12"
+                  <path
+                    d="M16 22L6 12 7.4 10.6 16 19.2 24.6 10.6 26 12z"
                   />
                 </svg>
               </div>
@@ -461,8 +440,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/SideN
                   width={20}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <polygon
-                    points="16,22 6,12 7.4,10.6 16,19.2 24.6,10.6 26,12"
+                  <path
+                    d="M16 22L6 12 7.4 10.6 16 19.2 24.6 10.6 26 12z"
                   />
                 </svg>
               </div>
diff --git a/src/components/StorybookSnapshots.test.js b/src/components/StorybookSnapshots.test.js
index 75efb36098..f6c5647f1d 100644
--- a/src/components/StorybookSnapshots.test.js
+++ b/src/components/StorybookSnapshots.test.js
@@ -60,6 +60,14 @@ describe(`Storybook Snapshot tests and console checks`, () => {
         ) &&
         !e.includes(
           'Warning: The Toolbar component has been deprecated and will be removed in the next major release of `carbon-components-react`'
+        ) &&
+        !e.includes(
+          // https://github.com/carbon-design-system/carbon/issues/6156
+          'Warning: Failed prop type: The prop `id` is marked as required in `DatePickerInput`, but its value is `undefined`'
+        ) &&
+        !e.includes(
+          // https://github.com/carbon-design-system/carbon/issues/6156
+          'Warning: Failed prop type: The prop `labelText` is marked as required in `DatePickerInput`, but its value is `undefined`'
         )
       ) {
         done.fail(e);
diff --git a/src/components/Table/Table.test.jsx b/src/components/Table/Table.test.jsx
index 8d5ef8eeeb..8026326534 100644
--- a/src/components/Table/Table.test.jsx
+++ b/src/components/Table/Table.test.jsx
@@ -408,17 +408,26 @@ describe('Table', () => {
     expect(wrapper.find('.bx--search-input').prop('value')).toEqual('');
     expect(wrapper.find('.bx--search-input').html()).toContain(`aria-hidden="true"`);
 
-    wrapper.setProps({ view: { toolbar: { search: { defaultValue: 'ferrari' } } } });
-    wrapper.update();
-
-    expect(wrapper.find('.bx--search-input').prop('value')).toEqual('ferrari');
-    expect(wrapper.find('.bx--search-input').html()).toContain(`aria-hidden="false"`);
-
-    wrapper.setProps({ view: { toolbar: { search: { defaultValue: '' } } } });
-    wrapper.update();
+    const wrapper2 = mount(
+      <Table
+        columns={tableColumns}
+        data={tableData}
+        actions={mockActions}
+        options={{
+          hasSearch: true,
+        }}
+        view={{
+          toolbar: {
+            search: {
+              defaultValue: 'ferrari',
+            },
+          },
+        }}
+      />
+    );
 
-    expect(wrapper.find('.bx--search-input').prop('value')).toEqual('');
-    expect(wrapper.find('.bx--search-input').html()).toContain(`aria-hidden="true"`);
+    expect(wrapper2.find('.bx--search-input').prop('value')).toEqual('ferrari');
+    expect(wrapper2.find('.bx--search-input').html()).toContain(`aria-hidden="false"`);
   });
 
   it('cells should always wrap by default', () => {
diff --git a/src/components/Table/TableBody/TableBodyRow/__snapshots__/TableBodyRow.story.storyshot b/src/components/Table/TableBody/TableBodyRow/__snapshots__/TableBodyRow.story.storyshot
index c8625b2988..078c334fc0 100644
--- a/src/components/Table/TableBody/TableBodyRow/__snapshots__/TableBodyRow.story.storyshot
+++ b/src/components/Table/TableBody/TableBodyRow/__snapshots__/TableBodyRow.story.storyshot
@@ -414,8 +414,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <polygon
-                    points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                  <path
+                    d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                   />
                 </svg>
               </button>
@@ -556,8 +556,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <polygon
-                    points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                  <path
+                    d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                   />
                 </svg>
               </button>
@@ -744,8 +744,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <polygon
-                    points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                  <path
+                    d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                   />
                 </svg>
               </button>
@@ -907,8 +907,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <polygon
-                    points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                  <path
+                    d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                   />
                 </svg>
               </button>
diff --git a/src/components/Table/TableDetailWizard/__snapshots__/TableDetailWizard.story.storyshot b/src/components/Table/TableDetailWizard/__snapshots__/TableDetailWizard.story.storyshot
index 39706c4818..9d7aa01d89 100644
--- a/src/components/Table/TableDetailWizard/__snapshots__/TableDetailWizard.story.storyshot
+++ b/src/components/Table/TableDetailWizard/__snapshots__/TableDetailWizard.story.storyshot
@@ -395,8 +395,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     <path
                       d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
                     />
-                    <polygon
-                      points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+                    <path
+                      d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
                     />
                     <title>
                       Identity
@@ -927,8 +927,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             width={20}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <polygon
-              points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+            <path
+              d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
             />
           </svg>
         </button>
diff --git a/src/components/Table/TableToolbar/TableToolbar.jsx b/src/components/Table/TableToolbar/TableToolbar.jsx
index 0f8e036d68..e3a6c73d5b 100644
--- a/src/components/Table/TableToolbar/TableToolbar.jsx
+++ b/src/components/Table/TableToolbar/TableToolbar.jsx
@@ -12,7 +12,6 @@ import {
 } from '../TablePropTypes';
 import { tableTranslateWithId } from '../../../utils/componentUtilityFunctions';
 import { settings } from '../../../constants/Settings';
-import TableToolbarSearch from '../TableToolbarSearch/TableToolbarSearch';
 
 import TableToolbarSVGButton from './TableToolbarSVGButton';
 
@@ -21,7 +20,7 @@ const { iotPrefix } = settings;
 const {
   TableToolbar: CarbonTableToolbar,
   TableToolbarContent,
-  // TableToolbarAction,
+  TableToolbarSearch,
   TableBatchActions,
   TableBatchAction,
 } = DataTable;
@@ -192,10 +191,16 @@ const TableToolbar = ({
         {hasSearch ? (
           <TableToolbarSearch
             {...search}
+            defaultValue={search.defaultValue || search.value}
             className="table-toolbar-search"
             translateWithId={(...args) => tableTranslateWithId(i18n, ...args)}
             id={`${tableId}-toolbar-search`}
-            onChange={event => onApplySearch(event.currentTarget ? event.currentTarget.value : '')}
+            onChange={(
+              event,
+              defaultValue // https://github.com/carbon-design-system/carbon/issues/6157
+            ) =>
+              onApplySearch(defaultValue || (event.currentTarget ? event.currentTarget.value : ''))
+            }
             disabled={isDisabled}
           />
         ) : null}
diff --git a/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx b/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
index 850053fe27..ac9511d284 100644
--- a/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
+++ b/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
@@ -10,7 +10,7 @@ const { iotPrefix } = settings;
 const propTypes = {
   onClick: PropTypes.func.isRequired,
   testId: PropTypes.string.isRequired,
-  renderIcon: PropTypes.func.isRequired,
+  renderIcon: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   description: PropTypes.node.isRequired,
 };
 
diff --git a/src/components/Table/TableToolbarSearch/TableToolbarSearch.jsx b/src/components/Table/TableToolbarSearch/TableToolbarSearch.jsx
deleted file mode 100644
index 9e14e89915..0000000000
--- a/src/components/Table/TableToolbarSearch/TableToolbarSearch.jsx
+++ /dev/null
@@ -1,124 +0,0 @@
-/* istanbul ignore file */
-
-import React, { useState, useEffect, useRef } from 'react';
-import PropTypes from 'prop-types';
-import { DataTable } from 'carbon-components-react';
-import classnames from 'classnames';
-
-import { settings } from '../../../constants/Settings';
-
-const { iotPrefix } = settings;
-
-const { TableToolbarSearch: CarbonTableToolbarSearch } = DataTable;
-
-const propTypes = {
-  /** DEPRECATED: use defaultValue instead  */
-  value: PropTypes.string,
-  /** set a defaul value to the search bar and automatically expands it  */
-  defaultValue: PropTypes.string,
-  /** renders the search box as expanded by default without setting a default value  */
-  defaultExpanded: PropTypes.bool,
-  /** triggered on search change  */
-  onChange: PropTypes.func,
-  /** triggered on field expand  */
-  onExpand: PropTypes.func,
-};
-
-const defaultProps = {
-  value: '',
-  defaultValue: '',
-  defaultExpanded: false,
-  onChange: null,
-  onExpand: null,
-};
-
-/**
- * ----------------------------- WARNING ----------------------------
- * This is a temporary solution to fix a bug in Carbon 10.9.1
- * to be removed when we import Carbon 10.10.0 or higher
- * https://github.com/IBM/carbon-addons-iot-react/issues/975
- * ------------------------------------------------------------------
- */
-const TableToolbarSearch = ({
-  value,
-  defaultValue,
-  defaultExpanded,
-  onChange,
-  onExpand,
-  ...other
-}) => {
-  const toolbarSearch = useRef(null);
-  const [expanded, setExpanded] = useState(defaultExpanded || defaultValue || value);
-  const [focusTarget, setFocusTarget] = useState(null);
-
-  useEffect(
-    () => {
-      if (focusTarget && focusTarget.current) {
-        focusTarget.current.querySelector('input').focus();
-        setFocusTarget(null);
-      }
-    },
-    [focusTarget]
-  );
-
-  useEffect(
-    () => {
-      setExpanded(defaultValue && defaultValue !== '');
-    },
-    [defaultValue]
-  );
-
-  const handleExpand = (event, val) => {
-    setExpanded(val);
-    if (onExpand) {
-      onExpand(event, val);
-    }
-  };
-
-  const onClick = e => {
-    if (
-      !expanded && // if we're not already expanded or focused
-      !focusTarget
-    ) {
-      setFocusTarget(toolbarSearch);
-      handleExpand(e, true);
-    }
-  };
-
-  const onBlur = e => {
-    handleExpand(e, e.target.value !== '');
-  };
-
-  const onKeyDown = e => {
-    if (e.keyCode === 13) {
-      onClick(e);
-    }
-  };
-
-  return (
-    <div
-      tabIndex="-1"
-      ref={toolbarSearch}
-      className={classnames(`${iotPrefix}--table-toolbar-search`, {
-        [`${iotPrefix}--table-toolbar-search__expanded`]: expanded,
-      })}
-      onFocus={onClick}
-      onClick={onClick}
-      onKeyDown={onKeyDown}
-      role="button"
-    >
-      <CarbonTableToolbarSearch
-        value={defaultValue || value}
-        expanded={expanded}
-        onChange={onChange}
-        onBlur={onBlur}
-        {...other}
-      />
-    </div>
-  );
-};
-
-TableToolbarSearch.propTypes = propTypes;
-TableToolbarSearch.defaultProps = defaultProps;
-
-export default TableToolbarSearch;
diff --git a/src/components/Table/TableToolbarSearch/_table-toolbar-search.scss b/src/components/Table/TableToolbarSearch/_table-toolbar-search.scss
deleted file mode 100644
index c321c3ea7a..0000000000
--- a/src/components/Table/TableToolbarSearch/_table-toolbar-search.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@import '../../../globals/vars';
-
-.#{$iot-prefix}--table-toolbar-search {
-  display: flex;
-  flex: 0;
-  width: 100%;
-  outline: none;
-  .bx--toolbar-action:focus {
-    outline: 2px solid #0062ff !important;
-  }
-}
-
-.#{$iot-prefix}--table-toolbar-search__expanded {
-  flex: 1;
-}
-
-html[dir='rtl'] .#{$iot-prefix}--table-toolbar-search {
-  .#{$prefix}--search-magnifier {
-    left: auto;
-    right: 0;
-  }
-
-  .#{$prefix}--search-close {
-    left: 0;
-    right: auto;
-  }
-}
diff --git a/src/components/Table/__snapshots__/Table.story.storyshot b/src/components/Table/__snapshots__/Table.story.storyshot
index d10f8a2c3e..ceb2a9e628 100644
--- a/src/components/Table/__snapshots__/Table.story.storyshot
+++ b/src/components/Table/__snapshots__/Table.story.storyshot
@@ -56,20 +56,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           <div
             className="bx--toolbar-content iot--table-toolbar-content"
           >
-            <div
-              className="iot--tooltip-svg-wrapper"
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="row-edit-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Edit rows
+              </span>
               <svg
-                aria-hidden={true}
-                description="Edit rows"
+                aria-hidden="true"
+                aria-label="Edit rows"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -84,7 +92,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   d="M25.4,9c0.8-0.8,0.8-2,0-2.8c0,0,0,0,0,0l-3.6-3.6c-0.8-0.8-2-0.8-2.8,0c0,0,0,0,0,0l-15,15V24h6.4L25.4,9z M20.4,4L24,7.6	l-3,3L17.4,7L20.4,4z M6,22v-3.6l10-10l3.6,3.6l-10,10H6z"
                 />
               </svg>
-            </div>
+            </button>
           </div>
         </section>
         <div
@@ -17479,20 +17487,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           >
             Clear all filters
           </button>
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Filters
+            </span>
             <svg
-              aria-hidden={true}
-              description="Filters"
+              aria-hidden="true"
+              aria-label="Filters"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -17501,7 +17517,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
               />
             </svg>
-          </div>
+          </button>
           <div
             className="Tablestory__StyledCustomToolbarContent-ah27yk-1 ehYZTw"
           >
@@ -17888,8 +17904,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+                            <path
+                              d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                             />
                           </svg>
                         </div>
@@ -17907,8 +17923,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                            <path
+                              d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                             />
                             <title>
                               Open menu
@@ -17916,6 +17932,55 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           </svg>
                         </div>
                       </div>
+                      <div
+                        aria-label="Choose an item"
+                        className="bx--list-box__menu"
+                        id="column-2__menu"
+                        role="listbox"
+                      >
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-5-item-0"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-A"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-A
+                          </div>
+                        </div>
+                        <div
+                          className="bx--list-box__menu-item bx--list-box__menu-item--highlighted"
+                          id="downshift-5-item-1"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-B"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-B
+                          </div>
+                        </div>
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-5-item-2"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-C"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-C
+                          </div>
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </span>
@@ -19828,8 +19893,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -19961,8 +20026,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -19990,8 +20055,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -20011,8 +20076,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -20096,20 +20161,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
         <div
           className="bx--toolbar-content iot--table-toolbar-content"
         >
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="column-selection-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Column Selection
+            </span>
             <svg
-              aria-hidden={true}
-              description="Column Selection"
+              aria-hidden="true"
+              aria-label="Column Selection"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -20130,21 +20203,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 y="4"
               />
             </svg>
-          </div>
-          <div
-            className="iot--tooltip-svg-wrapper"
+          </button>
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Filters
+            </span>
             <svg
-              aria-hidden={true}
-              description="Filters"
+              aria-hidden="true"
+              aria-label="Filters"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -20153,7 +20234,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
               />
             </svg>
-          </div>
+          </button>
         </div>
       </section>
       <div
@@ -104125,79 +104206,70 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             className="bx--toolbar-content iot--table-toolbar-content"
           >
             <div
-              className="iot--table-toolbar-search"
+              className="bx--toolbar-action bx--toolbar-search-container-expandable"
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex="-1"
+              onFocus={[Function]}
+              tabIndex="0"
             >
               <div
-                className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                onBlur={[Function]}
-                onClick={[Function]}
-                onFocus={[Function]}
-                tabIndex="0"
+                aria-labelledby="Table-toolbar-search-search"
+                className="bx--search bx--search--sm table-toolbar-search"
+                role="search"
               >
-                <div
-                  aria-labelledby="Table-toolbar-search-search"
-                  className="bx--search bx--search--sm table-toolbar-search"
-                  role="search"
+                <svg
+                  aria-hidden={true}
+                  className="bx--search-magnifier"
+                  focusable="false"
+                  height={16}
+                  preserveAspectRatio="xMidYMid meet"
+                  viewBox="0 0 16 16"
+                  width={16}
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                  />
+                </svg>
+                <label
+                  className="bx--label"
+                  htmlFor="Table-toolbar-search"
+                  id="Table-toolbar-search-search"
+                >
+                  Search
+                </label>
+                <input
+                  aria-hidden={true}
+                  autoComplete="off"
+                  className="bx--search-input"
+                  id="Table-toolbar-search"
+                  onChange={[Function]}
+                  placeholder="Search"
+                  role="searchbox"
+                  tabIndex="-1"
+                  type="text"
+                  value=""
+                />
+                <button
+                  aria-label="Clear search input"
+                  className="bx--search-close bx--search-close--hidden"
+                  onClick={[Function]}
+                  type="button"
                 >
                   <svg
                     aria-hidden={true}
-                    className="bx--search-magnifier"
                     focusable="false"
                     height={16}
                     preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 16 16"
+                    viewBox="0 0 32 32"
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <path
-                      d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                     />
                   </svg>
-                  <label
-                    className="bx--label"
-                    htmlFor="Table-toolbar-search"
-                    id="Table-toolbar-search-search"
-                  >
-                    Search
-                  </label>
-                  <input
-                    aria-hidden={true}
-                    autoComplete="off"
-                    className="bx--search-input"
-                    id="Table-toolbar-search"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    placeholder="Search"
-                    role="searchbox"
-                    tabIndex="-1"
-                    type="text"
-                    value=""
-                  />
-                  <button
-                    aria-label="Clear search input"
-                    className="bx--search-close bx--search-close--hidden"
-                    onClick={[Function]}
-                    type="button"
-                  >
-                    <svg
-                      aria-hidden={true}
-                      focusable="false"
-                      height={16}
-                      preserveAspectRatio="xMidYMid meet"
-                      viewBox="0 0 32 32"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <polygon
-                        points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                      />
-                    </svg>
-                  </button>
-                </div>
+                </button>
               </div>
             </div>
             <button
@@ -104209,20 +104281,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             >
               Clear all filters
             </button>
-            <div
-              className="iot--tooltip-svg-wrapper"
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="download-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Download table content
+              </span>
               <svg
-                aria-hidden={true}
-                description="Download table content"
+                aria-hidden="true"
+                aria-label="Download table content"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -104234,21 +104314,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                 />
               </svg>
-            </div>
-            <div
-              className="iot--tooltip-svg-wrapper"
+            </button>
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="column-selection-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Column Selection
+              </span>
               <svg
-                aria-hidden={true}
-                description="Column Selection"
+                aria-hidden="true"
+                aria-label="Column Selection"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -104269,21 +104357,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   y="4"
                 />
               </svg>
-            </div>
-            <div
-              className="iot--tooltip-svg-wrapper"
+            </button>
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="filter-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Filters
+              </span>
               <svg
-                aria-hidden={true}
-                description="Filters"
+                aria-hidden="true"
+                aria-label="Filters"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -104292,21 +104388,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                 />
               </svg>
-            </div>
-            <div
-              className="iot--tooltip-svg-wrapper"
+            </button>
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="row-edit-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Edit rows
+              </span>
               <svg
-                aria-hidden={true}
-                description="Edit rows"
+                aria-hidden="true"
+                aria-label="Edit rows"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -104321,7 +104425,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   d="M25.4,9c0.8-0.8,0.8-2,0-2.8c0,0,0,0,0,0l-3.6-3.6c-0.8-0.8-2-0.8-2.8,0c0,0,0,0,0,0l-15,15V24h6.4L25.4,9z M20.4,4L24,7.6	l-3,3L17.4,7L20.4,4z M6,22v-3.6l10-10l3.6,3.6l-10,10H6z"
                 />
               </svg>
-            </div>
+            </button>
           </div>
         </section>
         <div
@@ -105044,8 +105148,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+                              <path
+                                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                               />
                             </svg>
                           </div>
@@ -105063,8 +105167,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                              <path
+                                d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                               />
                               <title>
                                 Open menu
@@ -105072,6 +105176,55 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             </svg>
                           </div>
                         </div>
+                        <div
+                          aria-label="Choose an item"
+                          className="bx--list-box__menu"
+                          id="column-2__menu"
+                          role="listbox"
+                        >
+                          <div
+                            className="bx--list-box__menu-item"
+                            id="downshift-0-item-0"
+                            onClick={[Function]}
+                            onMouseDown={[Function]}
+                            onMouseMove={[Function]}
+                            title="option-A"
+                          >
+                            <div
+                              className="bx--list-box__menu-item__option"
+                            >
+                              option-A
+                            </div>
+                          </div>
+                          <div
+                            className="bx--list-box__menu-item bx--list-box__menu-item--highlighted"
+                            id="downshift-0-item-1"
+                            onClick={[Function]}
+                            onMouseDown={[Function]}
+                            onMouseMove={[Function]}
+                            title="option-B"
+                          >
+                            <div
+                              className="bx--list-box__menu-item__option"
+                            >
+                              option-B
+                            </div>
+                          </div>
+                          <div
+                            className="bx--list-box__menu-item"
+                            id="downshift-0-item-2"
+                            onClick={[Function]}
+                            onMouseDown={[Function]}
+                            onMouseMove={[Function]}
+                            title="option-C"
+                          >
+                            <div
+                              className="bx--list-box__menu-item__option"
+                            >
+                              option-C
+                            </div>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </span>
@@ -105224,8 +105377,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -105524,8 +105677,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -105798,8 +105951,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -106072,8 +106225,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -106372,8 +106525,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -106672,8 +106825,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -106972,8 +107125,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -107272,8 +107425,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -107546,8 +107699,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -107846,8 +107999,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -108167,8 +108320,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                      <path
+                        d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                       />
                     </svg>
                   </div>
@@ -108236,8 +108389,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                      <path
+                        d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                       />
                     </svg>
                   </div>
@@ -108265,8 +108418,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 width={24}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="20,24 10,16 20,8"
+                <path
+                  d="M20 24L10 16 20 8z"
                 />
               </svg>
             </button>
@@ -108286,8 +108439,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 width={24}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="12,8 22,16 12,24"
+                <path
+                  d="M12 8L22 16 12 24z"
                 />
               </svg>
             </button>
@@ -108379,95 +108532,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             className="bx--toolbar-content iot--table-toolbar-content"
           >
             <div
-              className="iot--table-toolbar-search"
+              className="bx--toolbar-action bx--toolbar-search-container-expandable"
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex="-1"
+              onFocus={[Function]}
+              tabIndex="0"
             >
               <div
-                className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                onBlur={[Function]}
-                onClick={[Function]}
-                onFocus={[Function]}
-                tabIndex="0"
+                aria-labelledby="Table-toolbar-search-search"
+                className="bx--search bx--search--sm table-toolbar-search"
+                role="search"
               >
-                <div
-                  aria-labelledby="Table-toolbar-search-search"
-                  className="bx--search bx--search--sm table-toolbar-search"
-                  role="search"
+                <svg
+                  aria-hidden={true}
+                  className="bx--search-magnifier"
+                  focusable="false"
+                  height={16}
+                  preserveAspectRatio="xMidYMid meet"
+                  viewBox="0 0 16 16"
+                  width={16}
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                  />
+                </svg>
+                <label
+                  className="bx--label"
+                  htmlFor="Table-toolbar-search"
+                  id="Table-toolbar-search-search"
+                >
+                  Search
+                </label>
+                <input
+                  aria-hidden={true}
+                  autoComplete="off"
+                  className="bx--search-input"
+                  id="Table-toolbar-search"
+                  onChange={[Function]}
+                  placeholder="Search"
+                  role="searchbox"
+                  tabIndex="-1"
+                  type="text"
+                  value=""
+                />
+                <button
+                  aria-label="Clear search input"
+                  className="bx--search-close bx--search-close--hidden"
+                  onClick={[Function]}
+                  type="button"
                 >
                   <svg
                     aria-hidden={true}
-                    className="bx--search-magnifier"
                     focusable="false"
                     height={16}
                     preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 16 16"
+                    viewBox="0 0 32 32"
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <path
-                      d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                     />
                   </svg>
-                  <label
-                    className="bx--label"
-                    htmlFor="Table-toolbar-search"
-                    id="Table-toolbar-search-search"
-                  >
-                    Search
-                  </label>
-                  <input
-                    aria-hidden={true}
-                    autoComplete="off"
-                    className="bx--search-input"
-                    id="Table-toolbar-search"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    placeholder="Search"
-                    role="searchbox"
-                    tabIndex="-1"
-                    type="text"
-                    value=""
-                  />
-                  <button
-                    aria-label="Clear search input"
-                    className="bx--search-close bx--search-close--hidden"
-                    onClick={[Function]}
-                    type="button"
-                  >
-                    <svg
-                      aria-hidden={true}
-                      focusable="false"
-                      height={16}
-                      preserveAspectRatio="xMidYMid meet"
-                      viewBox="0 0 32 32"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <polygon
-                        points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                      />
-                    </svg>
-                  </button>
-                </div>
+                </button>
               </div>
             </div>
-            <div
-              className="iot--tooltip-svg-wrapper"
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="column-selection-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Column Selection
+              </span>
               <svg
-                aria-hidden={true}
-                description="Column Selection"
+                aria-hidden="true"
+                aria-label="Column Selection"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -108488,21 +108640,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   y="4"
                 />
               </svg>
-            </div>
-            <div
-              className="iot--tooltip-svg-wrapper"
+            </button>
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="filter-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Filters
+              </span>
               <svg
-                aria-hidden={true}
-                description="Filters"
+                aria-hidden="true"
+                aria-label="Filters"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -108511,21 +108671,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                 />
               </svg>
-            </div>
-            <div
-              className="iot--tooltip-svg-wrapper"
+            </button>
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="row-edit-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Edit rows
+              </span>
               <svg
-                aria-hidden={true}
-                description="Edit rows"
+                aria-hidden="true"
+                aria-label="Edit rows"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -108540,7 +108708,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   d="M25.4,9c0.8-0.8,0.8-2,0-2.8c0,0,0,0,0,0l-3.6-3.6c-0.8-0.8-2-0.8-2.8,0c0,0,0,0,0,0l-15,15V24h6.4L25.4,9z M20.4,4L24,7.6	l-3,3L17.4,7L20.4,4z M6,22v-3.6l10-10l3.6,3.6l-10,10H6z"
                 />
               </svg>
-            </div>
+            </button>
           </div>
         </section>
         <div
@@ -108804,8 +108972,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -109084,8 +109252,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -109390,8 +109558,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -109696,8 +109864,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -110002,8 +110170,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -110282,8 +110450,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -110588,8 +110756,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -110894,8 +111062,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -111200,8 +111368,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -111480,8 +111648,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      <path
+                        d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                       />
                     </svg>
                   </button>
@@ -111833,8 +112001,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                      <path
+                        d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                       />
                     </svg>
                   </div>
@@ -111966,8 +112134,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                      <path
+                        d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                       />
                     </svg>
                   </div>
@@ -111995,8 +112163,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 width={24}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="20,24 10,16 20,8"
+                <path
+                  d="M20 24L10 16 20 8z"
                 />
               </svg>
             </button>
@@ -112016,8 +112184,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 width={24}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="12,8 22,16 12,24"
+                <path
+                  d="M12 8L22 16 12 24z"
                 />
               </svg>
             </button>
@@ -129465,20 +129633,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             >
               Clear all filters
             </button>
-            <div
-              className="iot--tooltip-svg-wrapper"
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="filter-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Filters
+              </span>
               <svg
-                aria-hidden={true}
-                description="Filters"
+                aria-hidden="true"
+                aria-label="Filters"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -129487,7 +129663,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                 />
               </svg>
-            </div>
+            </button>
           </div>
         </section>
         <div
@@ -129938,8 +130114,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+                              <path
+                                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                               />
                             </svg>
                           </div>
@@ -129957,8 +130133,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                              <path
+                                d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                               />
                               <title>
                                 Open menu
@@ -129966,6 +130142,55 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             </svg>
                           </div>
                         </div>
+                        <div
+                          aria-label="Choose an item"
+                          className="bx--list-box__menu"
+                          id="column-2__menu"
+                          role="listbox"
+                        >
+                          <div
+                            className="bx--list-box__menu-item"
+                            id="downshift-3-item-0"
+                            onClick={[Function]}
+                            onMouseDown={[Function]}
+                            onMouseMove={[Function]}
+                            title="option-A"
+                          >
+                            <div
+                              className="bx--list-box__menu-item__option"
+                            >
+                              option-A
+                            </div>
+                          </div>
+                          <div
+                            className="bx--list-box__menu-item bx--list-box__menu-item--highlighted"
+                            id="downshift-3-item-1"
+                            onClick={[Function]}
+                            onMouseDown={[Function]}
+                            onMouseMove={[Function]}
+                            title="option-B"
+                          >
+                            <div
+                              className="bx--list-box__menu-item__option"
+                            >
+                              option-B
+                            </div>
+                          </div>
+                          <div
+                            className="bx--list-box__menu-item"
+                            id="downshift-3-item-2"
+                            onClick={[Function]}
+                            onMouseDown={[Function]}
+                            onMouseMove={[Function]}
+                            title="option-C"
+                          >
+                            <div
+                              className="bx--list-box__menu-item__option"
+                            >
+                              option-C
+                            </div>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </span>
@@ -132271,8 +132496,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                      <path
+                        d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                       />
                     </svg>
                   </div>
@@ -132404,8 +132629,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                      <path
+                        d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                       />
                     </svg>
                   </div>
@@ -132433,8 +132658,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 width={24}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="20,24 10,16 20,8"
+                <path
+                  d="M20 24L10 16 20 8z"
                 />
               </svg>
             </button>
@@ -132454,8 +132679,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 width={24}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="12,8 22,16 12,24"
+                <path
+                  d="M12 8L22 16 12 24z"
                 />
               </svg>
             </button>
@@ -132549,20 +132774,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           >
             Clear all filters
           </button>
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Filters
+            </span>
             <svg
-              aria-hidden={true}
-              description="Filters"
+              aria-hidden="true"
+              aria-label="Filters"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -132571,7 +132804,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
               />
             </svg>
-          </div>
+          </button>
         </div>
       </section>
       <div
@@ -133022,8 +133255,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+                            <path
+                              d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                             />
                           </svg>
                         </div>
@@ -133041,8 +133274,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                            <path
+                              d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                             />
                             <title>
                               Open menu
@@ -133050,6 +133283,55 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           </svg>
                         </div>
                       </div>
+                      <div
+                        aria-label="Choose an item"
+                        className="bx--list-box__menu"
+                        id="column-2__menu"
+                        role="listbox"
+                      >
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-4-item-0"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-A"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-A
+                          </div>
+                        </div>
+                        <div
+                          className="bx--list-box__menu-item bx--list-box__menu-item--highlighted"
+                          id="downshift-4-item-1"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-B"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-B
+                          </div>
+                        </div>
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-4-item-2"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-C"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-C
+                          </div>
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </span>
@@ -135355,8 +135637,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -135488,8 +135770,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -135517,8 +135799,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -135538,8 +135820,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -135634,79 +135916,70 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           className="bx--toolbar-content iot--table-toolbar-content"
         >
           <div
-            className="iot--table-toolbar-search"
+            className="bx--toolbar-action bx--toolbar-search-container-expandable"
+            onBlur={[Function]}
             onClick={[Function]}
-            onKeyDown={[Function]}
-            role="button"
-            tabIndex="-1"
+            onFocus={[Function]}
+            tabIndex="0"
           >
             <div
-              className="bx--toolbar-action bx--toolbar-search-container-expandable"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              tabIndex="0"
+              aria-labelledby="Table-toolbar-search-search"
+              className="bx--search bx--search--sm table-toolbar-search"
+              role="search"
             >
-              <div
-                aria-labelledby="Table-toolbar-search-search"
-                className="bx--search bx--search--sm table-toolbar-search"
-                role="search"
+              <svg
+                aria-hidden={true}
+                className="bx--search-magnifier"
+                focusable="false"
+                height={16}
+                preserveAspectRatio="xMidYMid meet"
+                viewBox="0 0 16 16"
+                width={16}
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                />
+              </svg>
+              <label
+                className="bx--label"
+                htmlFor="Table-toolbar-search"
+                id="Table-toolbar-search-search"
+              >
+                Search
+              </label>
+              <input
+                aria-hidden={true}
+                autoComplete="off"
+                className="bx--search-input"
+                id="Table-toolbar-search"
+                onChange={[Function]}
+                placeholder="Search"
+                role="searchbox"
+                tabIndex="-1"
+                type="text"
+                value=""
+              />
+              <button
+                aria-label="Clear search input"
+                className="bx--search-close bx--search-close--hidden"
+                onClick={[Function]}
+                type="button"
               >
                 <svg
                   aria-hidden={true}
-                  className="bx--search-magnifier"
                   focusable="false"
                   height={16}
                   preserveAspectRatio="xMidYMid meet"
-                  viewBox="0 0 16 16"
+                  viewBox="0 0 32 32"
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
                   <path
-                    d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                    d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                   />
                 </svg>
-                <label
-                  className="bx--label"
-                  htmlFor="Table-toolbar-search"
-                  id="Table-toolbar-search-search"
-                >
-                  Search
-                </label>
-                <input
-                  aria-hidden={true}
-                  autoComplete="off"
-                  className="bx--search-input"
-                  id="Table-toolbar-search"
-                  onBlur={[Function]}
-                  onChange={[Function]}
-                  placeholder="Search"
-                  role="searchbox"
-                  tabIndex="-1"
-                  type="text"
-                  value=""
-                />
-                <button
-                  aria-label="Clear search input"
-                  className="bx--search-close bx--search-close--hidden"
-                  onClick={[Function]}
-                  type="button"
-                >
-                  <svg
-                    aria-hidden={true}
-                    focusable="false"
-                    height={16}
-                    preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 32 32"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <polygon
-                      points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                    />
-                  </svg>
-                </button>
-              </div>
+              </button>
             </div>
           </div>
         </div>
@@ -136280,8 +136553,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -136413,8 +136686,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -136442,8 +136715,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -136463,8 +136736,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -136548,20 +136821,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
         <div
           className="bx--toolbar-content iot--table-toolbar-content"
         >
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="column-selection-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Column Selection
+            </span>
             <svg
-              aria-hidden={true}
-              description="Column Selection"
+              aria-hidden="true"
+              aria-label="Column Selection"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -136582,7 +136863,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 y="4"
               />
             </svg>
-          </div>
+          </button>
         </div>
       </section>
       <div
@@ -139238,8 +139519,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -139371,8 +139652,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -139400,8 +139681,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -139421,8 +139702,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -139506,20 +139787,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
         <div
           className="bx--toolbar-content iot--table-toolbar-content"
         >
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Filters
+            </span>
             <svg
-              aria-hidden={true}
-              description="Filters"
+              aria-hidden="true"
+              aria-label="Filters"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -139528,7 +139817,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
               />
             </svg>
-          </div>
+          </button>
         </div>
       </section>
       <div
@@ -141838,8 +142127,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -141971,8 +142260,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -142000,8 +142289,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -142021,8 +142310,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -159470,20 +159759,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           >
             Clear all filters
           </button>
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Filters
+            </span>
             <svg
-              aria-hidden={true}
-              description="Filters"
+              aria-hidden="true"
+              aria-label="Filters"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -159492,7 +159789,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
               />
             </svg>
-          </div>
+          </button>
         </div>
       </section>
       <div
@@ -159892,8 +160189,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+                            <path
+                              d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                             />
                           </svg>
                         </div>
@@ -159911,8 +160208,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                            <path
+                              d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                             />
                             <title>
                               Open menu
@@ -159920,6 +160217,55 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           </svg>
                         </div>
                       </div>
+                      <div
+                        aria-label="Choose an item"
+                        className="bx--list-box__menu"
+                        id="column-2__menu"
+                        role="listbox"
+                      >
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-1-item-0"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-A"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-A
+                          </div>
+                        </div>
+                        <div
+                          className="bx--list-box__menu-item bx--list-box__menu-item--highlighted"
+                          id="downshift-1-item-1"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-B"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-B
+                          </div>
+                        </div>
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-1-item-2"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-C"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-C
+                          </div>
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </span>
@@ -161961,8 +162307,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -162030,8 +162376,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -162059,8 +162405,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -162080,8 +162426,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -162172,20 +162518,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           <div
             className="bx--toolbar-content iot--table-toolbar-content"
           >
-            <div
-              className="iot--tooltip-svg-wrapper"
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="column-selection-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Column Selection
+              </span>
               <svg
-                aria-hidden={true}
-                description="Column Selection"
+                aria-hidden="true"
+                aria-label="Column Selection"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -162206,7 +162560,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   y="4"
                 />
               </svg>
-            </div>
+            </button>
           </div>
         </section>
         <div
@@ -182352,8 +182706,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -183205,8 +183559,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -183234,8 +183588,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -183255,8 +183609,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -185293,8 +185647,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -185426,8 +185780,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -185455,8 +185809,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -185476,8 +185830,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -185973,20 +186327,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
         <div
           className="bx--toolbar-content iot--table-toolbar-content"
         >
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Filters
+            </span>
             <svg
-              aria-hidden={true}
-              description="Filters"
+              aria-hidden="true"
+              aria-label="Filters"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -185995,7 +186357,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
               />
             </svg>
-          </div>
+          </button>
         </div>
       </section>
       <div
@@ -188135,8 +188497,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -188268,8 +188630,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -188297,8 +188659,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -188318,8 +188680,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -188635,8 +188997,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -188870,8 +189232,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -189105,8 +189467,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -189340,8 +189702,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -189575,8 +189937,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -189810,8 +190172,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -190045,8 +190407,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -190280,8 +190642,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -190515,8 +190877,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -190750,8 +191112,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -190985,8 +191347,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -191220,8 +191582,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -191455,8 +191817,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -191690,8 +192052,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -191925,8 +192287,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -192160,8 +192522,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -192395,8 +192757,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -192630,8 +192992,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -192912,8 +193274,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -193045,8 +193407,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -193074,8 +193436,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -193095,8 +193457,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -193704,20 +194066,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           >
             Clear all filters
           </button>
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Filters
+            </span>
             <svg
-              aria-hidden={true}
-              description="Filters"
+              aria-hidden="true"
+              aria-label="Filters"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -193726,7 +194096,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
               />
             </svg>
-          </div>
+          </button>
         </div>
       </section>
       <div
@@ -194082,8 +194452,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
-                            <polygon
-                              points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                            <path
+                              d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                             />
                             <title>
                               Open menu
@@ -194091,6 +194461,55 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           </svg>
                         </div>
                       </div>
+                      <div
+                        aria-label="Choose an item"
+                        className="bx--list-box__menu"
+                        id="column-2__menu"
+                        role="listbox"
+                      >
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-2-item-0"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-A"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-A
+                          </div>
+                        </div>
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-2-item-1"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-B"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-B
+                          </div>
+                        </div>
+                        <div
+                          className="bx--list-box__menu-item"
+                          id="downshift-2-item-2"
+                          onClick={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseMove={[Function]}
+                          title="option-C"
+                        >
+                          <div
+                            className="bx--list-box__menu-item__option"
+                          >
+                            option-C
+                          </div>
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </span>
@@ -194339,79 +194758,70 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           className="bx--toolbar-content iot--table-toolbar-content"
         >
           <div
-            className="iot--table-toolbar-search iot--table-toolbar-search__expanded"
+            className="bx--toolbar-action bx--toolbar-search-container-active bx--toolbar-search-container-expandable"
+            onBlur={[Function]}
             onClick={[Function]}
-            onKeyDown={[Function]}
-            role="button"
+            onFocus={[Function]}
             tabIndex="-1"
           >
             <div
-              className="bx--toolbar-action bx--toolbar-search-container-active bx--toolbar-search-container-expandable"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              tabIndex="0"
+              aria-labelledby="Table-toolbar-search-search"
+              className="bx--search bx--search--sm table-toolbar-search"
+              role="search"
             >
-              <div
-                aria-labelledby="Table-toolbar-search-search"
-                className="bx--search bx--search--sm table-toolbar-search"
-                role="search"
+              <svg
+                aria-hidden={true}
+                className="bx--search-magnifier"
+                focusable="false"
+                height={16}
+                preserveAspectRatio="xMidYMid meet"
+                viewBox="0 0 16 16"
+                width={16}
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                />
+              </svg>
+              <label
+                className="bx--label"
+                htmlFor="Table-toolbar-search"
+                id="Table-toolbar-search-search"
+              >
+                Search
+              </label>
+              <input
+                aria-hidden={false}
+                autoComplete="off"
+                className="bx--search-input"
+                id="Table-toolbar-search"
+                onChange={[Function]}
+                placeholder="Search"
+                role="searchbox"
+                tabIndex="0"
+                type="text"
+                value="toyota"
+              />
+              <button
+                aria-label="Clear search input"
+                className="bx--search-close"
+                onClick={[Function]}
+                type="button"
               >
                 <svg
                   aria-hidden={true}
-                  className="bx--search-magnifier"
                   focusable="false"
                   height={16}
                   preserveAspectRatio="xMidYMid meet"
-                  viewBox="0 0 16 16"
+                  viewBox="0 0 32 32"
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
                   <path
-                    d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                    d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                   />
                 </svg>
-                <label
-                  className="bx--label"
-                  htmlFor="Table-toolbar-search"
-                  id="Table-toolbar-search-search"
-                >
-                  Search
-                </label>
-                <input
-                  aria-hidden={false}
-                  autoComplete="off"
-                  className="bx--search-input"
-                  id="Table-toolbar-search"
-                  onBlur={[Function]}
-                  onChange={[Function]}
-                  placeholder="Search"
-                  role="searchbox"
-                  tabIndex="-1"
-                  type="text"
-                  value="toyota"
-                />
-                <button
-                  aria-label="Clear search input"
-                  className="bx--search-close"
-                  onClick={[Function]}
-                  type="button"
-                >
-                  <svg
-                    aria-hidden={true}
-                    focusable="false"
-                    height={16}
-                    preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 32 32"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <polygon
-                      points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                    />
-                  </svg>
-                </button>
-              </div>
+              </button>
             </div>
           </div>
         </div>
@@ -194531,7 +194941,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-1-string"
+                id="cell-Table-row-5-string"
                 offset={0}
               >
                 <span
@@ -194539,9 +194949,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="helping whiteboard as 1"
+                    title="bottle toyota bottle 5"
                   >
-                    helping whiteboard as 1
+                    bottle toyota bottle 5
                   </span>
                 </span>
               </td>
@@ -194550,7 +194960,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-1-date"
+                id="cell-Table-row-5-date"
                 offset={0}
               >
                 <span
@@ -194558,9 +194968,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1973-03-14T23:33:20.000Z"
+                    title="1973-12-17T18:13:20.000Z"
                   >
-                    1973-03-14T23:33:20.000Z
+                    1973-12-17T18:13:20.000Z
                   </span>
                 </span>
               </td>
@@ -194574,7 +194984,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-2-string"
+                id="cell-Table-row-10-string"
                 offset={0}
               >
                 <span
@@ -194582,9 +194992,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="whiteboard can eat 2"
+                    title="toyota toyota toyota 10"
                   >
-                    whiteboard can eat 2
+                    toyota toyota toyota 10
                   </span>
                 </span>
               </td>
@@ -194593,7 +195003,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-2-date"
+                id="cell-Table-row-10-date"
                 offset={0}
               >
                 <span
@@ -194601,9 +195011,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1973-04-18T16:53:20.000Z"
+                    title="1976-05-03T19:33:20.000Z"
                   >
-                    1973-04-18T16:53:20.000Z
+                    1976-05-03T19:33:20.000Z
                   </span>
                 </span>
               </td>
@@ -194617,7 +195027,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-3-string"
+                id="cell-Table-row-15-string"
                 offset={0}
               >
                 <span
@@ -194625,9 +195035,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="as eat scott 3"
+                    title="bottle toyota bottle 15"
                   >
-                    as eat scott 3
+                    bottle toyota bottle 15
                   </span>
                 </span>
               </td>
@@ -194636,7 +195046,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-3-date"
+                id="cell-Table-row-15-date"
                 offset={0}
               >
                 <span
@@ -194644,9 +195054,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1973-06-15T13:46:40.000Z"
+                    title="1980-04-19T13:46:40.000Z"
                   >
-                    1973-06-15T13:46:40.000Z
+                    1980-04-19T13:46:40.000Z
                   </span>
                 </span>
               </td>
@@ -194660,7 +195070,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-4-string"
+                id="cell-Table-row-20-string"
                 offset={0}
               >
                 <span
@@ -194668,9 +195078,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="can pinocchio whiteboard 4"
+                    title="toyota toyota toyota 20"
                   >
-                    can pinocchio whiteboard 4
+                    toyota toyota toyota 20
                   </span>
                 </span>
               </td>
@@ -194679,7 +195089,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-4-date"
+                id="cell-Table-row-20-date"
                 offset={0}
               >
                 <span
@@ -194687,9 +195097,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1973-09-04T14:13:20.000Z"
+                    title="1985-11-05T00:53:20.000Z"
                   >
-                    1973-09-04T14:13:20.000Z
+                    1985-11-05T00:53:20.000Z
                   </span>
                 </span>
               </td>
@@ -194703,7 +195113,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-5-string"
+                id="cell-Table-row-25-string"
                 offset={0}
               >
                 <span
@@ -194711,9 +195121,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="bottle toyota bottle 5"
+                    title="bottle toyota bottle 25"
                   >
-                    bottle toyota bottle 5
+                    bottle toyota bottle 25
                   </span>
                 </span>
               </td>
@@ -194722,7 +195132,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-5-date"
+                id="cell-Table-row-25-date"
                 offset={0}
               >
                 <span
@@ -194730,9 +195140,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1973-12-17T18:13:20.000Z"
+                    title="1992-12-22T04:53:20.000Z"
                   >
-                    1973-12-17T18:13:20.000Z
+                    1992-12-22T04:53:20.000Z
                   </span>
                 </span>
               </td>
@@ -194746,7 +195156,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-6-string"
+                id="cell-Table-row-30-string"
                 offset={0}
               >
                 <span
@@ -194754,9 +195164,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="eat whiteboard pinocchio 6"
+                    title="toyota toyota toyota 30"
                   >
-                    eat whiteboard pinocchio 6
+                    toyota toyota toyota 30
                   </span>
                 </span>
               </td>
@@ -194765,7 +195175,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-6-date"
+                id="cell-Table-row-30-date"
                 offset={0}
               >
                 <span
@@ -194773,9 +195183,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1974-04-24T01:46:40.000Z"
+                    title="2001-09-09T01:46:40.000Z"
                   >
-                    1974-04-24T01:46:40.000Z
+                    2001-09-09T01:46:40.000Z
                   </span>
                 </span>
               </td>
@@ -194789,7 +195199,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-7-string"
+                id="cell-Table-row-35-string"
                 offset={0}
               >
                 <span
@@ -194797,9 +195207,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="chocolate can helping 7"
+                    title="bottle toyota bottle 35"
                   >
-                    chocolate can helping 7
+                    bottle toyota bottle 35
                   </span>
                 </span>
               </td>
@@ -194808,7 +195218,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-7-date"
+                id="cell-Table-row-35-date"
                 offset={0}
               >
                 <span
@@ -194816,9 +195226,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1974-09-21T12:53:20.000Z"
+                    title="2011-12-27T15:33:20.000Z"
                   >
-                    1974-09-21T12:53:20.000Z
+                    2011-12-27T15:33:20.000Z
                   </span>
                 </span>
               </td>
@@ -194832,7 +195242,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-8-string"
+                id="cell-Table-row-40-string"
                 offset={0}
               >
                 <span
@@ -194840,9 +195250,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="pinocchio eat can 8"
+                    title="toyota toyota toyota 40"
                   >
-                    pinocchio eat can 8
+                    toyota toyota toyota 40
                   </span>
                 </span>
               </td>
@@ -194851,7 +195261,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-8-date"
+                id="cell-Table-row-40-date"
                 offset={0}
               >
                 <span
@@ -194859,9 +195269,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1975-03-14T03:33:20.000Z"
+                    title="2023-11-14T22:13:20.000Z"
                   >
-                    1975-03-14T03:33:20.000Z
+                    2023-11-14T22:13:20.000Z
                   </span>
                 </span>
               </td>
@@ -194875,7 +195285,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="string"
                 data-offset={0}
-                id="cell-Table-row-9-string"
+                id="cell-Table-row-45-string"
                 offset={0}
               >
                 <span
@@ -194883,9 +195293,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="scott pinocchio chocolate 9"
+                    title="bottle toyota bottle 45"
                   >
-                    scott pinocchio chocolate 9
+                    bottle toyota bottle 45
                   </span>
                 </span>
               </td>
@@ -194894,7 +195304,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="data-table-start"
                 data-column="date"
                 data-offset={0}
-                id="cell-Table-row-9-date"
+                id="cell-Table-row-45-date"
                 offset={0}
               >
                 <span
@@ -194902,9 +195312,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 >
                   <span
                     className=""
-                    title="1975-09-26T21:46:40.000Z"
+                    title="2037-05-03T21:46:40.000Z"
                   >
-                    1975-09-26T21:46:40.000Z
+                    2037-05-03T21:46:40.000Z
                   </span>
                 </span>
               </td>
@@ -194985,8 +195395,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -194996,7 +195406,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           <span
             className="bx--pagination__text"
           >
-            1–10 of 100 items
+            1–10 of 20 items
           </span>
         </div>
         <div
@@ -195012,7 +195422,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--label bx--visually-hidden"
                 htmlFor="bx-pagination-select-5-right"
               >
-                Page number, of 10 pages
+                Page number, of 2 pages
               </label>
               <div
                 className="bx--select-input--inline__wrapper"
@@ -195043,70 +195453,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     >
                       2
                     </option>
-                    <option
-                      className="bx--select-option"
-                      disabled={false}
-                      hidden={false}
-                      value={3}
-                    >
-                      3
-                    </option>
-                    <option
-                      className="bx--select-option"
-                      disabled={false}
-                      hidden={false}
-                      value={4}
-                    >
-                      4
-                    </option>
-                    <option
-                      className="bx--select-option"
-                      disabled={false}
-                      hidden={false}
-                      value={5}
-                    >
-                      5
-                    </option>
-                    <option
-                      className="bx--select-option"
-                      disabled={false}
-                      hidden={false}
-                      value={6}
-                    >
-                      6
-                    </option>
-                    <option
-                      className="bx--select-option"
-                      disabled={false}
-                      hidden={false}
-                      value={7}
-                    >
-                      7
-                    </option>
-                    <option
-                      className="bx--select-option"
-                      disabled={false}
-                      hidden={false}
-                      value={8}
-                    >
-                      8
-                    </option>
-                    <option
-                      className="bx--select-option"
-                      disabled={false}
-                      hidden={false}
-                      value={9}
-                    >
-                      9
-                    </option>
-                    <option
-                      className="bx--select-option"
-                      disabled={false}
-                      hidden={false}
-                      value={10}
-                    >
-                      10
-                    </option>
                   </select>
                   <svg
                     aria-hidden={true}
@@ -195118,8 +195464,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -195129,7 +195475,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           <span
             className="bx--pagination__text"
           >
-            1 of 10 pages
+            1 of 2 pages
           </span>
           <button
             aria-label="Previous page"
@@ -195147,8 +195493,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -195168,8 +195514,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -286098,20 +286444,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
         <div
           className="bx--toolbar-content iot--table-toolbar-content"
         >
-          <div
-            className="iot--tooltip-svg-wrapper"
+          <button
+            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="column-selection-button"
+            disabled={false}
             onClick={[Function]}
             onKeyDown={[Function]}
-            role="button"
             tabIndex={0}
+            type="button"
           >
+            <span
+              className="bx--assistive-text"
+            >
+              Column Selection
+            </span>
             <svg
-              aria-hidden={true}
-              description="Column Selection"
+              aria-hidden="true"
+              aria-label="Column Selection"
+              className="bx--btn__icon"
               focusable="false"
               height={20}
               preserveAspectRatio="xMidYMid meet"
+              role="img"
               viewBox="0 0 32 32"
               width={20}
               xmlns="http://www.w3.org/2000/svg"
@@ -286132,7 +286486,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 y="4"
               />
             </svg>
-          </div>
+          </button>
         </div>
       </section>
       <div
@@ -302583,8 +302937,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -302850,8 +303204,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -303079,8 +303433,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -303320,8 +303674,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -303560,276 +303914,276 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     viewBox="0 0 16 16"
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+                    />
+                  </svg>
+                </button>
+              </td>
+              <td
+                align="start"
+                className="data-table-start"
+                data-column="string"
+                data-offset={0}
+                id="cell-Table-row-4-string"
+                offset={0}
+              >
+                <span
+                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
+                >
+                  <span
+                    className=""
+                    title="can pinocchio whiteboard 4"
+                  >
+                    can pinocchio whiteboard 4
+                  </span>
+                </span>
+              </td>
+              <td
+                align="start"
+                className="data-table-start"
+                data-column="date"
+                data-offset={0}
+                id="cell-Table-row-4-date"
+                offset={0}
+              >
+                <span
+                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
+                >
+                  <span
+                    className=""
+                    title="1973-09-04T14:13:20.000Z"
+                  >
+                    1973-09-04T14:13:20.000Z
+                  </span>
+                </span>
+              </td>
+              <td
+                align="start"
+                className="data-table-start"
+                data-column="select"
+                data-offset={0}
+                id="cell-Table-row-4-select"
+                offset={0}
+              >
+                <span
+                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
+                >
+                  <span
+                    className=""
+                    title="option-B"
+                  >
+                    option-B
+                  </span>
+                </span>
+              </td>
+              <td
+                align="start"
+                className="data-table-start"
+                data-column="status"
+                data-offset={0}
+                id="cell-Table-row-4-status"
+                offset={0}
+              >
+                <span
+                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
+                >
+                  <svg
+                    height="10"
+                    width="10"
+                  >
+                    <circle
+                      cx="5"
+                      cy="5"
+                      fill="gray"
+                      r="3"
+                      stroke="none"
+                      strokeWidth="1"
+                    />
+                  </svg>
+                </span>
+              </td>
+              <td
+                align="start"
+                className="data-table-start"
+                data-column="number"
+                data-offset={0}
+                id="cell-Table-row-4-number"
+                offset={0}
+              >
+                <span
+                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
+                >
+                  <span
+                    className=""
+                    title={16}
+                  >
+                    16
+                  </span>
+                </span>
+              </td>
+              <td
+                align="start"
+                className="data-table-start"
+                data-column="boolean"
+                data-offset={0}
+                id="cell-Table-row-4-boolean"
+                offset={0}
+              >
+                <span
+                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
+                >
+                  <span
+                    className=""
+                    title="true"
+                  >
+                    true
+                  </span>
+                </span>
+              </td>
+              <td
+                align="start"
+                className="data-table-start"
+                data-column="node"
+                data-offset={0}
+                id="cell-Table-row-4-node"
+                offset={0}
+              >
+                <span
+                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
+                >
+                  <svg
+                    aria-hidden={true}
+                    focusable="false"
+                    height={20}
+                    preserveAspectRatio="xMidYMid meet"
+                    viewBox="0 0 32 32"
+                    width={20}
+                    xmlns="http://www.w3.org/2000/svg"
                   >
                     <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
-                    />
-                  </svg>
-                </button>
-              </td>
-              <td
-                align="start"
-                className="data-table-start"
-                data-column="string"
-                data-offset={0}
-                id="cell-Table-row-4-string"
-                offset={0}
-              >
-                <span
-                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
-                >
-                  <span
-                    className=""
-                    title="can pinocchio whiteboard 4"
-                  >
-                    can pinocchio whiteboard 4
-                  </span>
-                </span>
-              </td>
-              <td
-                align="start"
-                className="data-table-start"
-                data-column="date"
-                data-offset={0}
-                id="cell-Table-row-4-date"
-                offset={0}
-              >
-                <span
-                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
-                >
-                  <span
-                    className=""
-                    title="1973-09-04T14:13:20.000Z"
-                  >
-                    1973-09-04T14:13:20.000Z
-                  </span>
-                </span>
-              </td>
-              <td
-                align="start"
-                className="data-table-start"
-                data-column="select"
-                data-offset={0}
-                id="cell-Table-row-4-select"
-                offset={0}
-              >
-                <span
-                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
-                >
-                  <span
-                    className=""
-                    title="option-B"
-                  >
-                    option-B
-                  </span>
-                </span>
-              </td>
-              <td
-                align="start"
-                className="data-table-start"
-                data-column="status"
-                data-offset={0}
-                id="cell-Table-row-4-status"
-                offset={0}
-              >
-                <span
-                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
-                >
-                  <svg
-                    height="10"
-                    width="10"
-                  >
-                    <circle
-                      cx="5"
-                      cy="5"
-                      fill="gray"
-                      r="3"
-                      stroke="none"
-                      strokeWidth="1"
-                    />
-                  </svg>
-                </span>
-              </td>
-              <td
-                align="start"
-                className="data-table-start"
-                data-column="number"
-                data-offset={0}
-                id="cell-Table-row-4-number"
-                offset={0}
-              >
-                <span
-                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
-                >
-                  <span
-                    className=""
-                    title={16}
-                  >
-                    16
-                  </span>
-                </span>
-              </td>
-              <td
-                align="start"
-                className="data-table-start"
-                data-column="boolean"
-                data-offset={0}
-                id="cell-Table-row-4-boolean"
-                offset={0}
-              >
-                <span
-                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
-                >
-                  <span
-                    className=""
-                    title="true"
-                  >
-                    true
-                  </span>
-                </span>
-              </td>
-              <td
-                align="start"
-                className="data-table-start"
-                data-column="node"
-                data-offset={0}
-                id="cell-Table-row-4-node"
-                offset={0}
-              >
-                <span
-                  className="TableBodyRow__StyledNestedSpan-sc-103itxu-5 YBqdC"
-                >
-                  <svg
-                    aria-hidden={true}
-                    focusable="false"
-                    height={20}
-                    preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 32 32"
-                    width={20}
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <polygon
-                      points="17,15 17,8 15,8 15,15 8,15 8,17 15,17 15,24 17,24 17,17 24,17 24,15"
-                    />
-                  </svg>
-                </span>
-              </td>
-              <td
-                className="RowActionsCell__StyledTableCell-sc-1toqqj7-0 bGkBkT"
-              >
-                <div
-                  className="iot--row-actions-container RowActionsCell__RowActionsContainer-sc-1toqqj7-1 jpHMyF"
-                >
-                  <div
-                    className="iot--row-actions-container__background"
-                  >
-                    <button
-                      className="bx--btn bx--btn--ghost"
-                      data-testid="Table-row-4-row-actions-button-drilldown"
-                      disabled={false}
-                      onClick={[Function]}
-                      tabIndex={0}
-                      type="button"
-                    >
-                      See more
-                      <svg
-                        aria-hidden="true"
-                        aria-label="See more"
-                        className="bx--btn__icon"
-                        focusable="false"
-                        height={20}
-                        preserveAspectRatio="xMidYMid meet"
-                        role="img"
-                        viewBox="0 0 20 20"
-                        width={20}
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <polygon
-                          points="11.8,2.8 10.8,3.8 16.2,9.3 1,9.3 1,10.7 16.2,10.7 10.8,16.2 11.8,17.2 19,10"
-                        />
-                      </svg>
-                    </button>
-                    <button
-                      aria-expanded={false}
-                      aria-haspopup={true}
-                      aria-label="More actions"
-                      className="RowActionsCell__StyledOverflowMenu-sc-1toqqj7-3 etHQFk bx--overflow-menu"
-                      data-testid="Table-row-4-row-actions-cell-overflow"
-                      id="Table-row-4-row-actions-cell-overflow"
-                      onClick={[Function]}
-                      onClose={[Function]}
-                      onKeyDown={[Function]}
-                      open={false}
-                      tabIndex={0}
-                    >
-                      <svg
-                        aria-label="More actions"
-                        className="bx--overflow-menu__icon"
-                        focusable="false"
-                        height={16}
-                        onClick={[Function]}
-                        onKeyDown={[Function]}
-                        preserveAspectRatio="xMidYMid meet"
-                        role="img"
-                        viewBox="0 0 32 32"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <circle
-                          cx="16"
-                          cy="8"
-                          r="2"
-                        />
-                        <circle
-                          cx="16"
-                          cy="16"
-                          r="2"
-                        />
-                        <circle
-                          cx="16"
-                          cy="24"
-                          r="2"
-                        />
-                        <title>
-                          More actions
-                        </title>
-                      </svg>
-                    </button>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr
-              className="bx--parent-row iot--expanded-tablerow TableBodyRow__StyledTableExpandRow-sc-103itxu-2 dndkEF"
-              data-child-count={0}
-              data-nesting-offset={0}
-              data-parent-row={true}
-              data-row-nesting={false}
-              onClick={[Function]}
-            >
-              <td
-                className="bx--table-expand"
-                headers="expand"
-              >
-                <button
-                  aria-label="Click to expand content"
-                  className="bx--table-expand__button"
-                  onClick={[Function]}
-                  title="Click to expand content"
-                >
-                  <svg
-                    aria-label="Click to expand content"
-                    className="bx--table-expand__svg"
-                    focusable="false"
-                    height={16}
-                    preserveAspectRatio="xMidYMid meet"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                      points="17,15 17,8 15,8 15,15 8,15 8,17 15,17 15,24 17,24 17,17 24,17 24,15"
+                    />
+                  </svg>
+                </span>
+              </td>
+              <td
+                className="RowActionsCell__StyledTableCell-sc-1toqqj7-0 bGkBkT"
+              >
+                <div
+                  className="iot--row-actions-container RowActionsCell__RowActionsContainer-sc-1toqqj7-1 jpHMyF"
+                >
+                  <div
+                    className="iot--row-actions-container__background"
+                  >
+                    <button
+                      className="bx--btn bx--btn--ghost"
+                      data-testid="Table-row-4-row-actions-button-drilldown"
+                      disabled={false}
+                      onClick={[Function]}
+                      tabIndex={0}
+                      type="button"
+                    >
+                      See more
+                      <svg
+                        aria-hidden="true"
+                        aria-label="See more"
+                        className="bx--btn__icon"
+                        focusable="false"
+                        height={20}
+                        preserveAspectRatio="xMidYMid meet"
+                        role="img"
+                        viewBox="0 0 20 20"
+                        width={20}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <polygon
+                          points="11.8,2.8 10.8,3.8 16.2,9.3 1,9.3 1,10.7 16.2,10.7 10.8,16.2 11.8,17.2 19,10"
+                        />
+                      </svg>
+                    </button>
+                    <button
+                      aria-expanded={false}
+                      aria-haspopup={true}
+                      aria-label="More actions"
+                      className="RowActionsCell__StyledOverflowMenu-sc-1toqqj7-3 etHQFk bx--overflow-menu"
+                      data-testid="Table-row-4-row-actions-cell-overflow"
+                      id="Table-row-4-row-actions-cell-overflow"
+                      onClick={[Function]}
+                      onClose={[Function]}
+                      onKeyDown={[Function]}
+                      open={false}
+                      tabIndex={0}
+                    >
+                      <svg
+                        aria-label="More actions"
+                        className="bx--overflow-menu__icon"
+                        focusable="false"
+                        height={16}
+                        onClick={[Function]}
+                        onKeyDown={[Function]}
+                        preserveAspectRatio="xMidYMid meet"
+                        role="img"
+                        viewBox="0 0 32 32"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <circle
+                          cx="16"
+                          cy="8"
+                          r="2"
+                        />
+                        <circle
+                          cx="16"
+                          cy="16"
+                          r="2"
+                        />
+                        <circle
+                          cx="16"
+                          cy="24"
+                          r="2"
+                        />
+                        <title>
+                          More actions
+                        </title>
+                      </svg>
+                    </button>
+                  </div>
+                </div>
+              </td>
+            </tr>
+            <tr
+              className="bx--parent-row iot--expanded-tablerow TableBodyRow__StyledTableExpandRow-sc-103itxu-2 dndkEF"
+              data-child-count={0}
+              data-nesting-offset={0}
+              data-parent-row={true}
+              data-row-nesting={false}
+              onClick={[Function]}
+            >
+              <td
+                className="bx--table-expand"
+                headers="expand"
+              >
+                <button
+                  aria-label="Click to expand content"
+                  className="bx--table-expand__button"
+                  onClick={[Function]}
+                  title="Click to expand content"
+                >
+                  <svg
+                    aria-label="Click to expand content"
+                    className="bx--table-expand__svg"
+                    focusable="false"
+                    height={16}
+                    preserveAspectRatio="xMidYMid meet"
+                    role="img"
+                    viewBox="0 0 16 16"
+                    width={16}
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -304069,8 +304423,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -304310,8 +304664,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -304551,8 +304905,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -304818,8 +305172,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -305059,8 +305413,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -305300,8 +305654,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -305541,8 +305895,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -305808,8 +306162,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -306049,8 +306403,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -306290,8 +306644,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -306531,8 +306885,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -306798,8 +307152,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -307039,8 +307393,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -307280,8 +307634,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -307521,8 +307875,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -307788,8 +308142,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -308029,8 +308383,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -308270,8 +308624,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -308511,8 +308865,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -308778,8 +309132,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -309019,8 +309373,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -309260,8 +309614,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -309501,8 +309855,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -309768,8 +310122,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -310009,8 +310363,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -310250,8 +310604,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -310491,8 +310845,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -310758,8 +311112,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -310999,8 +311353,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -311240,8 +311594,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -311481,8 +311835,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -311748,8 +312102,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -311989,8 +312343,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -312230,8 +312584,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -312471,8 +312825,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -312738,8 +313092,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -312979,8 +313333,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -313220,8 +313574,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -313461,8 +313815,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -313728,8 +314082,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -313969,8 +314323,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -314210,8 +314564,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -314451,8 +314805,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -314718,8 +315072,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -314959,8 +315313,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -315200,8 +315554,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -315441,8 +315795,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -315708,8 +316062,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -315949,8 +316303,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -316190,8 +316544,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -316431,8 +316785,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -316698,8 +317052,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -316939,8 +317293,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -317180,8 +317534,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -317421,8 +317775,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -317688,8 +318042,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -317929,8 +318283,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -318170,8 +318524,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -318411,8 +318765,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -318678,8 +319032,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -318919,8 +319273,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -319160,8 +319514,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -319401,8 +319755,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -319668,8 +320022,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -319909,8 +320263,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -320150,8 +320504,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -320391,8 +320745,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -320658,8 +321012,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -320899,8 +321253,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -321140,8 +321494,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -321381,8 +321735,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -321648,8 +322002,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -321889,8 +322243,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -322130,8 +322484,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -322371,8 +322725,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -322638,8 +322992,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -322879,8 +323233,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -323120,8 +323474,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -323361,8 +323715,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -323628,8 +323982,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -323869,8 +324223,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -324110,8 +324464,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -324351,8 +324705,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -324618,8 +324972,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -324859,8 +325213,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -325100,8 +325454,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -325341,8 +325695,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -325608,8 +325962,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -325849,8 +326203,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -326090,8 +326444,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -326331,8 +326685,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -326598,8 +326952,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -326839,8 +327193,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -327080,8 +327434,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -327549,8 +327903,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -327732,8 +328086,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -327915,8 +328269,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -328098,8 +328452,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -328281,8 +328635,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -328464,8 +328818,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -328647,8 +329001,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -328830,8 +329184,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -329013,8 +329367,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -329196,8 +329550,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -329379,8 +329733,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -329562,8 +329916,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -329745,8 +330099,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -329928,8 +330282,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -330111,8 +330465,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -330294,8 +330648,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -330477,8 +330831,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -330660,8 +331014,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -330843,8 +331197,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -331026,8 +331380,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -331209,8 +331563,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -331392,8 +331746,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -331575,8 +331929,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -331758,8 +332112,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -331941,8 +332295,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -332124,8 +332478,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -332307,8 +332661,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -332490,8 +332844,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -332673,8 +333027,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -332856,8 +333210,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -333039,8 +333393,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -333222,8 +333576,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -333405,8 +333759,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -333588,8 +333942,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -333771,8 +334125,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -333954,8 +334308,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -334137,8 +334491,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -334320,8 +334674,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -334503,8 +334857,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -334686,8 +335040,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -334869,8 +335223,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -335052,8 +335406,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -335235,8 +335589,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -335418,8 +335772,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -335601,8 +335955,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -335784,8 +336138,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -335967,8 +336321,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -336150,8 +336504,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -336333,8 +336687,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -336516,8 +336870,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -336699,8 +337053,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -336882,8 +337236,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -337065,8 +337419,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -337248,8 +337602,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -337431,8 +337785,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -337614,8 +337968,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -337797,8 +338151,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -337980,8 +338334,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -338163,8 +338517,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -338346,8 +338700,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -338529,8 +338883,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -338712,8 +339066,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -338895,8 +339249,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -339078,8 +339432,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -339261,8 +339615,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -339444,8 +339798,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -339627,8 +339981,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -339810,8 +340164,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -339993,8 +340347,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -340176,8 +340530,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -340359,8 +340713,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -340542,8 +340896,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -340725,8 +341079,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -340908,8 +341262,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -341091,8 +341445,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -341274,8 +341628,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -341457,8 +341811,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -341640,8 +341994,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -341823,8 +342177,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -342006,8 +342360,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -342189,8 +342543,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -342372,8 +342726,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -342555,8 +342909,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -342738,8 +343092,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -342921,8 +343275,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -343104,8 +343458,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -343287,8 +343641,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -343470,8 +343824,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -343653,8 +344007,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -343836,8 +344190,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -344019,8 +344373,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -344202,8 +344556,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -344385,8 +344739,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -344568,8 +344922,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -344751,8 +345105,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -344934,8 +345288,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -345117,8 +345471,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -345300,8 +345654,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -345483,8 +345837,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -345666,8 +346020,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -363447,8 +363801,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -363649,8 +364003,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -363851,8 +364205,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -364053,8 +364407,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -364255,8 +364609,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -364457,8 +364811,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -364659,8 +365013,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -364861,8 +365215,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -365063,8 +365417,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -365265,8 +365619,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -365467,8 +365821,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -365669,8 +366023,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -365871,8 +366225,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -366073,8 +366427,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -366275,8 +366629,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -366477,8 +366831,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -366679,8 +367033,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -366881,8 +367235,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                    <path
+                      d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                     />
                   </svg>
                 </button>
@@ -367130,8 +367484,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -367263,8 +367617,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -367292,8 +367646,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -367313,8 +367667,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -369734,8 +370088,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -369867,8 +370221,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                     />
                   </svg>
                 </div>
@@ -369896,8 +370250,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="20,24 10,16 20,8"
+              <path
+                d="M20 24L10 16 20 8z"
               />
             </svg>
           </button>
@@ -369917,8 +370271,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               width={24}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="12,8 22,16 12,24"
+              <path
+                d="M12 8L22 16 12 24z"
               />
             </svg>
           </button>
@@ -370003,20 +370357,28 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           <div
             className="bx--toolbar-content iot--table-toolbar-content"
           >
-            <div
-              className="iot--tooltip-svg-wrapper"
+            <button
+              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="filter-button"
+              disabled={false}
               onClick={[Function]}
               onKeyDown={[Function]}
-              role="button"
               tabIndex={0}
+              type="button"
             >
+              <span
+                className="bx--assistive-text"
+              >
+                Filters
+              </span>
               <svg
-                aria-hidden={true}
-                description="Filters"
+                aria-hidden="true"
+                aria-label="Filters"
+                className="bx--btn__icon"
                 focusable="false"
                 height={20}
                 preserveAspectRatio="xMidYMid meet"
+                role="img"
                 viewBox="0 0 32 32"
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
@@ -370025,7 +370387,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                 />
               </svg>
-            </div>
+            </button>
           </div>
         </section>
         <div
@@ -370327,11 +370689,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370390,11 +370749,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370453,11 +370809,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370516,11 +370869,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370579,11 +370929,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370641,11 +370988,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370716,11 +371060,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370817,11 +371158,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370880,11 +371218,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -370943,11 +371278,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371006,11 +371338,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371069,11 +371398,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371131,11 +371457,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371206,11 +371529,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371307,11 +371627,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371370,11 +371687,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371433,11 +371747,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371496,11 +371807,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371559,11 +371867,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371621,11 +371926,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371696,11 +371998,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371797,11 +372096,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371860,11 +372156,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371923,11 +372216,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -371986,11 +372276,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372049,11 +372336,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372111,11 +372395,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372186,11 +372467,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372287,11 +372565,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372350,11 +372625,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372413,11 +372685,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372476,11 +372745,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372539,11 +372805,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372601,11 +372864,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372676,11 +372936,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372777,11 +373034,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372840,11 +373094,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372903,11 +373154,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -372966,11 +373214,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373029,11 +373274,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373091,11 +373333,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373166,11 +373405,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373267,11 +373503,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373330,11 +373563,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373393,11 +373623,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373456,11 +373683,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373519,11 +373743,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373581,11 +373802,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373656,11 +373874,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373757,11 +373972,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373820,11 +374032,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373883,11 +374092,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -373946,11 +374152,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374009,11 +374212,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374071,11 +374271,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374146,11 +374343,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374247,11 +374441,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374310,11 +374501,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374373,11 +374561,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374436,11 +374621,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374499,11 +374681,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374561,11 +374740,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374636,11 +374812,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374737,11 +374910,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374800,11 +374970,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374863,11 +375030,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374926,11 +375090,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -374989,11 +375150,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -375051,11 +375209,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -375126,11 +375281,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <polygon
-                                points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                              />
                               <path
-                                d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                                d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                               />
                               <path
                                 d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -375219,8 +375371,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                      <path
+                        d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                       />
                     </svg>
                   </div>
@@ -375352,8 +375504,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                      <path
+                        d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                       />
                     </svg>
                   </div>
@@ -375381,8 +375533,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 width={24}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="20,24 10,16 20,8"
+                <path
+                  d="M20 24L10 16 20 8z"
                 />
               </svg>
             </button>
@@ -375402,8 +375554,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 width={24}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="12,8 22,16 12,24"
+                <path
+                  d="M12 8L22 16 12 24z"
                 />
               </svg>
             </button>
diff --git a/src/components/Table/baseTableReducer.js b/src/components/Table/baseTableReducer.js
index 06faab13f4..fc4048e885 100644
--- a/src/components/Table/baseTableReducer.js
+++ b/src/components/Table/baseTableReducer.js
@@ -97,7 +97,7 @@ export const baseTableReducer = (state = {}, action) => {
           toolbar: {
             search: {
               $set: {
-                value: action.payload,
+                defaultValue: action.payload,
               },
             },
           },
diff --git a/src/components/Table/tableReducer.test.jsx b/src/components/Table/tableReducer.test.jsx
index 1bb5bed510..2202be85ba 100644
--- a/src/components/Table/tableReducer.test.jsx
+++ b/src/components/Table/tableReducer.test.jsx
@@ -84,7 +84,7 @@ describe('table reducer', () => {
       const searchString = 'searchString';
       const updatedState = tableReducer(initialState, tableSearchApply(searchString));
       // Apply the search
-      expect(updatedState.view.toolbar.search.value).toEqual(searchString);
+      expect(updatedState.view.toolbar.search.defaultValue).toEqual(searchString);
       expect(updatedState.view.pagination.page).toEqual(1);
     });
   });
diff --git a/src/components/TableCard/__snapshots__/TableCard.story.storyshot b/src/components/TableCard/__snapshots__/TableCard.story.storyshot
index f521568416..8fc249ef4f 100644
--- a/src/components/TableCard/__snapshots__/TableCard.story.storyshot
+++ b/src/components/TableCard/__snapshots__/TableCard.story.storyshot
@@ -110,11 +110,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -127,95 +124,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -227,21 +223,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -250,7 +254,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -2186,8 +2190,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -2255,8 +2259,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -2284,8 +2288,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -2305,8 +2309,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -2453,11 +2457,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -2470,95 +2471,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -2570,21 +2570,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -2593,7 +2601,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -3322,8 +3330,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -3391,8 +3399,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -3420,8 +3428,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -3441,8 +3449,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -3589,11 +3597,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -3606,95 +3611,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -3706,21 +3710,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -3729,7 +3741,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -5928,8 +5940,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -5997,8 +6009,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -6026,8 +6038,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -6047,8 +6059,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -6195,11 +6207,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -6212,96 +6221,95 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      disabled={true}
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        disabled={true}
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -6313,21 +6321,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -6336,7 +6352,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -7320,8 +7336,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -7381,8 +7397,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -7410,8 +7426,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -7431,8 +7447,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -7579,11 +7595,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -7596,96 +7609,95 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      disabled={true}
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        disabled={true}
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -7697,21 +7709,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -7720,7 +7740,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -8011,8 +8031,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8107,8 +8127,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8203,8 +8223,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8299,8 +8319,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8395,8 +8415,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8491,8 +8511,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8587,8 +8607,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8683,8 +8703,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8779,8 +8799,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -8875,8 +8895,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -9018,8 +9038,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -9079,8 +9099,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -9108,8 +9128,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -9129,8 +9149,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -9277,11 +9297,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -9294,95 +9311,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -9394,21 +9410,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -9417,7 +9441,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -9882,11 +9906,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -9899,95 +9920,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -9999,21 +10019,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -10022,7 +10050,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -12157,8 +12185,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -12226,8 +12254,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -12255,8 +12283,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -12276,8 +12304,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -12424,11 +12452,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -12441,95 +12466,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -12541,21 +12565,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -12564,7 +12596,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -13570,8 +13602,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -13639,8 +13671,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -13668,8 +13700,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -13689,8 +13721,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -13837,11 +13869,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -13854,95 +13883,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -13954,21 +13982,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -13977,7 +14013,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -15222,8 +15258,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -15291,8 +15327,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -15320,8 +15356,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -15341,8 +15377,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -15489,11 +15525,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -15506,95 +15539,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -15606,21 +15638,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -15629,7 +15669,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -16635,8 +16675,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -16704,8 +16744,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -16733,8 +16773,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -16754,8 +16794,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -16902,11 +16942,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -16919,95 +16956,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
-                        />
-                      </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                        viewBox="0 0 32 32"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+                        />
+                      </svg>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -17019,21 +17055,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -17042,7 +17086,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -18602,8 +18646,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -18671,8 +18715,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -18700,8 +18744,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -18721,8 +18765,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -18869,11 +18913,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -18886,95 +18927,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -18986,21 +19026,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -19009,7 +19057,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -19322,8 +19370,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -19418,8 +19466,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -19514,8 +19562,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -19610,8 +19658,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -19706,8 +19754,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -19802,8 +19850,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -19898,8 +19946,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -19994,8 +20042,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -20090,8 +20138,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -20186,8 +20234,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -20329,8 +20377,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -20398,8 +20446,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -20427,8 +20475,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -20448,8 +20496,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -20596,11 +20644,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -20613,95 +20658,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -20713,21 +20757,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -20736,7 +20788,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -22076,8 +22128,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -22145,8 +22197,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -22174,8 +22226,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -22195,8 +22247,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -22343,11 +22395,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -22360,95 +22409,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -22460,21 +22508,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -22483,7 +22539,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -24619,8 +24675,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -24688,8 +24744,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -24717,8 +24773,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -24738,8 +24794,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -24886,11 +24942,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -24903,95 +24956,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -25003,21 +25055,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -25026,7 +25086,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -26636,8 +26696,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -26705,8 +26765,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -26734,8 +26794,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -26755,8 +26815,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -26903,11 +26963,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -26920,95 +26977,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -27020,21 +27076,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -27043,7 +27107,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -27521,8 +27585,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -27663,8 +27727,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -27805,8 +27869,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -27947,8 +28011,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -28089,8 +28153,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -28318,8 +28382,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -28460,8 +28524,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -28647,8 +28711,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -28789,8 +28853,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -28973,8 +29037,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -29249,8 +29313,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -29318,8 +29382,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -29347,8 +29411,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -29368,8 +29432,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
@@ -29516,11 +29580,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <polygon
-                        points="8.5,11 8.5,6.5 6.5,6.5 6.5,7.5 7.5,7.5 7.5,11 6,11 6,12 10,12 10,11"
-                      />
                       <path
-                        d="M8,3.5c-0.4,0-0.8,0.3-0.8,0.8S7.6,5,8,5c0.4,0,0.8-0.3,0.8-0.8S8.4,3.5,8,3.5z"
+                        d="M8.5 11L8.5 6.5 6.5 6.5 6.5 7.5 7.5 7.5 7.5 11 6 11 6 12 10 12 10 11zM8 3.5c-.4 0-.8.3-.8.8S7.6 5 8 5c.4 0 .8-.3.8-.8S8.4 3.5 8 3.5z"
                       />
                       <path
                         d="M8,15c-3.9,0-7-3.1-7-7s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8,2C4.7,2,2,4.7,2,8s2.7,6,6,6s6-2.7,6-6S11.3,2,8,2z"
@@ -29533,95 +29594,94 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                 className="bx--toolbar-content iot--table-toolbar-content"
               >
                 <div
-                  className="iot--table-toolbar-search"
+                  className="bx--toolbar-action bx--toolbar-search-container-expandable"
+                  onBlur={[Function]}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex="-1"
+                  onFocus={[Function]}
+                  tabIndex="0"
                 >
                   <div
-                    className="bx--toolbar-action bx--toolbar-search-container-expandable"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    tabIndex="0"
+                    aria-labelledby="table-for-card-table-list-toolbar-search-search"
+                    className="bx--search bx--search--sm table-toolbar-search"
+                    role="search"
                   >
-                    <div
-                      aria-labelledby="table-for-card-table-list-toolbar-search-search"
-                      className="bx--search bx--search--sm table-toolbar-search"
-                      role="search"
+                    <svg
+                      aria-hidden={true}
+                      className="bx--search-magnifier"
+                      focusable="false"
+                      height={16}
+                      preserveAspectRatio="xMidYMid meet"
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                      />
+                    </svg>
+                    <label
+                      className="bx--label"
+                      htmlFor="table-for-card-table-list-toolbar-search"
+                      id="table-for-card-table-list-toolbar-search-search"
+                    >
+                      Search
+                    </label>
+                    <input
+                      aria-hidden={true}
+                      autoComplete="off"
+                      className="bx--search-input"
+                      id="table-for-card-table-list-toolbar-search"
+                      onChange={[Function]}
+                      placeholder="Search"
+                      role="searchbox"
+                      tabIndex="-1"
+                      type="text"
+                      value=""
+                    />
+                    <button
+                      aria-label="Clear search input"
+                      className="bx--search-close bx--search-close--hidden"
+                      onClick={[Function]}
+                      type="button"
                     >
                       <svg
                         aria-hidden={true}
-                        className="bx--search-magnifier"
                         focusable="false"
                         height={16}
                         preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 16 16"
+                        viewBox="0 0 32 32"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
                         <path
-                          d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
+                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                         />
                       </svg>
-                      <label
-                        className="bx--label"
-                        htmlFor="table-for-card-table-list-toolbar-search"
-                        id="table-for-card-table-list-toolbar-search-search"
-                      >
-                        Search
-                      </label>
-                      <input
-                        aria-hidden={true}
-                        autoComplete="off"
-                        className="bx--search-input"
-                        id="table-for-card-table-list-toolbar-search"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder="Search"
-                        role="searchbox"
-                        tabIndex="-1"
-                        type="text"
-                        value=""
-                      />
-                      <button
-                        aria-label="Clear search input"
-                        className="bx--search-close bx--search-close--hidden"
-                        onClick={[Function]}
-                        type="button"
-                      >
-                        <svg
-                          aria-hidden={true}
-                          focusable="false"
-                          height={16}
-                          preserveAspectRatio="xMidYMid meet"
-                          viewBox="0 0 32 32"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <polygon
-                            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
-                          />
-                        </svg>
-                      </button>
-                    </div>
+                    </button>
                   </div>
                 </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Download table content
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Download table content"
+                    aria-hidden="true"
+                    aria-label="Download table content"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -29633,21 +29693,29 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M26,24v4H6V24H4v4H4a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2h0V24Z"
                     />
                   </svg>
-                </div>
-                <div
-                  className="iot--tooltip-svg-wrapper"
+                </button>
+                <button
+                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
+                  disabled={false}
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  role="button"
                   tabIndex={0}
+                  type="button"
                 >
+                  <span
+                    className="bx--assistive-text"
+                  >
+                    Filters
+                  </span>
                   <svg
-                    aria-hidden={true}
-                    description="Filters"
+                    aria-hidden="true"
+                    aria-label="Filters"
+                    className="bx--btn__icon"
                     focusable="false"
                     height={20}
                     preserveAspectRatio="xMidYMid meet"
+                    role="img"
                     viewBox="0 0 32 32"
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
@@ -29656,7 +29724,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       d="M18,28H14a2,2,0,0,1-2-2V18.41L4.59,11A2,2,0,0,1,4,9.59V6A2,2,0,0,1,6,4H26a2,2,0,0,1,2,2V9.59A2,2,0,0,1,27.41,11L20,18.41V26A2,2,0,0,1,18,28ZM6,6V9.59l8,8V26h4V17.59l8-8V6Z"
                     />
                   </svg>
-                </div>
+                </button>
                 <div
                   className="iot--card--toolbar"
                 >
@@ -30032,8 +30100,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -30186,8 +30254,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -30342,8 +30410,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -30498,8 +30566,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -30654,8 +30722,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -30808,8 +30876,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -30962,8 +31030,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -31116,8 +31184,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -31225,8 +31293,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -31379,8 +31447,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
+                          <path
+                            d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
                           />
                         </svg>
                       </button>
@@ -31580,8 +31648,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -31649,8 +31717,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <polygon
-                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
+                          <path
+                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
                           />
                         </svg>
                       </div>
@@ -31678,8 +31746,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="20,24 10,16 20,8"
+                    <path
+                      d="M20 24L10 16 20 8z"
                     />
                   </svg>
                 </button>
@@ -31699,8 +31767,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     width={24}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <polygon
-                      points="12,8 22,16 12,24"
+                    <path
+                      d="M12 8L22 16 12 24z"
                     />
                   </svg>
                 </button>
diff --git a/src/components/TileCatalog/__snapshots__/TileCatalog.story.storyshot b/src/components/TileCatalog/__snapshots__/TileCatalog.story.storyshot
index 519d4ff455..e76f2e8b07 100644
--- a/src/components/TileCatalog/__snapshots__/TileCatalog.story.storyshot
+++ b/src/components/TileCatalog/__snapshots__/TileCatalog.story.storyshot
@@ -2336,8 +2336,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/TileC
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <polygon
-                  points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+                <path
+                  d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
                 />
               </svg>
             </button>
diff --git a/src/components/TileGallery/TileGallerySection.jsx b/src/components/TileGallery/TileGallerySection.jsx
index f7a8e1fb15..30844e5bcd 100644
--- a/src/components/TileGallery/TileGallerySection.jsx
+++ b/src/components/TileGallery/TileGallerySection.jsx
@@ -11,22 +11,15 @@ const propTypes = {
   isOpen: PropTypes.bool,
   /** Callback for accordion item click */
   onClick: PropTypes.func,
-  /** i18n strings */
-  i18n: PropTypes.shape({
-    arrowIconDescription: PropTypes.string,
-  }),
 };
 
 const defaultProps = {
   isOpen: true,
   onClick: () => {},
   title: null,
-  i18n: {
-    arrowIconDescription: 'Expand/Collapse',
-  },
 };
 
-const TileGallerySection = ({ children, title, isOpen, onClick, i18n }) => {
+const TileGallerySection = ({ children, title, isOpen, onClick }) => {
   const [open, setOpen] = useState(isOpen);
 
   const galleryItems = <div className="tile-gallery--section--items">{children}</div>;
@@ -42,7 +35,6 @@ const TileGallerySection = ({ children, title, isOpen, onClick, i18n }) => {
               onClick(evt);
             }}
             open={open}
-            iconDescription={i18n.arrowIconDescription}
           >
             {galleryItems}
           </AccordionItem>
diff --git a/src/components/WizardInline/__snapshots__/WizardInline.story.storyshot b/src/components/WizardInline/__snapshots__/WizardInline.story.storyshot
index d5dedf87f3..f4546abd8c 100644
--- a/src/components/WizardInline/__snapshots__/WizardInline.story.storyshot
+++ b/src/components/WizardInline/__snapshots__/WizardInline.story.storyshot
@@ -445,8 +445,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
                 <path
                   d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
                 />
-                <polygon
-                  points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+                <path
+                  d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
                 />
                 <title>
                   First step
@@ -771,8 +771,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
                 <path
                   d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
                 />
-                <polygon
-                  points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+                <path
+                  d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
                 />
                 <title>
                   First step
@@ -814,8 +814,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
                 <path
                   d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
                 />
-                <polygon
-                  points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+                <path
+                  d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
                 />
                 <title>
                   Device Information step goes here
@@ -857,8 +857,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
                 <path
                   d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
                 />
-                <polygon
-                  points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+                <path
+                  d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
                 />
                 <title>
                   Long step
@@ -1442,8 +1442,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
                 <path
                   d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
                 />
-                <polygon
-                  points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+                <path
+                  d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
                 />
                 <title>
                   First step
@@ -1970,8 +1970,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
diff --git a/src/components/WizardModal/__snapshots__/WizardModal.story.storyshot b/src/components/WizardModal/__snapshots__/WizardModal.story.storyshot
index 8ba4ce3b80..23ca359daf 100644
--- a/src/components/WizardModal/__snapshots__/WizardModal.story.storyshot
+++ b/src/components/WizardModal/__snapshots__/WizardModal.story.storyshot
@@ -63,8 +63,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -332,8 +332,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -608,8 +608,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <polygon
-                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
+              <path
+                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
               />
             </svg>
           </button>
@@ -647,8 +647,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
                   <path
                     d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
                   />
-                  <polygon
-                    points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+                  <path
+                    d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
                   />
                   <title>
                     step1
@@ -690,8 +690,8 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Wizar
                   <path
                     d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z"
                   />
-                  <polygon
-                    points="14 21.5 9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5"
+                  <path
+                    d="M14 21.5L9 16.54 10.59 14.97 14 18.35 21.41 11 23 12.58 14 21.5z"
                   />
                   <title>
                     step2
diff --git a/src/index.js b/src/index.js
index 6664c82f69..638b580453 100755
--- a/src/index.js
+++ b/src/index.js
@@ -14,7 +14,6 @@ export TableHead from './components/Table/TableHead/TableHead';
 export TableBody from './components/Table/TableBody/TableBody';
 export TableSkeletonWithHeaders from './components/Table/TableSkeletonWithHeaders/TableSkeletonWithHeaders';
 export TableToolbar from './components/Table/TableToolbar/TableToolbar';
-export TableToolbarSearch from './components/Table/TableToolbarSearch/TableToolbarSearch';
 export WizardModal from './components/WizardModal';
 export WizardInline from './components/WizardInline/WizardInline';
 export StatefulWizardInline from './components/WizardInline/StatefulWizardInline';
diff --git a/src/styles.scss b/src/styles.scss
index 1792fc3c6c..e4adfab0c0 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -236,7 +236,6 @@ $deprecations--message: 'Deprecated code was found, this code will be removed be
 @import 'components/SimplePagination/simple-pagination';
 @import 'components/Table/TableToolbar/table-toolbar';
 @import 'components/Table/pagination';
-@import 'components/Table/TableToolbarSearch/table-toolbar-search';
 @import 'components/Table/TableBody/RowActionsCell/row-actions-cell';
 @import 'components/Table/table';
 @import 'components/TableCard/threshold-icon';
diff --git a/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap b/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap
index eee7db92d2..4e95795388 100644
--- a/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap
+++ b/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap
@@ -2332,32 +2332,6 @@ Map {
       },
     },
   },
-  "TableToolbarSearch" => Object {
-    "defaultProps": Object {
-      "defaultExpanded": false,
-      "defaultValue": "",
-      "onChange": null,
-      "onExpand": null,
-      "value": "",
-    },
-    "propTypes": Object {
-      "defaultExpanded": Object {
-        "type": "bool",
-      },
-      "defaultValue": Object {
-        "type": "string",
-      },
-      "onChange": Object {
-        "type": "func",
-      },
-      "onExpand": Object {
-        "type": "func",
-      },
-      "value": Object {
-        "type": "string",
-      },
-    },
-  },
   "WizardModal" => Object {
     "defaultProps": Object {
       "currentStepIndex": 0,
@@ -12380,9 +12354,6 @@ Map {
   },
   "TileGallerySection" => Object {
     "defaultProps": Object {
-      "i18n": Object {
-        "arrowIconDescription": "Expand/Collapse",
-      },
       "isOpen": true,
       "onClick": [Function],
       "title": null,
@@ -12392,16 +12363,6 @@ Map {
         "isRequired": true,
         "type": "node",
       },
-      "i18n": Object {
-        "args": Array [
-          Object {
-            "arrowIconDescription": Object {
-              "type": "string",
-            },
-          },
-        ],
-        "type": "shape",
-      },
       "isOpen": Object {
         "type": "bool",
       },
@@ -13110,9 +13071,7 @@ Map {
       "className": Object {
         "type": "string",
       },
-      "iconDescription": Object {
-        "type": "string",
-      },
+      "iconDescription": [Function],
       "onClick": Object {
         "type": "func",
       },
@@ -13160,9 +13119,7 @@ Map {
       "className": Object {
         "type": "string",
       },
-      "iconDescription": Object {
-        "type": "string",
-      },
+      "iconDescription": [Function],
       "onClick": Object {
         "type": "func",
       },
@@ -13278,6 +13235,7 @@ Map {
   "ComboBox" => Object {
     "defaultProps": Object {
       "ariaLabel": "Choose an item",
+      "direction": "bottom",
       "disabled": false,
       "itemToElement": null,
       "itemToString": [Function],
@@ -13292,6 +13250,15 @@ Map {
       "className": Object {
         "type": "string",
       },
+      "direction": Object {
+        "args": Array [
+          Array [
+            "top",
+            "bottom",
+          ],
+        ],
+        "type": "oneOf",
+      },
       "disabled": Object {
         "type": "bool",
       },
@@ -13563,6 +13530,9 @@ Map {
       "closeModal": Object {
         "type": "func",
       },
+      "danger": Object {
+        "type": "bool",
+      },
       "onRequestClose": Object {
         "type": "func",
       },
@@ -13589,6 +13559,7 @@ Map {
   "ContentSwitcher" => Object {
     "defaultProps": Object {
       "selectedIndex": 0,
+      "selectionMode": "automatic",
     },
     "propTypes": Object {
       "children": Object {
@@ -13604,6 +13575,15 @@ Map {
       "selectedIndex": Object {
         "type": "number",
       },
+      "selectionMode": Object {
+        "args": Array [
+          Array [
+            "automatic",
+            "manual",
+          ],
+        ],
+        "type": "oneOf",
+      },
     },
   },
   "Copy" => Object {
@@ -13660,6 +13640,7 @@ Map {
     "Table": Object {
       "defaultProps": Object {
         "isSortable": false,
+        "overflowMenuOnHover": true,
       },
       "propTypes": Object {
         "className": Object {
@@ -13668,6 +13649,9 @@ Map {
         "isSortable": Object {
           "type": "bool",
         },
+        "overflowMenuOnHover": Object {
+          "type": "bool",
+        },
         "shouldShowBorder": Object {
           "type": "bool",
         },
@@ -14009,6 +13993,15 @@ Map {
         "children": Object {
           "type": "node",
         },
+        "size": Object {
+          "args": Array [
+            Array [
+              "small",
+              "normal",
+            ],
+          ],
+          "type": "oneOf",
+        },
       },
     },
     "TableToolbarAction": Object {
@@ -14128,6 +14121,8 @@ Map {
     "defaultProps": Object {
       "filterRows": [Function],
       "locale": "en",
+      "overflowMenuOnHover": true,
+      "size": "normal",
       "sortRow": [Function],
       "translateWithId": [Function],
     },
@@ -14162,6 +14157,9 @@ Map {
       "locale": Object {
         "type": "string",
       },
+      "overflowMenuOnHover": Object {
+        "type": "bool",
+      },
       "radio": Object {
         "type": "bool",
       },
@@ -14191,6 +14189,17 @@ Map {
         "isRequired": true,
         "type": "arrayOf",
       },
+      "size": Object {
+        "args": Array [
+          Array [
+            "compact",
+            "short",
+            "normal",
+            "tall",
+          ],
+        ],
+        "type": "oneOf",
+      },
       "sortRow": Object {
         "type": "func",
       },
@@ -14391,6 +14400,15 @@ Map {
         "type": "func",
       },
       "pattern": [Function],
+      "size": Object {
+        "args": Array [
+          Array [
+            "sm",
+            "xl",
+          ],
+        ],
+        "type": "oneOf",
+      },
       "type": Object {
         "type": "string",
       },
@@ -14398,6 +14416,7 @@ Map {
   },
   "Dropdown" => Object {
     "defaultProps": Object {
+      "direction": "bottom",
       "disabled": false,
       "helperText": "",
       "itemToElement": null,
@@ -14410,6 +14429,15 @@ Map {
       "ariaLabel": Object {
         "type": "string",
       },
+      "direction": Object {
+        "args": Array [
+          Array [
+            "top",
+            "bottom",
+          ],
+        ],
+        "type": "oneOf",
+      },
       "disabled": Object {
         "type": "bool",
       },
@@ -14728,21 +14756,22 @@ Map {
       "onClick": Object {
         "type": "func",
       },
+      "onDelete": Object {
+        "type": "func",
+      },
+      "size": Object {
+        "args": Array [
+          Array [
+            "default",
+            "field",
+            "small",
+          ],
+        ],
+        "type": "oneOf",
+      },
     },
   },
   "FileUploaderButton" => Object {
-    "defaultProps": Object {
-      "accept": Array [],
-      "buttonKind": "primary",
-      "disableLabelChanges": false,
-      "disabled": false,
-      "labelText": "Add file",
-      "multiple": false,
-      "onChange": [Function],
-      "onClick": [Function],
-      "role": "button",
-      "tabIndex": 0,
-    },
     "propTypes": Object {
       "accept": Object {
         "args": Array [
@@ -14798,6 +14827,16 @@ Map {
       "role": Object {
         "type": "string",
       },
+      "size": Object {
+        "args": Array [
+          Array [
+            "default",
+            "field",
+            "small",
+          ],
+        ],
+        "type": "oneOf",
+      },
       "tabIndex": Object {
         "type": "number",
       },
@@ -14854,7 +14893,6 @@ Map {
     "defaultProps": Object {
       "onDelete": [Function],
       "status": "uploading",
-      "uuid": "id1",
     },
     "propTypes": Object {
       "errorBody": Object {
@@ -14886,7 +14924,6 @@ Map {
         "type": "oneOf",
       },
       "uuid": Object {
-        "isRequired": true,
         "type": "string",
       },
     },
@@ -15098,6 +15135,9 @@ Map {
       "description": Object {
         "type": "string",
       },
+      "id": Object {
+        "type": "string",
+      },
       "small": Object {
         "type": "bool",
       },
@@ -15109,7 +15149,7 @@ Map {
   "Modal" => Object {
     "defaultProps": Object {
       "hasScrollingContent": false,
-      "iconDescription": "close the modal",
+      "iconDescription": "Close",
       "modalHeading": "",
       "modalLabel": "",
       "onKeyDown": [Function],
@@ -15506,6 +15546,7 @@ Map {
     },
     "defaultProps": Object {
       "compareItems": [Function],
+      "direction": "bottom",
       "disabled": false,
       "initialSelectedItems": Array [],
       "itemToString": [Function],
@@ -15522,6 +15563,15 @@ Map {
         "isRequired": true,
         "type": "func",
       },
+      "direction": Object {
+        "args": Array [
+          Array [
+            "top",
+            "bottom",
+          ],
+        ],
+        "type": "oneOf",
+      },
       "disabled": Object {
         "type": "bool",
       },
@@ -16828,6 +16878,7 @@ Map {
       "iconDescription": "show menu options",
       "role": "navigation",
       "selected": 0,
+      "selectionMode": "automatic",
       "triggerHref": "#",
       "type": "default",
     },
@@ -16864,6 +16915,15 @@ Map {
       "selected": Object {
         "type": "number",
       },
+      "selectionMode": Object {
+        "args": Array [
+          Array [
+            "automatic",
+            "manual",
+          ],
+        ],
+        "type": "oneOf",
+      },
       "tabContentClassName": Object {
         "type": "string",
       },
@@ -16896,6 +16956,9 @@ Map {
       "filter": Object {
         "type": "bool",
       },
+      "onClose": Object {
+        "type": "func",
+      },
       "title": Object {
         "type": "string",
       },
@@ -16912,9 +16975,9 @@ Map {
             "gray",
             "cool-gray",
             "warm-gray",
+            "high-contrast",
           ],
         ],
-        "isRequired": true,
         "type": "oneOf",
       },
     },
@@ -17115,6 +17178,7 @@ Map {
       "render": [Function],
     },
     "PasswordInput": Object {
+      "$$typeof": Symbol(react.forward_ref),
       "defaultProps": Object {
         "className": "\${prefix}--text__input",
         "disabled": false,
@@ -17222,6 +17286,7 @@ Map {
           "type": "oneOfType",
         },
       },
+      "render": [Function],
     },
     "defaultProps": Object {
       "disabled": false,
@@ -17655,9 +17720,7 @@ Map {
       "disabled": Object {
         "type": "bool",
       },
-      "hideLabel": Object {
-        "type": "bool",
-      },
+      "hideLabel": [Function],
       "iconDescription": Object {
         "isRequired": true,
         "type": "string",
@@ -17999,9 +18062,6 @@ Map {
             Object {
               "args": Array [
                 Object {
-                  "header": Object {
-                    "type": "node",
-                  },
                   "key": Object {
                     "type": "string",
                   },
@@ -18365,6 +18425,9 @@ Map {
       "element": Object {
         "type": "elementType",
       },
+      "isCurrentPage": Object {
+        "type": "bool",
+      },
       "isSideNavExpanded": Object {
         "type": "bool",
       },
diff --git a/yarn.lock b/yarn.lock
index f834646aec..7149d8a82b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1833,13 +1833,20 @@
   resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.7.0.tgz#7ad56c3f377bfaa687ccca0b0813011606d6cb28"
   integrity sha512-zIswRvP4JyZOq7+4A4/ro7K05xVNid/+HxBOSM1ApuqcXg1e1Vl9fg37+rGY/in9v7vVgsmA8s5Arlx1mJzPIw==
 
-"@carbon/icons-react@10.10.0", "@carbon/icons-react@^10.9.3":
+"@carbon/icons-react@10.10.0":
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.10.0.tgz#b8d61709583be1310ca5f2bdabfbdab2c0f6a892"
   integrity sha512-8H7RRUnvfZUlwad95Au+aR7CynIQwVcJ9OYEdEz4i16IdqFpWHql4RAb1jemLq6Q3kaHCpW4qKLDDLv8lWGu6g==
   dependencies:
     "@carbon/icon-helpers" "^10.7.0"
 
+"@carbon/icons-react@^10.11.0":
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.11.0.tgz#f25d0dcbe204aaa40ec973bdd10dda30f0b0ca7f"
+  integrity sha512-v1jZaQriW203wSlq7QdcILIuaVSsmo74asfe0MSa9nod4FqEb+sD6GHe85fgOoFnqvHKrJ+U1CSH/xd1GVC9xw==
+  dependencies:
+    "@carbon/icon-helpers" "^10.7.0"
+
 "@carbon/icons@10.9.3":
   version "10.9.3"
   resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.9.3.tgz#1e6f9cf705251964fa948f047bfe70f38c1312f2"
@@ -5585,12 +5592,12 @@ capture-stack-trace@^1.0.0:
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
   integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
-carbon-components-react@7.10.3:
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.10.3.tgz#667c5e1bce597123ccd6574204ab2b3dc721e4fc"
-  integrity sha512-L583T2qN5tFiYXHBv/iumw5vAE9T5OJ2l7LdEjY8/WUjzUdgA1iJD5tpYKL4U1ciO12zfWITlJBK8g39IupI/Q==
+carbon-components-react@^7.12.0:
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.12.0.tgz#d41125e774fa40e5c5fbc1d536c1923111273f6b"
+  integrity sha512-zsVD9/Dh8Rgl9LOO7vltS8AXj14eCbmSddQrDMkHeq5JSpQWtIqUAI7A7sT2uAhmowi1hk8d0BAroyGzhLHzAg==
   dependencies:
-    "@carbon/icons-react" "^10.9.3"
+    "@carbon/icons-react" "^10.11.0"
     classnames "2.2.6"
     downshift "^1.31.14"
     flatpickr "4.6.1"
@@ -5601,13 +5608,14 @@ carbon-components-react@7.10.3:
     lodash.omit "^4.5.0"
     lodash.throttle "^4.1.1"
     react-is "^16.8.6"
+    use-resize-observer "^6.0.0"
     warning "^3.0.0"
     window-or-global "^1.0.1"
 
-carbon-components@10.10.3:
-  version "10.10.3"
-  resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.10.3.tgz#c3076be78fa2df8c430b329615a9ef1f1d2509c8"
-  integrity sha512-uOHcMvQNtqazCqBxXlIaAU6Jmsb1/wE6fhJ3r6wt69MfW42xjCOVAegXDXylCAk1k6F+DR6cx4WsbYMUjOXR3A==
+carbon-components@^10.12.0:
+  version "10.12.0"
+  resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.12.0.tgz#a27649a5541c45833e0534f5f3b9d871f7cb0bc5"
+  integrity sha512-QPP4f6/11Buwtz+3JW/2wQKKL1QY6GZ3WIxfifpK2MyjhO8NW4LrYrLsbcwFr4kYQ6Aph18b8sHY21T61zaYLQ==
   dependencies:
     flatpickr "4.6.1"
     lodash.debounce "^4.0.8"
@@ -19357,6 +19365,13 @@ use-resize-observer@^5.0.0:
   dependencies:
     resize-observer-polyfill "^1.5.1"
 
+use-resize-observer@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/use-resize-observer/-/use-resize-observer-6.1.0.tgz#d4d267a940dbf9c326da6042f8a4bb8c89d29729"
+  integrity sha512-SiPcWHiIQ1CnHmb6PxbYtygqiZXR0U9dNkkbpX9VYnlstUwF8+QqpUTrzh13pjPwcjMVGR+QIC+nvF5ujfFNng==
+  dependencies:
+    resize-observer-polyfill "^1.5.1"
+
 use-sidecar@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.2.tgz#e72f582a75842f7de4ef8becd6235a4720ad8af6"

From 32b77ce2dac7b30b2bdb10c4760a4837fb5eb64a Mon Sep 17 00:00:00 2001
From: Scott Dickerson <swiftfoot@hotmail.com>
Date: Thu, 28 May 2020 12:43:20 -0500
Subject: [PATCH 3/8] feat(tabletoolbar): show active state of buttons

---
 .../__snapshots__/Dashboard.story.storyshot   | 12 -------
 src/components/Table/Table.test.jsx           | 22 +++++-------
 .../Table/TableToolbar/TableToolbar.jsx       |  3 ++
 .../TableToolbar/TableToolbarSVGButton.jsx    | 21 ++++++-----
 .../_table-toolbar-svg-button.scss            |  3 ++
 .../Table/__snapshots__/Table.story.storyshot | 35 ++++---------------
 .../__snapshots__/TableCard.story.storyshot   | 34 ------------------
 7 files changed, 34 insertions(+), 96 deletions(-)

diff --git a/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot b/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
index a386466c24..529a4629e1 100644
--- a/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
+++ b/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
@@ -1387,7 +1387,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -1421,7 +1420,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -3596,7 +3594,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -3630,7 +3627,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -5837,7 +5833,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -5871,7 +5866,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -7493,7 +7487,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -7527,7 +7520,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -10542,7 +10534,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -10576,7 +10567,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -24875,7 +24865,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
@@ -24909,7 +24898,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
-                          onKeyDown={[Function]}
                           tabIndex={0}
                           type="button"
                         >
diff --git a/src/components/Table/Table.test.jsx b/src/components/Table/Table.test.jsx
index 8026326534..ecd4a72ca1 100644
--- a/src/components/Table/Table.test.jsx
+++ b/src/components/Table/Table.test.jsx
@@ -4,7 +4,6 @@ import React from 'react';
 import merge from 'lodash/merge';
 import { Add20 } from '@carbon/icons-react';
 
-import { keyCodes } from '../../constants/KeyCodeConstants';
 import { settings } from '../../constants/Settings';
 
 import { mockActions } from './Table.test.helpers';
@@ -306,18 +305,18 @@ describe('Table', () => {
     expect(renderRowCountLabel2).toHaveLength(0);
   });
 
-  it('enter key should trigger onDownload', () => {
+  it('click should trigger onDownload', () => {
     const { getByTestId } = render(
       <TableToolbar actions={mockActions.toolbar} options={options2} tableState={tableState} />
     );
 
     const downloadButton = getByTestId('download-button');
     expect(downloadButton).toBeTruthy();
-    fireEvent.keyDown(downloadButton, { keyCode: keyCodes.ENTER });
+    fireEvent.click(downloadButton);
     expect(mockActions.toolbar.onDownloadCSV).toHaveBeenCalledTimes(1);
   });
 
-  it('enter key should trigger onColumnSelection', () => {
+  it('click should trigger onColumnSelection', () => {
     const { getByTestId } = render(
       <TableToolbar
         actions={mockActions.toolbar}
@@ -328,11 +327,11 @@ describe('Table', () => {
 
     const columnSelectButton = getByTestId('column-selection-button');
     expect(columnSelectButton).toBeTruthy();
-    fireEvent.keyDown(columnSelectButton, { keyCode: keyCodes.ENTER });
+    fireEvent.click(columnSelectButton);
     expect(mockActions.toolbar.onToggleColumnSelection).toHaveBeenCalledTimes(1);
   });
 
-  it('enter key should trigger onFilter', () => {
+  it('click should trigger onFilter', () => {
     const { getByTestId } = render(
       <TableToolbar
         actions={mockActions.toolbar}
@@ -343,11 +342,11 @@ describe('Table', () => {
 
     const filterButton = getByTestId('filter-button');
     expect(filterButton).toBeTruthy();
-    fireEvent.keyDown(filterButton, { keyCode: keyCodes.ENTER });
+    fireEvent.click(filterButton);
     expect(mockActions.toolbar.onToggleFilter).toHaveBeenCalledTimes(1);
   });
 
-  it('enter key or mouse click should trigger rowEdit toolbar', () => {
+  it('mouse click should trigger rowEdit toolbar', () => {
     const { getByTestId } = render(
       <TableToolbar
         actions={mockActions.toolbar}
@@ -358,14 +357,9 @@ describe('Table', () => {
 
     const rowEditButton = getByTestId('row-edit-button');
     expect(rowEditButton).toBeTruthy();
-    fireEvent.keyDown(rowEditButton, { keyCode: keyCodes.ESC });
-    expect(mockActions.toolbar.onShowRowEdit).toHaveBeenCalledTimes(0);
-
-    fireEvent.keyDown(rowEditButton, { keyCode: keyCodes.ENTER });
-    expect(mockActions.toolbar.onShowRowEdit).toHaveBeenCalledTimes(1);
 
     fireEvent.click(rowEditButton);
-    expect(mockActions.toolbar.onShowRowEdit).toHaveBeenCalledTimes(2);
+    expect(mockActions.toolbar.onShowRowEdit).toHaveBeenCalledTimes(1);
   });
 
   it('rowEdit toolbar should contain external rowEditBarButtons', () => {
diff --git a/src/components/Table/TableToolbar/TableToolbar.jsx b/src/components/Table/TableToolbar/TableToolbar.jsx
index e3a6c73d5b..f445f70805 100644
--- a/src/components/Table/TableToolbar/TableToolbar.jsx
+++ b/src/components/Table/TableToolbar/TableToolbar.jsx
@@ -219,6 +219,7 @@ const TableToolbar = ({
         ) : null}
         {hasColumnSelection ? (
           <TableToolbarSVGButton
+            isActive={activeBar === 'column'}
             onClick={onToggleColumnSelection}
             description={i18n.columnSelectionButtonAria}
             testId="column-selection-button"
@@ -227,6 +228,7 @@ const TableToolbar = ({
         ) : null}
         {hasFilter ? (
           <TableToolbarSVGButton
+            isActive={activeBar === 'filter'}
             onClick={onToggleFilter}
             description={i18n.filterButtonAria}
             testId="filter-button"
@@ -235,6 +237,7 @@ const TableToolbar = ({
         ) : null}
         {hasRowEdit ? (
           <TableToolbarSVGButton
+            isActive={activeBar === 'rowEdit'}
             description={i18n.editButtonAria}
             onClick={onShowRowEdit}
             testId="row-edit-button"
diff --git a/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx b/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
index ac9511d284..677e9fa2f2 100644
--- a/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
+++ b/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 import { Button } from 'carbon-components-react';
 
 import { settings } from '../../../constants/Settings';
-import { keyCodes } from '../../../constants/KeyCodeConstants';
 
 const { iotPrefix } = settings;
 
@@ -12,24 +12,28 @@ const propTypes = {
   testId: PropTypes.string.isRequired,
   renderIcon: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   description: PropTypes.node.isRequired,
+  isActive: PropTypes.bool,
+};
+
+const defaultProps = {
+  isActive: false,
 };
 
 /**
  * Toolbar button that accepts a Carbon react icon as children
  */
-const TableToolbarSVGButton = ({ onClick, testId, description, renderIcon }) => {
+const TableToolbarSVGButton = ({ onClick, testId, className, description, isActive, ...rest }) => {
   return (
     <Button
-      className={`${iotPrefix}--tooltip-svg-wrapper`}
+      {...rest}
+      className={classNames(`${iotPrefix}--tooltip-svg-wrapper`, className, {
+        [`${iotPrefix}--table-toolbar-button-active`]: isActive, // https://github.com/carbon-design-system/carbon/issues/6160
+      })}
       hasIconOnly
-      onClick={onClick}
       kind="ghost"
-      renderIcon={renderIcon}
+      onClick={onClick}
       tooltipAlignment="center"
       tooltipPosition="top"
-      onKeyDown={e => {
-        if (e.keyCode === keyCodes.ENTER) onClick();
-      }}
       iconDescription={description}
       data-testid={testId}
     />
@@ -37,5 +41,6 @@ const TableToolbarSVGButton = ({ onClick, testId, description, renderIcon }) =>
 };
 
 TableToolbarSVGButton.propTypes = propTypes;
+TableToolbarSVGButton.defaultProps = defaultProps;
 
 export default TableToolbarSVGButton;
diff --git a/src/components/Table/TableToolbar/_table-toolbar-svg-button.scss b/src/components/Table/TableToolbar/_table-toolbar-svg-button.scss
index 2172527a86..ce0300bce9 100644
--- a/src/components/Table/TableToolbar/_table-toolbar-svg-button.scss
+++ b/src/components/Table/TableToolbar/_table-toolbar-svg-button.scss
@@ -6,4 +6,7 @@ button.#{$iot-prefix}--tooltip-svg-wrapper,
 }
 button.bx--btn.#{$iot-prefix}--tooltip-svg-wrapper.#{$prefix}--btn--ghost {
   border: 0;
+  &.#{$iot-prefix}--table-toolbar-button-active:not(:hover) {
+    background-color: $active-ui;
+  }
 }
diff --git a/src/components/Table/__snapshots__/Table.story.storyshot b/src/components/Table/__snapshots__/Table.story.storyshot
index ceb2a9e628..fb808f75d0 100644
--- a/src/components/Table/__snapshots__/Table.story.storyshot
+++ b/src/components/Table/__snapshots__/Table.story.storyshot
@@ -61,7 +61,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="row-edit-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -17488,11 +17487,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             Clear all filters
           </button>
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -20166,7 +20164,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             data-testid="column-selection-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -20209,7 +20206,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -104286,7 +104282,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="download-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -104320,7 +104315,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="column-selection-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -104359,11 +104353,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               </svg>
             </button>
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="filter-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -104394,7 +104387,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="row-edit-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -108603,7 +108595,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="column-selection-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -108646,7 +108637,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="filter-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -108677,7 +108667,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="row-edit-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -129634,11 +129623,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               Clear all filters
             </button>
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="filter-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -132775,11 +132763,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             Clear all filters
           </button>
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -136822,11 +136809,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           className="bx--toolbar-content iot--table-toolbar-content"
         >
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="column-selection-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -139792,7 +139778,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -159760,11 +159745,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             Clear all filters
           </button>
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -162523,7 +162507,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="column-selection-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
@@ -186332,7 +186315,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -194067,11 +194049,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             Clear all filters
           </button>
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -286449,7 +286430,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             data-testid="column-selection-button"
             disabled={false}
             onClick={[Function]}
-            onKeyDown={[Function]}
             tabIndex={0}
             type="button"
           >
@@ -370362,7 +370342,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               data-testid="filter-button"
               disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               tabIndex={0}
               type="button"
             >
diff --git a/src/components/TableCard/__snapshots__/TableCard.story.storyshot b/src/components/TableCard/__snapshots__/TableCard.story.storyshot
index 8fc249ef4f..bad34627cb 100644
--- a/src/components/TableCard/__snapshots__/TableCard.story.storyshot
+++ b/src/components/TableCard/__snapshots__/TableCard.story.storyshot
@@ -195,7 +195,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -229,7 +228,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -2542,7 +2540,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -2576,7 +2573,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -3682,7 +3678,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -3716,7 +3711,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -6293,7 +6287,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -6327,7 +6320,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -7681,7 +7673,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -7715,7 +7706,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -9382,7 +9372,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -9416,7 +9405,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -9991,7 +9979,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -10025,7 +10012,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -12537,7 +12523,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -12571,7 +12556,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -13954,7 +13938,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -13988,7 +13971,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -15610,7 +15592,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -15644,7 +15625,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -17027,7 +17007,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -17061,7 +17040,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -18998,7 +18976,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -19032,7 +19009,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -20729,7 +20705,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -20763,7 +20738,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -22480,7 +22454,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -22514,7 +22487,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -25027,7 +24999,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -25061,7 +25032,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -27048,7 +27018,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -27082,7 +27051,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -29665,7 +29633,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >
@@ -29699,7 +29666,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
-                  onKeyDown={[Function]}
                   tabIndex={0}
                   type="button"
                 >

From cb2800857863e5e869feb4cc9ce4057ceeb9e0e9 Mon Sep 17 00:00:00 2001
From: Scott Dickerson <swiftfoot@hotmail.com>
Date: Thu, 28 May 2020 15:13:43 -0500
Subject: [PATCH 4/8] fix(toolbartooltips): hide the tooltip if the button is
 active

---
 .../__snapshots__/Dashboard.story.storyshot   | 24 +++---
 .../TableToolbar/TableToolbarSVGButton.jsx    | 17 ++--
 .../Table/TableToolbar/_table-toolbar.scss    |  5 ++
 .../Table/__snapshots__/Table.story.storyshot | 77 +++++--------------
 .../__snapshots__/TableCard.story.storyshot   | 68 ++++++++--------
 5 files changed, 83 insertions(+), 108 deletions(-)

diff --git a/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot b/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
index 529a4629e1..112f358b73 100644
--- a/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
+++ b/src/components/Dashboard/__snapshots__/Dashboard.story.storyshot
@@ -1383,7 +1383,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </div>
                         </div>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
@@ -1416,7 +1416,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
@@ -3590,7 +3590,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </div>
                         </div>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
@@ -3623,7 +3623,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
@@ -5829,7 +5829,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </div>
                         </div>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
@@ -5862,7 +5862,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
@@ -7483,7 +7483,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </div>
                         </div>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
@@ -7516,7 +7516,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
@@ -10530,7 +10530,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </div>
                         </div>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
@@ -10563,7 +10563,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
@@ -24861,7 +24861,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </div>
                         </div>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="download-button"
                           disabled={false}
                           onClick={[Function]}
@@ -24894,7 +24894,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Dashb
                           </svg>
                         </button>
                         <button
-                          className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                          className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                           data-testid="filter-button"
                           disabled={false}
                           onClick={[Function]}
diff --git a/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx b/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
index 677e9fa2f2..f45a3d667e 100644
--- a/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
+++ b/src/components/Table/TableToolbar/TableToolbarSVGButton.jsx
@@ -5,7 +5,7 @@ import { Button } from 'carbon-components-react';
 
 import { settings } from '../../../constants/Settings';
 
-const { iotPrefix } = settings;
+const { iotPrefix, prefix } = settings;
 
 const propTypes = {
   onClick: PropTypes.func.isRequired,
@@ -20,16 +20,21 @@ const defaultProps = {
 };
 
 /**
- * Toolbar button that accepts a Carbon react icon as children
+ * Toolbar button that renders an icon only button
  */
 const TableToolbarSVGButton = ({ onClick, testId, className, description, isActive, ...rest }) => {
   return (
     <Button
       {...rest}
-      className={classNames(`${iotPrefix}--tooltip-svg-wrapper`, className, {
-        [`${iotPrefix}--table-toolbar-button-active`]: isActive, // https://github.com/carbon-design-system/carbon/issues/6160
-      })}
-      hasIconOnly
+      className={classNames(
+        `${prefix}--btn--icon-only`,
+        `${iotPrefix}--tooltip-svg-wrapper`,
+        className,
+        {
+          [`${iotPrefix}--table-toolbar-button-active`]: isActive, // https://github.com/carbon-design-system/carbon/issues/6160
+        }
+      )}
+      hasIconOnly={!isActive} // hide the tooltip if the button is active
       kind="ghost"
       onClick={onClick}
       tooltipAlignment="center"
diff --git a/src/components/Table/TableToolbar/_table-toolbar.scss b/src/components/Table/TableToolbar/_table-toolbar.scss
index 5b48da3bc6..ff76e15c47 100644
--- a/src/components/Table/TableToolbar/_table-toolbar.scss
+++ b/src/components/Table/TableToolbar/_table-toolbar.scss
@@ -20,6 +20,11 @@ div.#{$prefix}--toolbar-action.#{$prefix}--toolbar-search-container-expandable {
   padding-top: $spacing-01;
 }
 
+// small fix to allow tooltips to show outside the toolbar if the batch action isn't active
+.#{$prefix}--batch-actions:not(.#{$prefix}--batch-actions--active) ~ .#{$prefix}--toolbar-content {
+  clip-path: unset;
+}
+
 .#{$iot-prefix}--table-toolbar-content {
   flex: 1;
   font-size: 0.875rem;
diff --git a/src/components/Table/__snapshots__/Table.story.storyshot b/src/components/Table/__snapshots__/Table.story.storyshot
index fb808f75d0..0261ba30ba 100644
--- a/src/components/Table/__snapshots__/Table.story.storyshot
+++ b/src/components/Table/__snapshots__/Table.story.storyshot
@@ -57,7 +57,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             className="bx--toolbar-content iot--table-toolbar-content"
           >
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="row-edit-button"
               disabled={false}
               onClick={[Function]}
@@ -17487,18 +17487,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             Clear all filters
           </button>
           <button
-            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
             tabIndex={0}
             type="button"
           >
-            <span
-              className="bx--assistive-text"
-            >
-              Filters
-            </span>
             <svg
               aria-hidden="true"
               aria-label="Filters"
@@ -20160,7 +20155,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           className="bx--toolbar-content iot--table-toolbar-content"
         >
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="column-selection-button"
             disabled={false}
             onClick={[Function]}
@@ -20202,7 +20197,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             </svg>
           </button>
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
@@ -104278,7 +104273,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               Clear all filters
             </button>
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="download-button"
               disabled={false}
               onClick={[Function]}
@@ -104311,7 +104306,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               </svg>
             </button>
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="column-selection-button"
               disabled={false}
               onClick={[Function]}
@@ -104353,18 +104348,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               </svg>
             </button>
             <button
-              className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost"
               data-testid="filter-button"
               disabled={false}
               onClick={[Function]}
               tabIndex={0}
               type="button"
             >
-              <span
-                className="bx--assistive-text"
-              >
-                Filters
-              </span>
               <svg
                 aria-hidden="true"
                 aria-label="Filters"
@@ -104383,7 +104373,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               </svg>
             </button>
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="row-edit-button"
               disabled={false}
               onClick={[Function]}
@@ -108591,7 +108581,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               </div>
             </div>
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="column-selection-button"
               disabled={false}
               onClick={[Function]}
@@ -108633,7 +108623,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               </svg>
             </button>
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="filter-button"
               disabled={false}
               onClick={[Function]}
@@ -108663,7 +108653,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               </svg>
             </button>
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="row-edit-button"
               disabled={false}
               onClick={[Function]}
@@ -129623,18 +129613,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               Clear all filters
             </button>
             <button
-              className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost"
               data-testid="filter-button"
               disabled={false}
               onClick={[Function]}
               tabIndex={0}
               type="button"
             >
-              <span
-                className="bx--assistive-text"
-              >
-                Filters
-              </span>
               <svg
                 aria-hidden="true"
                 aria-label="Filters"
@@ -132763,18 +132748,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             Clear all filters
           </button>
           <button
-            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
             tabIndex={0}
             type="button"
           >
-            <span
-              className="bx--assistive-text"
-            >
-              Filters
-            </span>
             <svg
               aria-hidden="true"
               aria-label="Filters"
@@ -136809,18 +136789,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           className="bx--toolbar-content iot--table-toolbar-content"
         >
           <button
-            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost"
             data-testid="column-selection-button"
             disabled={false}
             onClick={[Function]}
             tabIndex={0}
             type="button"
           >
-            <span
-              className="bx--assistive-text"
-            >
-              Column Selection
-            </span>
             <svg
               aria-hidden="true"
               aria-label="Column Selection"
@@ -139774,7 +139749,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           className="bx--toolbar-content iot--table-toolbar-content"
         >
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
@@ -159745,18 +159720,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             Clear all filters
           </button>
           <button
-            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
             tabIndex={0}
             type="button"
           >
-            <span
-              className="bx--assistive-text"
-            >
-              Filters
-            </span>
             <svg
               aria-hidden="true"
               aria-label="Filters"
@@ -162503,7 +162473,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             className="bx--toolbar-content iot--table-toolbar-content"
           >
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="column-selection-button"
               disabled={false}
               onClick={[Function]}
@@ -186311,7 +186281,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           className="bx--toolbar-content iot--table-toolbar-content"
         >
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
@@ -194049,18 +194019,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             Clear all filters
           </button>
           <button
-            className="iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper iot--table-toolbar-button-active bx--btn bx--btn--ghost"
             data-testid="filter-button"
             disabled={false}
             onClick={[Function]}
             tabIndex={0}
             type="button"
           >
-            <span
-              className="bx--assistive-text"
-            >
-              Filters
-            </span>
             <svg
               aria-hidden="true"
               aria-label="Filters"
@@ -286426,7 +286391,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
           className="bx--toolbar-content iot--table-toolbar-content"
         >
           <button
-            className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+            className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
             data-testid="column-selection-button"
             disabled={false}
             onClick={[Function]}
@@ -370338,7 +370303,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
             className="bx--toolbar-content iot--table-toolbar-content"
           >
             <button
-              className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+              className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
               data-testid="filter-button"
               disabled={false}
               onClick={[Function]}
diff --git a/src/components/TableCard/__snapshots__/TableCard.story.storyshot b/src/components/TableCard/__snapshots__/TableCard.story.storyshot
index bad34627cb..cd10ab8877 100644
--- a/src/components/TableCard/__snapshots__/TableCard.story.storyshot
+++ b/src/components/TableCard/__snapshots__/TableCard.story.storyshot
@@ -191,7 +191,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -224,7 +224,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -2536,7 +2536,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -2569,7 +2569,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -3674,7 +3674,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -3707,7 +3707,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -6283,7 +6283,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -6316,7 +6316,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -7669,7 +7669,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -7702,7 +7702,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -9368,7 +9368,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -9401,7 +9401,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -9975,7 +9975,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -10008,7 +10008,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -12519,7 +12519,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -12552,7 +12552,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -13934,7 +13934,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -13967,7 +13967,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -15588,7 +15588,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -15621,7 +15621,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -17003,7 +17003,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -17036,7 +17036,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -18972,7 +18972,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -19005,7 +19005,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -20701,7 +20701,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -20734,7 +20734,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -22450,7 +22450,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -22483,7 +22483,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -24995,7 +24995,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -25028,7 +25028,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -27014,7 +27014,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -27047,7 +27047,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}
@@ -29629,7 +29629,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </div>
                 </div>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="download-button"
                   disabled={false}
                   onClick={[Function]}
@@ -29662,7 +29662,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                   </svg>
                 </button>
                 <button
-                  className="iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
+                  className="bx--btn--icon-only iot--tooltip-svg-wrapper bx--btn bx--btn--ghost bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--tooltip--top bx--tooltip--align-center"
                   data-testid="filter-button"
                   disabled={false}
                   onClick={[Function]}

From d4c65b8287597cacdab1add4b563d986eb91a09b Mon Sep 17 00:00:00 2001
From: Scott Dickerson <swiftfoot@hotmail.com>
Date: Thu, 28 May 2020 15:35:10 -0500
Subject: [PATCH 5/8] fix(tabletoolbar): allow overflow on top of table

---
 src/components/Table/Table.story.jsx | 5 ++++-
 src/components/Table/_table.scss     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Table/Table.story.jsx b/src/components/Table/Table.story.jsx
index 3ac6e12306..961290f225 100644
--- a/src/components/Table/Table.story.jsx
+++ b/src/components/Table/Table.story.jsx
@@ -531,7 +531,10 @@ storiesOf('Watson IoT/Table', module)
           secondaryTitle={text('Secondary Title', `Row count: ${initialState.data.length}`)}
           actions={{
             ...actions,
-            toolbar: { ...actions.toolbar, onDownloadCSV: csvDownloadHandler },
+            toolbar: {
+              ...actions.toolbar,
+              onDownloadCSV: () => csvDownloadHandler(initialState.data, 'my table data'),
+            },
           }}
           isSortable
           lightweight={boolean('lightweight', false)}
diff --git a/src/components/Table/_table.scss b/src/components/Table/_table.scss
index 0327172154..aec5acc5db 100644
--- a/src/components/Table/_table.scss
+++ b/src/components/Table/_table.scss
@@ -22,6 +22,7 @@ table.#{$prefix}--side-nav--data-table {
 .#{$iot-prefix}--table-container {
   min-width: unset;
   padding-top: 0;
+  overflow: visible; // need to do this to allow tooltips to render above the table
 
   .addons-iot-table-container {
     overflow-x: auto;

From 6a8334bb7c67df9e385761ddf008413a78f77aa2 Mon Sep 17 00:00:00 2001
From: Scott Dickerson <swiftfoot@hotmail.com>
Date: Thu, 28 May 2020 15:51:00 -0500
Subject: [PATCH 6/8] test(tilegallery): remove expand/collapse i18n no longer
 used

---
 src/components/TileGallery/TileGallery.story.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/TileGallery/TileGallery.story.jsx b/src/components/TileGallery/TileGallery.story.jsx
index 395422bf92..f09e221269 100644
--- a/src/components/TileGallery/TileGallery.story.jsx
+++ b/src/components/TileGallery/TileGallery.story.jsx
@@ -235,7 +235,6 @@ storiesOf('Watson IoT Experimental/TileGallery', module)
         listText: text('i18n.listText', '__ListText__'),
         gridText: text('i18n.gridText', '__GridText__'),
         descriptionMoreInfo: text('i18n.descriptionMoreInfo', '__DescriptionMoreInfo__'),
-        arrowIconDescription: text('i18n.arrowIconDescription', '__Expand/Collapse__'),
       }}
     />
   ));

From c24475bf32bfbc22df5f745695e87f188b01ab3a Mon Sep 17 00:00:00 2001
From: Scott Dickerson <6663002+scottdickerson@users.noreply.github.com>
Date: Thu, 28 May 2020 16:56:33 -0500
Subject: [PATCH 7/8] Update package.json

Co-authored-by: David Conner <david@david-conner.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 779ec5253c..1eafa554b3 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "@carbon/motion": "10.6.0",
     "@carbon/themes": "10.10.3",
     "carbon-components": "^10.12.0",
-    "carbon-components-react": "^7.12.0",
+    "carbon-components-react": "7.12.0",
     "carbon-icons": "7.0.7",
     "classnames": "^2.2.5",
     "core-js": "3.6.4",

From c79895647eccb529eeb01930de464461eaaa1386 Mon Sep 17 00:00:00 2001
From: Scott Dickerson <swiftfoot@hotmail.com>
Date: Fri, 29 May 2020 06:46:18 -0500
Subject: [PATCH 8/8] fix(package): undo heap size

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 779ec5253c..6bf7f930b6 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "lint:stylelint": "stylelint './src/**/*.scss' --syntax scss --ignorePath .gitignore",
     "prepare": "yarn build",
     "publish-npm": "yarn semantic-release",
-    "start": "yarn test:engines && NODE_OPTIONS='--max-old-space-size=16384' yarn storybook",
+    "start": "yarn test:engines && yarn storybook",
     "storybook": "yarn test:engines && start-storybook -p 3000 -s public/development",
     "test": "yarn test:engines && yarn test:a11y && yarn test:base",
     "test:base": "yarn test:engines && cross-env NODE_ICU_DATA=node_modules/full-icu TZ=America/Chicago jest --testPathPattern='.*\\.test\\.js(x)?' --coverage",