diff --git a/packages/react/src/components/CardCodeEditor/__snapshots__/CardCodeEditor.story.storyshot b/packages/react/src/components/CardCodeEditor/__snapshots__/CardCodeEditor.story.storyshot
index 977e99e5e0..de9861a151 100644
--- a/packages/react/src/components/CardCodeEditor/__snapshots__/CardCodeEditor.story.storyshot
+++ b/packages/react/src/components/CardCodeEditor/__snapshots__/CardCodeEditor.story.storyshot
@@ -155,7 +155,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
             </span>
           </button>
           <section
-            className="iot--editor-wrapper"
             style={
               Object {
                 "display": "flex",
@@ -402,7 +401,6 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
             </span>
           </button>
           <section
-            className="iot--editor-wrapper"
             style={
               Object {
                 "display": "flex",
diff --git a/packages/react/src/components/Header/HeaderAction/HeaderActionMenu.jsx b/packages/react/src/components/Header/HeaderAction/HeaderActionMenu.jsx
index fd3017b0bf..a89347d8a3 100644
--- a/packages/react/src/components/Header/HeaderAction/HeaderActionMenu.jsx
+++ b/packages/react/src/components/Header/HeaderAction/HeaderActionMenu.jsx
@@ -7,6 +7,7 @@ import { HeaderMenuItem } from 'carbon-components-react/es/components/UIShell';
 
 import { ChildContentPropTypes } from '../HeaderPropTypes';
 import { handleSpecificKeyDown } from '../../../utils/componentUtilityFunctions';
+import Button from '../../Button/Button';
 
 const { prefix } = settings;
 
@@ -111,39 +112,31 @@ class HeaderActionMenu extends React.Component {
 
     const className = classnames(`${prefix}--header__submenu`, customClassName);
 
-    // Prevents the a element from navigating to it's href target
-    const handleDefaultClick = (event) => {
-      event.preventDefault();
-      event.stopPropagation();
-      onToggleExpansion();
-    };
-
     // Notes on eslint comments and based on the examples in:
     // https://www.w3.org/TR/wai-aria-practices/examples/menubar/menubar-1/menubar-1.html#
     // - The focus is handled by the <a> menuitem, onMouseOver is for mouse
     // users
     // - aria-haspopup can definitely have the value "menu"
     // - aria-expanded is on their example node with role="menuitem"
-    // - href can be set to javascript:void(0), ideally this will be a button
 
     return (
       // TODO: CAN WE REMOVE THIS DIV WRAPPER AND ATTACH THE CLASS DIRECTLY
       <div className={className}>
-        <a // eslint-disable-line jsx-a11y/role-supports-aria-props,jsx-a11y/anchor-is-valid
-          aria-haspopup="menu" // eslint-disable-line jsx-a11y/aria-proptypes
+        <Button
+          hasIconOnly
+          iconDescription={ariaLabel}
+          tooltipPosition="bottom"
+          aria-haspopup="menu"
           aria-expanded={isExpanded}
           className={classnames(`${prefix}--header__menu-item`, `${prefix}--header__menu-title`)}
-          href="#"
-          onKeyDown={handleSpecificKeyDown(['Enter', 'Space', 'Escape'], handleDefaultClick)}
-          onClick={handleDefaultClick}
+          onClick={onToggleExpansion}
           ref={focusRef}
-          data-testid="menuitem"
-          tabIndex={0}
+          testId="menuitem"
           aria-label={ariaLabel}
           role="menuitem"
         >
           <MenuContent ariaLabel={ariaLabel} />
-        </a>
+        </Button>
         <ul {...accessibilityLabel} className={`${prefix}--header__menu`} role="menu">
           {childContent.map((childItem, index) => {
             const { isOverflowing } = this.state;
diff --git a/packages/react/src/components/Header/HeaderAction/HeaderActionMenu.test.jsx b/packages/react/src/components/Header/HeaderAction/HeaderActionMenu.test.jsx
index 5fd321bacc..d67da292ca 100644
--- a/packages/react/src/components/Header/HeaderAction/HeaderActionMenu.test.jsx
+++ b/packages/react/src/components/Header/HeaderAction/HeaderActionMenu.test.jsx
@@ -1,8 +1,13 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import { settings } from '../../../constants/Settings';
 
 import HeaderActionMenu from './HeaderActionMenu';
 
+const { prefix } = settings;
+
 describe('HeaderActionMenu', () => {
   const mockProps = {
     'aria-label': 'Accessibility label',
@@ -53,15 +58,14 @@ describe('HeaderActionMenu', () => {
   it('should render aria-label', () => {
     render(<HeaderActionMenu {...mockProps} />);
 
-    expect(screen.getByText('Accessibility label')).toBeInTheDocument();
+    expect(screen.getByTestId('menuitem')).toHaveAttribute('aria-label', 'Accessibility label');
   });
 
   it('should render content prop', () => {
     const menuContent = () => <p>Some other text</p>;
     render(<HeaderActionMenu renderMenuContent={menuContent} {...mockProps} />);
 
-    expect(screen.queryByText('Accessibility label')).not.toBeInTheDocument();
-    expect(screen.getByText('Some other text')).toBeInTheDocument();
+    expect(screen.getByTestId('menuitem')).toHaveTextContent('Some other text');
   });
 
   it("should add a title to long items that truncate if they don't have one.", () => {
@@ -78,4 +82,11 @@ describe('HeaderActionMenu', () => {
 
     jest.clearAllMocks();
   });
+
+  it('should display tooltip on hover', () => {
+    render(<HeaderActionMenu {...mockProps} />);
+    const actionMenu = screen.getByTestId('menuitem');
+    userEvent.hover(actionMenu);
+    expect(actionMenu).not.toHaveClass(`${prefix}--tooltip--hidden`);
+  });
 });
diff --git a/packages/react/src/components/Header/HeaderAction/__snapshots__/HeaderActionMenu.test.jsx.snap b/packages/react/src/components/Header/HeaderAction/__snapshots__/HeaderActionMenu.test.jsx.snap
index 20a4b5567d..1349951b53 100644
--- a/packages/react/src/components/Header/HeaderAction/__snapshots__/HeaderActionMenu.test.jsx.snap
+++ b/packages/react/src/components/Header/HeaderAction/__snapshots__/HeaderActionMenu.test.jsx.snap
@@ -5,16 +5,21 @@ exports[`HeaderActionMenu should render 1`] = `
   <div
     class="bx--header__submenu custom-class"
   >
-    <a
+    <button
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Accessibility label"
-      class="bx--header__menu-item bx--header__menu-title"
+      class="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
       data-testid="menuitem"
-      href="#"
       role="menuitem"
       tabindex="0"
+      type="button"
     >
+      <div
+        class="bx--assistive-text"
+      >
+        Accessibility label
+      </div>
       Accessibility label
       <svg
         aria-hidden="true"
@@ -31,7 +36,7 @@ exports[`HeaderActionMenu should render 1`] = `
           d="M16 22L6 12 7.4 10.6 16 19.2 24.6 10.6 26 12z"
         />
       </svg>
-    </a>
+    </button>
     <ul
       aria-label="Accessibility label"
       class="bx--header__menu"
diff --git a/packages/react/src/components/Header/__snapshots__/Header.story.storyshot b/packages/react/src/components/Header/__snapshots__/Header.story.storyshot
index 17b95c9a68..cb8aeba400 100644
--- a/packages/react/src/components/Header/__snapshots__/Header.story.storyshot
+++ b/packages/react/src/components/Header/__snapshots__/Header.story.storyshot
@@ -231,18 +231,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
             <div
               className="bx--header__submenu bx--header-action-btn"
             >
-              <a
+              <button
+                aria-describedby={null}
                 aria-expanded={false}
                 aria-haspopup="menu"
                 aria-label="user"
-                className="bx--header__menu-item bx--header__menu-title"
+                aria-pressed={null}
+                className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
                 data-testid="menuitem"
-                href="#"
+                disabled={false}
+                onBlur={[Function]}
                 onClick={[Function]}
-                onKeyDown={[Function]}
+                onFocus={[Function]}
+                onMouseEnter={[Function]}
+                onMouseLeave={[Function]}
                 role="menuitem"
                 tabIndex={0}
+                type="button"
               >
+                <div
+                  className="bx--assistive-text"
+                  onMouseEnter={[Function]}
+                >
+                  user
+                </div>
                 <svg
                   aria-hidden={true}
                   description="Icon"
@@ -261,7 +273,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                     d="M8,3C6.6,3,5.5,4.1,5.5,5.5S6.6,8,8,8s2.5-1.1,2.5-2.5S9.4,3,8,3z M8,7C7.2,7,6.5,6.3,6.5,5.5S7.2,4,8,4s1.5,0.7,1.5,1.5	S8.8,7,8,7z"
                   />
                 </svg>
-              </a>
+              </button>
               <ul
                 aria-label="user"
                 className="bx--header__menu"
@@ -600,18 +612,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
             <div
               className="bx--header__submenu bx--header-action-btn"
             >
-              <a
+              <button
+                aria-describedby={null}
                 aria-expanded={false}
                 aria-haspopup="menu"
                 aria-label="user"
-                className="bx--header__menu-item bx--header__menu-title"
+                aria-pressed={null}
+                className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
                 data-testid="menuitem"
-                href="#"
+                disabled={false}
+                onBlur={[Function]}
                 onClick={[Function]}
-                onKeyDown={[Function]}
+                onFocus={[Function]}
+                onMouseEnter={[Function]}
+                onMouseLeave={[Function]}
                 role="menuitem"
                 tabIndex={0}
+                type="button"
               >
+                <div
+                  className="bx--assistive-text"
+                  onMouseEnter={[Function]}
+                >
+                  user
+                </div>
                 <svg
                   aria-hidden={true}
                   description="Icon"
@@ -630,7 +654,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                     d="M8,3C6.6,3,5.5,4.1,5.5,5.5S6.6,8,8,8s2.5-1.1,2.5-2.5S9.4,3,8,3z M8,7C7.2,7,6.5,6.3,6.5,5.5S7.2,4,8,4s1.5,0.7,1.5,1.5	S8.8,7,8,7z"
                   />
                 </svg>
-              </a>
+              </button>
               <ul
                 aria-label="user"
                 className="bx--header__menu"
@@ -787,18 +811,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
             <div
               className="bx--header__submenu bx--header-action-btn"
             >
-              <a
+              <button
+                aria-describedby={null}
                 aria-expanded={false}
                 aria-haspopup="menu"
                 aria-label="user"
-                className="bx--header__menu-item bx--header__menu-title"
+                aria-pressed={null}
+                className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
                 data-testid="menuitem"
-                href="#"
+                disabled={false}
+                onBlur={[Function]}
                 onClick={[Function]}
-                onKeyDown={[Function]}
+                onFocus={[Function]}
+                onMouseEnter={[Function]}
+                onMouseLeave={[Function]}
                 role="menuitem"
                 tabIndex={0}
+                type="button"
               >
+                <div
+                  className="bx--assistive-text"
+                  onMouseEnter={[Function]}
+                >
+                  user
+                </div>
                 <svg
                   aria-hidden={true}
                   description="Icon"
@@ -817,7 +853,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                     d="M8,3C6.6,3,5.5,4.1,5.5,5.5S6.6,8,8,8s2.5-1.1,2.5-2.5S9.4,3,8,3z M8,7C7.2,7,6.5,6.3,6.5,5.5S7.2,4,8,4s1.5,0.7,1.5,1.5	S8.8,7,8,7z"
                   />
                 </svg>
-              </a>
+              </button>
               <ul
                 aria-label="user"
                 className="bx--header__menu"
@@ -996,18 +1032,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
             <div
               className="bx--header__submenu bx--header-action-btn"
             >
-              <a
+              <button
+                aria-describedby={null}
                 aria-expanded={false}
                 aria-haspopup="menu"
                 aria-label="user"
-                className="bx--header__menu-item bx--header__menu-title"
+                aria-pressed={null}
+                className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
                 data-testid="menuitem"
-                href="#"
+                disabled={false}
+                onBlur={[Function]}
                 onClick={[Function]}
-                onKeyDown={[Function]}
+                onFocus={[Function]}
+                onMouseEnter={[Function]}
+                onMouseLeave={[Function]}
                 role="menuitem"
                 tabIndex={0}
+                type="button"
               >
+                <div
+                  className="bx--assistive-text"
+                  onMouseEnter={[Function]}
+                >
+                  user
+                </div>
                 <svg
                   aria-hidden={true}
                   description="Icon"
@@ -1026,7 +1074,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                     d="M8,3C6.6,3,5.5,4.1,5.5,5.5S6.6,8,8,8s2.5-1.1,2.5-2.5S9.4,3,8,3z M8,7C7.2,7,6.5,6.3,6.5,5.5S7.2,4,8,4s1.5,0.7,1.5,1.5	S8.8,7,8,7z"
                   />
                 </svg>
-              </a>
+              </button>
               <ul
                 aria-label="user"
                 className="bx--header__menu"
@@ -1561,18 +1609,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
             <div
               className="bx--header__submenu bx--header-action-btn"
             >
-              <a
+              <button
+                aria-describedby={null}
                 aria-expanded={false}
                 aria-haspopup="menu"
                 aria-label="user"
-                className="bx--header__menu-item bx--header__menu-title"
+                aria-pressed={null}
+                className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
                 data-testid="menuitem"
-                href="#"
+                disabled={false}
+                onBlur={[Function]}
                 onClick={[Function]}
-                onKeyDown={[Function]}
+                onFocus={[Function]}
+                onMouseEnter={[Function]}
+                onMouseLeave={[Function]}
                 role="menuitem"
                 tabIndex={0}
+                type="button"
               >
+                <div
+                  className="bx--assistive-text"
+                  onMouseEnter={[Function]}
+                >
+                  user
+                </div>
                 <svg
                   aria-hidden={true}
                   description="Icon"
@@ -1591,7 +1651,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                     d="M8,3C6.6,3,5.5,4.1,5.5,5.5S6.6,8,8,8s2.5-1.1,2.5-2.5S9.4,3,8,3z M8,7C7.2,7,6.5,6.3,6.5,5.5S7.2,4,8,4s1.5,0.7,1.5,1.5	S8.8,7,8,7z"
                   />
                 </svg>
-              </a>
+              </button>
               <ul
                 aria-label="user"
                 className="bx--header__menu"
diff --git a/packages/react/src/components/Header/__snapshots__/Header.test.jsx.snap b/packages/react/src/components/Header/__snapshots__/Header.test.jsx.snap
index fab4375c25..f5b0b322e2 100644
--- a/packages/react/src/components/Header/__snapshots__/Header.test.jsx.snap
+++ b/packages/react/src/components/Header/__snapshots__/Header.test.jsx.snap
@@ -158,16 +158,21 @@ exports[`Header should render 1`] = `
           <div
             class="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
               aria-expanded="false"
               aria-haspopup="menu"
               aria-label="user"
-              class="bx--header__menu-item bx--header__menu-title"
+              class="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
               role="menuitem"
               tabindex="0"
+              type="button"
             >
+              <div
+                class="bx--assistive-text"
+              >
+                user
+              </div>
               <svg
                 aria-hidden="true"
                 description="Icon"
@@ -183,7 +188,7 @@ exports[`Header should render 1`] = `
                   d="M16 4a5 5 0 11-5 5 5 5 0 015-5m0-2a7 7 0 107 7A7 7 0 0016 2zM26 30H24V25a5 5 0 00-5-5H13a5 5 0 00-5 5v5H6V25a7 7 0 017-7h6a7 7 0 017 7z"
                 />
               </svg>
-            </a>
+            </button>
             <ul
               aria-label="user"
               class="bx--header__menu"
diff --git a/packages/react/src/components/ProgressBar/__snapshots__/ProgressBar.story.storyshot b/packages/react/src/components/ProgressBar/__snapshots__/ProgressBar.story.storyshot
index 9b2118b7b8..6fd71bb1a0 100644
--- a/packages/react/src/components/ProgressBar/__snapshots__/ProgressBar.story.storyshot
+++ b/packages/react/src/components/ProgressBar/__snapshots__/ProgressBar.story.storyshot
@@ -38,13 +38,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
       >
         <span
           className="bx--progress-bar__label"
-          id="progress-bar-705"
+          id="progress-bar-710"
         >
           Progress bar label
         </span>
         <div
-          aria-describedby="progress-bar-helper-706"
-          aria-labelledby="progress-bar-705"
+          aria-describedby="progress-bar-helper-711"
+          aria-labelledby="progress-bar-710"
           aria-valuemax={100}
           aria-valuemin={0}
           aria-valuenow={75}
@@ -62,7 +62,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
         </div>
         <div
           className="bx--progress-bar__helper-text"
-          id="progress-bar-helper-706"
+          id="progress-bar-helper-711"
         >
           Optional helper text
         </div>
@@ -135,13 +135,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
       >
         <span
           className="bx--progress-bar__label"
-          id="progress-bar-709"
+          id="progress-bar-714"
         >
           Progress bar label
         </span>
         <div
-          aria-describedby="progress-bar-helper-710"
-          aria-labelledby="progress-bar-709"
+          aria-describedby="progress-bar-helper-715"
+          aria-labelledby="progress-bar-714"
           aria-valuemax={100}
           aria-valuemin={0}
           aria-valuenow={75}
@@ -159,7 +159,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
         </div>
         <div
           className="bx--progress-bar__helper-text"
-          id="progress-bar-helper-710"
+          id="progress-bar-helper-715"
         >
           Optional helper text
         </div>
@@ -207,13 +207,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
       >
         <span
           className="bx--progress-bar__label"
-          id="progress-bar-707"
+          id="progress-bar-712"
         >
           Progress bar label
         </span>
         <div
-          aria-describedby="progress-bar-helper-708"
-          aria-labelledby="progress-bar-707"
+          aria-describedby="progress-bar-helper-713"
+          aria-labelledby="progress-bar-712"
           aria-valuemax={100}
           aria-valuemin={0}
           aria-valuenow={75}
@@ -231,7 +231,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
         </div>
         <div
           className="bx--progress-bar__helper-text"
-          id="progress-bar-helper-708"
+          id="progress-bar-helper-713"
         >
           Optional helper text
         </div>
@@ -300,13 +300,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
       >
         <span
           className="bx--progress-bar__label"
-          id="progress-bar-713"
+          id="progress-bar-718"
         >
           Mon, Oct 5
         </span>
         <div
-          aria-describedby="progress-bar-helper-714"
-          aria-labelledby="progress-bar-713"
+          aria-describedby="progress-bar-helper-719"
+          aria-labelledby="progress-bar-718"
           aria-valuemax={100}
           aria-valuemin={0}
           aria-valuenow={75}
@@ -324,7 +324,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
         </div>
         <div
           className="bx--progress-bar__helper-text"
-          id="progress-bar-helper-714"
+          id="progress-bar-helper-719"
         >
           Optional helper text
         </div>
@@ -372,13 +372,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
       >
         <span
           className="bx--progress-bar__label"
-          id="progress-bar-711"
+          id="progress-bar-716"
         >
           Mon, Oct 5
         </span>
         <div
-          aria-describedby="progress-bar-helper-712"
-          aria-labelledby="progress-bar-711"
+          aria-describedby="progress-bar-helper-717"
+          aria-labelledby="progress-bar-716"
           aria-valuemax={100}
           aria-valuemin={0}
           aria-valuenow={75}
@@ -396,7 +396,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/P
         </div>
         <div
           className="bx--progress-bar__helper-text"
-          id="progress-bar-helper-712"
+          id="progress-bar-helper-717"
         >
           Optional helper text
         </div>
diff --git a/packages/react/src/components/RuleBuilder/__snapshots__/RuleBuilder.story.storyshot b/packages/react/src/components/RuleBuilder/__snapshots__/RuleBuilder.story.storyshot
index c8c1e56838..7552f15095 100644
--- a/packages/react/src/components/RuleBuilder/__snapshots__/RuleBuilder.story.storyshot
+++ b/packages/react/src/components/RuleBuilder/__snapshots__/RuleBuilder.story.storyshot
@@ -699,7 +699,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
               onAnimationEnd={[Function]}
             >
               <button
-                aria-controls="accordion-item-727"
+                aria-controls="accordion-item-732"
                 aria-expanded={true}
                 className="bx--accordion__heading"
                 onClick={[Function]}
@@ -730,7 +730,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
               </button>
               <div
                 className="bx--accordion__content"
-                id="accordion-item-727"
+                id="accordion-item-732"
               >
                 <div
                   className="bx--form-item bx--text-input-wrapper bx--text-input-wrapper--light"
@@ -811,7 +811,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
               onAnimationEnd={[Function]}
             >
               <button
-                aria-controls="accordion-item-728"
+                aria-controls="accordion-item-733"
                 aria-expanded={true}
                 className="bx--accordion__heading"
                 onClick={[Function]}
@@ -842,7 +842,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
               </button>
               <div
                 className="bx--accordion__content"
-                id="accordion-item-728"
+                id="accordion-item-733"
               >
                 <div
                   className="iot--rule-builder-wrap--user-container"
@@ -6265,7 +6265,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
               onAnimationEnd={[Function]}
             >
               <button
-                aria-controls="accordion-item-767"
+                aria-controls="accordion-item-772"
                 aria-expanded={true}
                 className="bx--accordion__heading"
                 onClick={[Function]}
@@ -6296,7 +6296,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
               </button>
               <div
                 className="bx--accordion__content"
-                id="accordion-item-767"
+                id="accordion-item-772"
               >
                 <div
                   className="bx--form-item bx--text-input-wrapper bx--text-input-wrapper--light"
@@ -6459,7 +6459,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
               onAnimationEnd={[Function]}
             >
               <button
-                aria-controls="accordion-item-768"
+                aria-controls="accordion-item-773"
                 aria-expanded={true}
                 className="bx--accordion__heading"
                 onClick={[Function]}
@@ -6490,7 +6490,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
               </button>
               <div
                 className="bx--accordion__content"
-                id="accordion-item-768"
+                id="accordion-item-773"
               >
                 <div
                   className="iot--rule-builder-wrap--user-container"
diff --git a/packages/react/src/components/SuiteHeader/__snapshots__/MultiWorkspaceSuiteHeader.story.storyshot b/packages/react/src/components/SuiteHeader/__snapshots__/MultiWorkspaceSuiteHeader.story.storyshot
index afaf2f8a5c..5e91cb704f 100644
--- a/packages/react/src/components/SuiteHeader/__snapshots__/MultiWorkspaceSuiteHeader.story.storyshot
+++ b/packages/react/src/components/SuiteHeader/__snapshots__/MultiWorkspaceSuiteHeader.story.storyshot
@@ -224,18 +224,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -263,7 +275,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -413,18 +425,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -448,7 +472,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -1004,18 +1028,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -1043,7 +1079,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -1193,18 +1229,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -1228,7 +1276,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -1843,18 +1891,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -1882,7 +1942,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -2032,18 +2092,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -2067,7 +2139,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -2870,18 +2942,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="car"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                car
+              </div>
               <span
                 id="car-icon"
               >
@@ -2901,7 +2985,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="car"
               className="bx--header__menu"
@@ -3040,18 +3124,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -3079,7 +3175,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -3304,18 +3400,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -3339,7 +3447,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -4116,18 +4224,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -4155,7 +4275,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -4305,18 +4425,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -4340,7 +4472,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -5081,18 +5213,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -5120,7 +5264,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -5270,18 +5414,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -5305,7 +5461,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -5965,18 +6121,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -6004,7 +6172,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -6154,18 +6322,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -6189,7 +6369,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -7330,18 +7510,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -7369,7 +7561,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -7519,18 +7711,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -7554,7 +7758,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -8173,18 +8377,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -8212,7 +8428,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -8298,18 +8514,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -8333,7 +8561,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -8768,18 +8996,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -8807,7 +9047,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -8957,18 +9197,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -8992,7 +9244,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -9623,18 +9875,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -9662,7 +9926,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -9812,18 +10076,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -9847,7 +10123,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -10403,18 +10679,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -10442,7 +10730,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -10592,18 +10880,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -10627,7 +10927,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -11219,18 +11519,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -11258,7 +11570,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -11408,18 +11720,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -11443,7 +11767,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -12074,18 +12398,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -12113,7 +12449,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -12263,18 +12599,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -12298,7 +12646,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
diff --git a/packages/react/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot b/packages/react/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot
index 5a66016c6e..92ad6671ff 100644
--- a/packages/react/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot
+++ b/packages/react/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot
@@ -247,18 +247,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -286,7 +298,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -436,18 +448,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -471,7 +495,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -1121,18 +1145,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="car"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                car
+              </div>
               <span
                 id="car-icon"
               >
@@ -1152,7 +1188,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="car"
               className="bx--header__menu"
@@ -1291,18 +1327,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -1330,7 +1378,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -1555,18 +1603,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -1590,7 +1650,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -2188,18 +2248,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -2227,7 +2299,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -2377,18 +2449,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -2412,7 +2496,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -3000,18 +3084,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -3039,7 +3135,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -3189,18 +3285,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -3224,7 +3332,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -3736,18 +3844,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -3775,7 +3895,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -3925,18 +4045,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -3960,7 +4092,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -4986,18 +5118,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -5025,7 +5169,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -5175,18 +5319,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -5210,7 +5366,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -5681,18 +5837,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -5720,7 +5888,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -5806,18 +5974,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -5841,7 +6021,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -6276,18 +6456,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -6315,7 +6507,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -6465,18 +6657,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -6500,7 +6704,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
@@ -6983,18 +7187,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="Help"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                Help
+              </div>
               <span
                 id="suite-header-action-item-help"
               >
@@ -7022,7 +7238,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="Help"
               className="bx--header__menu"
@@ -7172,18 +7388,30 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
           <div
             className="bx--header__submenu bx--header-action-btn"
           >
-            <a
+            <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="menu"
               aria-label="user"
-              className="bx--header__menu-item bx--header__menu-title"
+              aria-pressed={null}
+              className="bx--header__menu-item bx--header__menu-title iot--btn bx--btn bx--btn--primary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--bottom bx--tooltip--align-center"
               data-testid="menuitem"
-              href="#"
+              disabled={false}
+              onBlur={[Function]}
               onClick={[Function]}
-              onKeyDown={[Function]}
+              onFocus={[Function]}
+              onMouseEnter={[Function]}
+              onMouseLeave={[Function]}
               role="menuitem"
               tabIndex={0}
+              type="button"
             >
+              <div
+                className="bx--assistive-text"
+                onMouseEnter={[Function]}
+              >
+                user
+              </div>
               <span
                 id="suite-header-action-item-profile"
               >
@@ -7207,7 +7435,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/U
                   />
                 </svg>
               </span>
-            </a>
+            </button>
             <ul
               aria-label="user"
               className="bx--header__menu"
diff --git a/packages/react/src/components/Table/TableSaveViewModal/__snapshots__/TableSaveViewModal.story.storyshot b/packages/react/src/components/Table/TableSaveViewModal/__snapshots__/TableSaveViewModal.story.storyshot
index 0c564b5b1f..786d0df43b 100644
--- a/packages/react/src/components/Table/TableSaveViewModal/__snapshots__/TableSaveViewModal.story.storyshot
+++ b/packages/react/src/components/Table/TableSaveViewModal/__snapshots__/TableSaveViewModal.story.storyshot
@@ -333,7 +333,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/T
               onAnimationEnd={[Function]}
             >
               <button
-                aria-controls="accordion-item-1516"
+                aria-controls="accordion-item-1573"
                 aria-expanded={false}
                 className="bx--accordion__heading"
                 onClick={[Function]}
@@ -364,7 +364,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/T
               </button>
               <div
                 className="bx--accordion__content"
-                id="accordion-item-1516"
+                id="accordion-item-1573"
               >
                 <p>
                   Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
@@ -376,7 +376,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/T
               onAnimationEnd={[Function]}
             >
               <button
-                aria-controls="accordion-item-1517"
+                aria-controls="accordion-item-1574"
                 aria-expanded={false}
                 className="bx--accordion__heading"
                 onClick={[Function]}
@@ -407,7 +407,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/T
               </button>
               <div
                 className="bx--accordion__content"
-                id="accordion-item-1517"
+                id="accordion-item-1574"
               >
                 <p>
                   Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
diff --git a/packages/react/src/components/TileGallery/__snapshots__/TileGallery.story.storyshot b/packages/react/src/components/TileGallery/__snapshots__/TileGallery.story.storyshot
index 088dbac61a..6e08ebd376 100644
--- a/packages/react/src/components/TileGallery/__snapshots__/TileGallery.story.storyshot
+++ b/packages/react/src/components/TileGallery/__snapshots__/TileGallery.story.storyshot
@@ -201,7 +201,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
                   onAnimationEnd={[Function]}
                 >
                   <button
-                    aria-controls="accordion-item-1661"
+                    aria-controls="accordion-item-1718"
                     aria-expanded={true}
                     className="bx--accordion__heading"
                     onClick={[Function]}
@@ -232,7 +232,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
                   </button>
                   <div
                     className="bx--accordion__content"
-                    id="accordion-item-1661"
+                    id="accordion-item-1718"
                   >
                     <div
                       className="tile-gallery--section--items"
@@ -624,7 +624,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
                   onAnimationEnd={[Function]}
                 >
                   <button
-                    aria-controls="accordion-item-1662"
+                    aria-controls="accordion-item-1719"
                     aria-expanded={true}
                     className="bx--accordion__heading"
                     onClick={[Function]}
@@ -655,7 +655,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
                   </button>
                   <div
                     className="bx--accordion__content"
-                    id="accordion-item-1662"
+                    id="accordion-item-1719"
                   >
                     <div
                       className="tile-gallery--section--items"
@@ -1494,7 +1494,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
                   onAnimationEnd={[Function]}
                 >
                   <button
-                    aria-controls="accordion-item-1668"
+                    aria-controls="accordion-item-1725"
                     aria-expanded={true}
                     className="bx--accordion__heading"
                     onClick={[Function]}
@@ -1525,7 +1525,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
                   </button>
                   <div
                     className="bx--accordion__content"
-                    id="accordion-item-1668"
+                    id="accordion-item-1725"
                   >
                     <div
                       className="tile-gallery--section--items"
@@ -1694,7 +1694,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
             onAnimationEnd={[Function]}
           >
             <button
-              aria-controls="accordion-item-1665"
+              aria-controls="accordion-item-1722"
               aria-expanded={true}
               className="bx--accordion__heading"
               onClick={[Function]}
@@ -1725,7 +1725,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
             </button>
             <div
               className="bx--accordion__content"
-              id="accordion-item-1665"
+              id="accordion-item-1722"
             >
               <div
                 className="tile-gallery--section--items"
@@ -2142,7 +2142,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
             onAnimationEnd={[Function]}
           >
             <button
-              aria-controls="accordion-item-1666"
+              aria-controls="accordion-item-1723"
               aria-expanded={true}
               className="bx--accordion__heading"
               onClick={[Function]}
@@ -2173,7 +2173,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
             </button>
             <div
               className="bx--accordion__content"
-              id="accordion-item-1666"
+              id="accordion-item-1723"
             >
               <div
                 className="tile-gallery--section--items"
@@ -2429,7 +2429,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
               onAnimationEnd={[Function]}
             >
               <button
-                aria-controls="accordion-item-1663"
+                aria-controls="accordion-item-1720"
                 aria-expanded={true}
                 className="bx--accordion__heading"
                 onClick={[Function]}
@@ -2460,7 +2460,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
               </button>
               <div
                 className="bx--accordion__content"
-                id="accordion-item-1663"
+                id="accordion-item-1720"
               >
                 <div
                   className="tile-gallery--section--items"
@@ -2877,7 +2877,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
               onAnimationEnd={[Function]}
             >
               <button
-                aria-controls="accordion-item-1664"
+                aria-controls="accordion-item-1721"
                 aria-expanded={true}
                 className="bx--accordion__heading"
                 onClick={[Function]}
@@ -2908,7 +2908,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
               </button>
               <div
                 className="bx--accordion__content"
-                id="accordion-item-1664"
+                id="accordion-item-1721"
               >
                 <div
                   className="tile-gallery--section--items"