diff --git a/package-lock.json b/package-lock.json
index 910e12e33..a5035bbf4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,10 +14,11 @@
         "configuration/*"
       ],
       "dependencies": {
-        "@cloudscape-design/collection-hooks": "1.0.36",
-        "@cloudscape-design/components": "3.0.518",
-        "@cloudscape-design/design-tokens": "3.0.34",
-        "@cloudscape-design/global-styles": "1.0.23",
+        "@cloudscape-design/collection-hooks": "1.0.49",
+        "@cloudscape-design/component-toolkit": "^1.0.0-beta.62",
+        "@cloudscape-design/components": "3.0.693",
+        "@cloudscape-design/design-tokens": "3.0.42",
+        "@cloudscape-design/global-styles": "1.0.31",
         "vite": "^4.5.3"
       },
       "devDependencies": {
@@ -11695,25 +11696,26 @@
       "integrity": "sha512-V34dacxWLwKcvcy32dx96ADJVdB7kOJLm7LyBkBQw5u5HC9WdEFw2G17zml+U3ivavGTrGPJHl8o9/UJm0PlUw=="
     },
     "node_modules/@cloudscape-design/collection-hooks": {
-      "version": "1.0.36",
-      "resolved": "https://registry.npmjs.org/@cloudscape-design/collection-hooks/-/collection-hooks-1.0.36.tgz",
-      "integrity": "sha512-IInI1NLKnv4ihIglkI1se33TxiUjQ/0shZ3t8n02VLv0fhhT4p0ObISoxHScNfWk9eJ1+EYL1fTcc8yJQF/7/Q==",
+      "version": "1.0.49",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/collection-hooks/-/collection-hooks-1.0.49.tgz",
+      "integrity": "sha512-zWvFGIJLBqmKM01xbogMSocpDI/DOLw8bpeH0+1mB7nP/M5OnkcoPtFtEvu2CZdEFUUYtKml0N+W7GI/NtIcwg==",
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/@cloudscape-design/component-toolkit": {
-      "version": "1.0.0-beta.26",
-      "integrity": "sha512-nUS3iRsV5mbYzQmH8104eTJj0GotkJQxEoJjqdu4WyJvwJez4KCJCdN3YtV8anWPxMCkDiKMhvvsDcL2i9w1WA==",
+      "version": "1.0.0-beta.72",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/component-toolkit/-/component-toolkit-1.0.0-beta.72.tgz",
+      "integrity": "sha512-i5KbV+CCI53jFFegRE9rSyoCadS591SKu50nSVbG6OQ2YAvboU+x3nhv6q8yZoYPHgz7nSV7fGgVFYhV2T5YCQ==",
       "dependencies": {
         "@juggle/resize-observer": "^3.3.1",
         "tslib": "^2.3.1"
       }
     },
     "node_modules/@cloudscape-design/components": {
-      "version": "3.0.518",
-      "resolved": "https://registry.npmjs.org/@cloudscape-design/components/-/components-3.0.518.tgz",
-      "integrity": "sha512-WESFKO8oqFBEoGO5fHMLvbJysNu9G5lADUfEYru9C+Vd0tdlMw/vsnl39vVgjprrDUNifpuMmAs1wDTmLnKwTg==",
+      "version": "3.0.693",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/components/-/components-3.0.693.tgz",
+      "integrity": "sha512-xeFVUN4j9CIzQJzPKfuGI8uC7kvL+Z904dRJ1ivwlJrMombAIBgvqOOe1W+dlPr6x3J+oAuZHzWZ+Mu73dEqQQ==",
       "dependencies": {
         "@cloudscape-design/collection-hooks": "^1.0.0",
         "@cloudscape-design/component-toolkit": "^1.0.0-beta",
@@ -11723,7 +11725,7 @@
         "@dnd-kit/sortable": "^7.0.2",
         "@dnd-kit/utilities": "^3.2.1",
         "@juggle/resize-observer": "^3.3.1",
-        "ace-builds": "^1.23.0",
+        "ace-builds": "^1.34.0",
         "balanced-match": "^1.0.2",
         "clsx": "^1.1.0",
         "d3-shape": "^1.3.7",
@@ -11732,7 +11734,6 @@
         "mnth": "^2.0.0",
         "react-keyed-flatten-children": "^1.3.0",
         "react-transition-group": "^4.4.2",
-        "react-virtual": "^2.8.2",
         "tslib": "^2.4.0",
         "weekstart": "^1.1.0"
       },
@@ -11742,14 +11743,14 @@
       }
     },
     "node_modules/@cloudscape-design/design-tokens": {
-      "version": "3.0.34",
-      "resolved": "https://registry.npmjs.org/@cloudscape-design/design-tokens/-/design-tokens-3.0.34.tgz",
-      "integrity": "sha512-qzcJa806nnowCtIF3NfleonO6Qs98v2dXx0kz+Zw6+ZXODXp/DNTRkEKjIYBmc8vgszSsvbSK8cLcDJxeVBTuQ=="
+      "version": "3.0.42",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/design-tokens/-/design-tokens-3.0.42.tgz",
+      "integrity": "sha512-Qwsu2PDJ07lW24upFETLEuQ5LPgTPq0ERCWqCGRqh+ZKZ4dxS6Hb1zlQ3G0V0Hn27Rbd0B+zGxp0FSu2YR7EHg=="
     },
     "node_modules/@cloudscape-design/global-styles": {
-      "version": "1.0.23",
-      "resolved": "https://registry.npmjs.org/@cloudscape-design/global-styles/-/global-styles-1.0.23.tgz",
-      "integrity": "sha512-5/tcqVcFH7gfGqGj2DEt8MTn4E+w/c6VlzkozRR4hDTz0ePetkh1zbj+JfE4rzM2TF+keI9b5fLfb5uAGsYCIA=="
+      "version": "1.0.31",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/global-styles/-/global-styles-1.0.31.tgz",
+      "integrity": "sha512-8OrgNAi2VC2G+DaEjtMScWIeW1KD1YNHuqjXT0mYaU/Yl6zbCVNRObsqDcbcEMwUE/XBZ/LdX+/sabn/IPl2Eg=="
     },
     "node_modules/@cloudscape-design/test-utils-core": {
       "version": "1.0.1",
@@ -36934,8 +36935,9 @@
       }
     },
     "node_modules/ace-builds": {
-      "version": "1.30.0",
-      "integrity": "sha512-ZC+G1ozrrVCVL/KPkeU9R7TEwYeNJUYRrjnEvNhF8r2+WR2tkcCjmduL8M6D3abIdf/16ccEXHtpoRBhAnTyCw=="
+      "version": "1.36.2",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.36.2.tgz",
+      "integrity": "sha512-eqqfbGwx/GKjM/EnFu4QtQ+d2NNBu84MGgxoG8R5iyFpcVeQ4p9YlTL+ZzdEJqhdkASqoqOxCSNNGyB6lvMm+A=="
     },
     "node_modules/acorn": {
       "version": "7.4.1",
@@ -74957,9 +74959,9 @@
       "version": "10.12.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@cloudscape-design/collection-hooks": "1.0.36",
-        "@cloudscape-design/components": "3.0.518",
-        "@cloudscape-design/design-tokens": "3.0.34",
+        "@cloudscape-design/collection-hooks": "1.0.49",
+        "@cloudscape-design/components": "3.0.693",
+        "@cloudscape-design/design-tokens": "3.0.42",
         "@iot-app-kit/charts": "2.1.2",
         "@iot-app-kit/charts-core": "2.1.2",
         "@iot-app-kit/components": "10.12.2",
@@ -90300,22 +90302,23 @@
       "integrity": "sha512-V34dacxWLwKcvcy32dx96ADJVdB7kOJLm7LyBkBQw5u5HC9WdEFw2G17zml+U3ivavGTrGPJHl8o9/UJm0PlUw=="
     },
     "@cloudscape-design/collection-hooks": {
-      "version": "1.0.36",
-      "resolved": "https://registry.npmjs.org/@cloudscape-design/collection-hooks/-/collection-hooks-1.0.36.tgz",
-      "integrity": "sha512-IInI1NLKnv4ihIglkI1se33TxiUjQ/0shZ3t8n02VLv0fhhT4p0ObISoxHScNfWk9eJ1+EYL1fTcc8yJQF/7/Q=="
+      "version": "1.0.49",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/collection-hooks/-/collection-hooks-1.0.49.tgz",
+      "integrity": "sha512-zWvFGIJLBqmKM01xbogMSocpDI/DOLw8bpeH0+1mB7nP/M5OnkcoPtFtEvu2CZdEFUUYtKml0N+W7GI/NtIcwg=="
     },
     "@cloudscape-design/component-toolkit": {
-      "version": "1.0.0-beta.26",
-      "integrity": "sha512-nUS3iRsV5mbYzQmH8104eTJj0GotkJQxEoJjqdu4WyJvwJez4KCJCdN3YtV8anWPxMCkDiKMhvvsDcL2i9w1WA==",
+      "version": "1.0.0-beta.72",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/component-toolkit/-/component-toolkit-1.0.0-beta.72.tgz",
+      "integrity": "sha512-i5KbV+CCI53jFFegRE9rSyoCadS591SKu50nSVbG6OQ2YAvboU+x3nhv6q8yZoYPHgz7nSV7fGgVFYhV2T5YCQ==",
       "requires": {
         "@juggle/resize-observer": "^3.3.1",
         "tslib": "^2.3.1"
       }
     },
     "@cloudscape-design/components": {
-      "version": "3.0.518",
-      "resolved": "https://registry.npmjs.org/@cloudscape-design/components/-/components-3.0.518.tgz",
-      "integrity": "sha512-WESFKO8oqFBEoGO5fHMLvbJysNu9G5lADUfEYru9C+Vd0tdlMw/vsnl39vVgjprrDUNifpuMmAs1wDTmLnKwTg==",
+      "version": "3.0.693",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/components/-/components-3.0.693.tgz",
+      "integrity": "sha512-xeFVUN4j9CIzQJzPKfuGI8uC7kvL+Z904dRJ1ivwlJrMombAIBgvqOOe1W+dlPr6x3J+oAuZHzWZ+Mu73dEqQQ==",
       "requires": {
         "@cloudscape-design/collection-hooks": "^1.0.0",
         "@cloudscape-design/component-toolkit": "^1.0.0-beta",
@@ -90325,7 +90328,7 @@
         "@dnd-kit/sortable": "^7.0.2",
         "@dnd-kit/utilities": "^3.2.1",
         "@juggle/resize-observer": "^3.3.1",
-        "ace-builds": "^1.23.0",
+        "ace-builds": "^1.34.0",
         "balanced-match": "^1.0.2",
         "clsx": "^1.1.0",
         "d3-shape": "^1.3.7",
@@ -90334,20 +90337,19 @@
         "mnth": "^2.0.0",
         "react-keyed-flatten-children": "^1.3.0",
         "react-transition-group": "^4.4.2",
-        "react-virtual": "^2.8.2",
         "tslib": "^2.4.0",
         "weekstart": "^1.1.0"
       }
     },
     "@cloudscape-design/design-tokens": {
-      "version": "3.0.34",
-      "resolved": "https://registry.npmjs.org/@cloudscape-design/design-tokens/-/design-tokens-3.0.34.tgz",
-      "integrity": "sha512-qzcJa806nnowCtIF3NfleonO6Qs98v2dXx0kz+Zw6+ZXODXp/DNTRkEKjIYBmc8vgszSsvbSK8cLcDJxeVBTuQ=="
+      "version": "3.0.42",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/design-tokens/-/design-tokens-3.0.42.tgz",
+      "integrity": "sha512-Qwsu2PDJ07lW24upFETLEuQ5LPgTPq0ERCWqCGRqh+ZKZ4dxS6Hb1zlQ3G0V0Hn27Rbd0B+zGxp0FSu2YR7EHg=="
     },
     "@cloudscape-design/global-styles": {
-      "version": "1.0.23",
-      "resolved": "https://registry.npmjs.org/@cloudscape-design/global-styles/-/global-styles-1.0.23.tgz",
-      "integrity": "sha512-5/tcqVcFH7gfGqGj2DEt8MTn4E+w/c6VlzkozRR4hDTz0ePetkh1zbj+JfE4rzM2TF+keI9b5fLfb5uAGsYCIA=="
+      "version": "1.0.31",
+      "resolved": "https://registry.npmjs.org/@cloudscape-design/global-styles/-/global-styles-1.0.31.tgz",
+      "integrity": "sha512-8OrgNAi2VC2G+DaEjtMScWIeW1KD1YNHuqjXT0mYaU/Yl6zbCVNRObsqDcbcEMwUE/XBZ/LdX+/sabn/IPl2Eg=="
     },
     "@cloudscape-design/test-utils-core": {
       "version": "1.0.1",
@@ -94554,9 +94556,9 @@
     "@iot-app-kit/react-components": {
       "version": "file:packages/react-components",
       "requires": {
-        "@cloudscape-design/collection-hooks": "1.0.36",
-        "@cloudscape-design/components": "3.0.518",
-        "@cloudscape-design/design-tokens": "3.0.34",
+        "@cloudscape-design/collection-hooks": "1.0.49",
+        "@cloudscape-design/components": "3.0.693",
+        "@cloudscape-design/design-tokens": "3.0.42",
         "@iot-app-kit/charts": "2.1.2",
         "@iot-app-kit/charts-core": "2.1.2",
         "@iot-app-kit/components": "10.12.2",
@@ -115655,8 +115657,9 @@
       }
     },
     "ace-builds": {
-      "version": "1.30.0",
-      "integrity": "sha512-ZC+G1ozrrVCVL/KPkeU9R7TEwYeNJUYRrjnEvNhF8r2+WR2tkcCjmduL8M6D3abIdf/16ccEXHtpoRBhAnTyCw=="
+      "version": "1.36.2",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.36.2.tgz",
+      "integrity": "sha512-eqqfbGwx/GKjM/EnFu4QtQ+d2NNBu84MGgxoG8R5iyFpcVeQ4p9YlTL+ZzdEJqhdkASqoqOxCSNNGyB6lvMm+A=="
     },
     "acorn": {
       "version": "7.4.1",
diff --git a/package.json b/package.json
index 606687d1a..8ac4af0ce 100644
--- a/package.json
+++ b/package.json
@@ -38,10 +38,11 @@
     "test:ci": "if test \"$NODE_ENV\" = \"production\"; then echo \"Yes!\"; fi"
   },
   "dependencies": {
-    "@cloudscape-design/collection-hooks": "1.0.36",
-    "@cloudscape-design/components": "3.0.518",
-    "@cloudscape-design/design-tokens": "3.0.34",
-    "@cloudscape-design/global-styles": "1.0.23",
+    "@cloudscape-design/collection-hooks": "1.0.49",
+    "@cloudscape-design/components": "3.0.693",
+    "@cloudscape-design/design-tokens": "3.0.42",
+    "@cloudscape-design/global-styles": "1.0.31",
+    "@cloudscape-design/component-toolkit": "^1.0.0-beta.62",
     "vite": "^4.5.3"
   },
   "devDependencies": {
diff --git a/packages/dashboard/src/components/internalDashboard/index.tsx b/packages/dashboard/src/components/internalDashboard/index.tsx
index 9f2e34a8f..d8069dafa 100644
--- a/packages/dashboard/src/components/internalDashboard/index.tsx
+++ b/packages/dashboard/src/components/internalDashboard/index.tsx
@@ -310,6 +310,7 @@ const InternalDashboard: React.FC<InternalDashboardProperties> = ({
           name={name}
         />
       }
+      headerVariant='high-contrast'
     >
       <div
         className='dashboard'
@@ -380,6 +381,7 @@ const InternalDashboard: React.FC<InternalDashboardProperties> = ({
   const ReadOnlyComponent = (
     <ContentLayout
       disableOverlap
+      headerVariant='high-contrast'
       header={
         <DashboardHeader
           editable={editable}
diff --git a/packages/dashboard/src/customization/propertiesSections/propertiesPanel/panel.spec.tsx b/packages/dashboard/src/customization/propertiesSections/propertiesPanel/panel.spec.tsx
index 32babed18..a282c684a 100644
--- a/packages/dashboard/src/customization/propertiesSections/propertiesPanel/panel.spec.tsx
+++ b/packages/dashboard/src/customization/propertiesSections/propertiesPanel/panel.spec.tsx
@@ -159,11 +159,11 @@ describe(`${PropertiesPanel.name}`, () => {
     expect(screen.getByText('Axis')).toBeVisible();
     expect(screen.getByText('Format data')).toBeVisible();
 
-    const thresholdsTab = screen.getByTestId('thresholds');
+    const thresholdsTab = screen.getByRole('button', {name: 'Thresholds'});
     expect(thresholdsTab).toBeVisible();
 
     fireEvent.click(thresholdsTab);
-    expect(thresholdsTab).toHaveFocus();
+    // expect(thresholdsTab).toHaveFocus();
     expect(screen.getByText('Add a threshold')).toBeVisible();
 
     const options = {
diff --git a/packages/react-components/e2e/tests/chart/chart.spec.ts-snapshots/line-chart-default-settings-chromium-darwin.png b/packages/react-components/e2e/tests/chart/chart.spec.ts-snapshots/line-chart-default-settings-chromium-darwin.png
index d76278f94..d7c94d4c1 100644
Binary files a/packages/react-components/e2e/tests/chart/chart.spec.ts-snapshots/line-chart-default-settings-chromium-darwin.png and b/packages/react-components/e2e/tests/chart/chart.spec.ts-snapshots/line-chart-default-settings-chromium-darwin.png differ
diff --git a/packages/react-components/e2e/tests/chart/chart.spec.ts-snapshots/line-chart-default-settings-chromium-linux.png b/packages/react-components/e2e/tests/chart/chart.spec.ts-snapshots/line-chart-default-settings-chromium-linux.png
index d76278f94..d7c94d4c1 100644
Binary files a/packages/react-components/e2e/tests/chart/chart.spec.ts-snapshots/line-chart-default-settings-chromium-linux.png and b/packages/react-components/e2e/tests/chart/chart.spec.ts-snapshots/line-chart-default-settings-chromium-linux.png differ
diff --git a/packages/react-components/package.json b/packages/react-components/package.json
index f9629d369..873f06a59 100644
--- a/packages/react-components/package.json
+++ b/packages/react-components/package.json
@@ -111,9 +111,9 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@cloudscape-design/collection-hooks": "1.0.36",
-    "@cloudscape-design/components": "3.0.518",
-    "@cloudscape-design/design-tokens": "3.0.34",
+    "@cloudscape-design/collection-hooks": "1.0.49",
+    "@cloudscape-design/components": "3.0.693",
+    "@cloudscape-design/design-tokens": "3.0.42",
     "@iot-app-kit/charts": "2.1.2",
     "@iot-app-kit/charts-core": "2.1.2",
     "@iot-app-kit/components": "10.12.2",
diff --git a/packages/react-components/src/components/chart/legend/table/table.spec.tsx b/packages/react-components/src/components/chart/legend/table/table.spec.tsx
index 3c0bc3dbd..d5c200016 100644
--- a/packages/react-components/src/components/chart/legend/table/table.spec.tsx
+++ b/packages/react-components/src/components/chart/legend/table/table.spec.tsx
@@ -91,14 +91,14 @@ describe('legend table', () => {
 
     expect(table).not.toBeNull();
     expect(
-      screen.getByText(
+      screen.getAllByText(
         formatDate(trendCursors[0].date, { pattern: 'hh:mm:ss aaaa' })
-      )
+      )[0]
     ).not.toBeNull();
     expect(
-      screen.getByText(
+      screen.getAllByText(
         formatDate(trendCursors[0].date, { pattern: 'hh:mm:ss aaaa' })
-      )
+      )[0]
     ).not.toBeNull();
 
     expect(screen.getByText('111')).not.toBeNull();
diff --git a/packages/react-components/src/components/knowledge-graph/tests/KnowledgeGraphPanel.spec.tsx b/packages/react-components/src/components/knowledge-graph/tests/KnowledgeGraphPanel.spec.tsx
index 138c6d184..4f8bd538f 100644
--- a/packages/react-components/src/components/knowledge-graph/tests/KnowledgeGraphPanel.spec.tsx
+++ b/packages/react-components/src/components/knowledge-graph/tests/KnowledgeGraphPanel.spec.tsx
@@ -6,7 +6,7 @@ import { kgDataSource } from './__mocks__/dataSource';
 import { KnowledgeGraph, ZOOM_INTERVAL } from '../KnowledgeGraphPanel';
 
 jest.mock(
-  '@awsui/components-react/container',
+  '@cloudscape-design/components/container',
   () => (props: HTMLAttributes<HTMLDivElement>) =>
     <div data-mocked='Container' {...props}></div>
 );
diff --git a/packages/react-components/src/components/knowledge-graph/tests/__snapshots__/KnowledgeGraphPanel.spec.tsx.snap b/packages/react-components/src/components/knowledge-graph/tests/__snapshots__/KnowledgeGraphPanel.spec.tsx.snap
index 6273e3815..2023e0b0f 100644
--- a/packages/react-components/src/components/knowledge-graph/tests/__snapshots__/KnowledgeGraphPanel.spec.tsx.snap
+++ b/packages/react-components/src/components/knowledge-graph/tests/__snapshots__/KnowledgeGraphPanel.spec.tsx.snap
@@ -12,22 +12,22 @@ exports[`KnowledgeGraph should render correctly 1`] = `
       class="search-bar"
     >
       <div
-        class="awsui_grid_14yj0_rldjy_93"
+        class="awsui_grid_14yj0_xuaq6_97"
       >
         <div
-          class="awsui_grid-column_14yj0_rldjy_135 awsui_colspan-9_14yj0_rldjy_224"
+          class="awsui_grid-column_14yj0_xuaq6_141 awsui_colspan-9_14yj0_xuaq6_232"
         >
           <div
-            class="awsui_restore-pointer-events_14yj0_rldjy_304"
+            class="awsui_restore-pointer-events_14yj0_xuaq6_312"
           >
             <div
-              class="awsui_root_2rhyz_62axa_93 awsui_input-container_2rhyz_62axa_242"
+              class="awsui_root_2rhyz_4n5z9_97 awsui_input-container_2rhyz_4n5z9_273"
             >
               <span
-                class="awsui_input-icon-left_2rhyz_62axa_247"
+                class="awsui_input-icon-left_2rhyz_4n5z9_278"
               >
                 <span
-                  class="awsui_icon_h11ix_s5sg5_98 awsui_size-normal-mapped-height_h11ix_s5sg5_151 awsui_size-normal_h11ix_s5sg5_147 awsui_variant-subtle_h11ix_s5sg5_228"
+                  class="awsui_icon_h11ix_ayzd6_101 awsui_size-normal-mapped-height_h11ix_ayzd6_157 awsui_size-normal_h11ix_ayzd6_153 awsui_variant-subtle_h11ix_ayzd6_238"
                 >
                   <svg
                     aria-hidden="true"
@@ -48,7 +48,7 @@ exports[`KnowledgeGraph should render correctly 1`] = `
               </span>
               <input
                 autocomplete="on"
-                class="awsui_input_2rhyz_62axa_97 awsui_input-type-search_2rhyz_62axa_219 awsui_input-has-icon-left_2rhyz_62axa_214"
+                class="awsui_input_2rhyz_4n5z9_101 awsui_input-type-search_2rhyz_4n5z9_250 awsui_input-has-icon-left_2rhyz_4n5z9_229"
                 type="search"
                 value=""
               />
@@ -56,19 +56,20 @@ exports[`KnowledgeGraph should render correctly 1`] = `
           </div>
         </div>
         <div
-          class="awsui_grid-column_14yj0_rldjy_135 awsui_colspan-3_14yj0_rldjy_164"
+          class="awsui_grid-column_14yj0_xuaq6_141 awsui_colspan-3_14yj0_xuaq6_172"
         >
           <div
-            class="awsui_restore-pointer-events_14yj0_rldjy_304"
+            class="awsui_restore-pointer-events_14yj0_xuaq6_312"
           >
             <button
-              class="awsui_button_vjswe_qvh5k_101 awsui_variant-normal_vjswe_qvh5k_152"
+              class="awsui_button_vjswe_15u39_105 awsui_variant-normal_vjswe_15u39_156"
               data-analytics-funnel-value="button:r0:"
+              data-analytics-performance-mark="8-1726870557981-5351"
               data-testid="search-button"
               type="submit"
             >
               <span
-                class="awsui_content_vjswe_qvh5k_97"
+                class="awsui_content_vjswe_15u39_101 awsui_label_1f1d4_ocied_5"
               >
                 Search
               </span>
@@ -96,13 +97,14 @@ exports[`KnowledgeGraph should render correctly 1`] = `
           class="iot-app-kit-graph-control-item"
         >
           <button
-            class="iot-app-kit-graph-button awsui_button_vjswe_qvh5k_101 awsui_variant-icon_vjswe_qvh5k_192 awsui_button-no-text_vjswe_qvh5k_999"
+            class="iot-app-kit-graph-button awsui_button_vjswe_15u39_105 awsui_variant-icon_vjswe_15u39_199 awsui_button-no-text_vjswe_15u39_1085"
             data-analytics-funnel-value="button:r2:"
+            data-analytics-performance-mark="9-1726870557982-1830"
             data-testid="fit-button"
             type="submit"
           >
             <span
-              class="awsui_icon_vjswe_qvh5k_1025 awsui_icon-left_vjswe_qvh5k_1025 awsui_icon_h11ix_s5sg5_98 awsui_size-normal-mapped-height_h11ix_s5sg5_151 awsui_size-normal_h11ix_s5sg5_147 awsui_variant-normal_h11ix_s5sg5_219"
+              class="awsui_icon_vjswe_15u39_1111 awsui_icon-left_vjswe_15u39_1111 awsui_icon_h11ix_ayzd6_101 awsui_size-normal-mapped-height_h11ix_ayzd6_157 awsui_size-normal_h11ix_ayzd6_153 awsui_variant-normal_h11ix_ayzd6_229"
             >
               <svg
                 aria-hidden="true"
@@ -121,13 +123,14 @@ exports[`KnowledgeGraph should render correctly 1`] = `
           class="iot-app-kit-graph-control-item"
         >
           <button
-            class="iot-app-kit-graph-button awsui_button_vjswe_qvh5k_101 awsui_variant-icon_vjswe_qvh5k_192 awsui_button-no-text_vjswe_qvh5k_999"
+            class="iot-app-kit-graph-button awsui_button_vjswe_15u39_105 awsui_variant-icon_vjswe_15u39_199 awsui_button-no-text_vjswe_15u39_1085"
             data-analytics-funnel-value="button:r4:"
+            data-analytics-performance-mark="10-1726870557983-8566"
             data-testid="center-button"
             type="submit"
           >
             <span
-              class="awsui_icon_vjswe_qvh5k_1025 awsui_icon-left_vjswe_qvh5k_1025 awsui_icon_h11ix_s5sg5_98 awsui_size-normal-mapped-height_h11ix_s5sg5_151 awsui_size-normal_h11ix_s5sg5_147 awsui_variant-normal_h11ix_s5sg5_219"
+              class="awsui_icon_vjswe_15u39_1111 awsui_icon-left_vjswe_15u39_1111 awsui_icon_h11ix_ayzd6_101 awsui_size-normal-mapped-height_h11ix_ayzd6_157 awsui_size-normal_h11ix_ayzd6_153 awsui_variant-normal_h11ix_ayzd6_229"
             >
               <svg
                 aria-hidden="true"
@@ -146,13 +149,14 @@ exports[`KnowledgeGraph should render correctly 1`] = `
           class="iot-app-kit-graph-control-item"
         >
           <button
-            class="iot-app-kit-graph-button awsui_button_vjswe_qvh5k_101 awsui_variant-icon_vjswe_qvh5k_192 awsui_button-no-text_vjswe_qvh5k_999"
+            class="iot-app-kit-graph-button awsui_button_vjswe_15u39_105 awsui_variant-icon_vjswe_15u39_199 awsui_button-no-text_vjswe_15u39_1085"
             data-analytics-funnel-value="button:r6:"
+            data-analytics-performance-mark="11-1726870557983-3662"
             data-testid="zoom-in-button"
             type="submit"
           >
             <span
-              class="awsui_icon_vjswe_qvh5k_1025 awsui_icon-left_vjswe_qvh5k_1025 awsui_icon_h11ix_s5sg5_98 awsui_size-normal-mapped-height_h11ix_s5sg5_151 awsui_size-normal_h11ix_s5sg5_147 awsui_variant-normal_h11ix_s5sg5_219"
+              class="awsui_icon_vjswe_15u39_1111 awsui_icon-left_vjswe_15u39_1111 awsui_icon_h11ix_ayzd6_101 awsui_size-normal-mapped-height_h11ix_ayzd6_157 awsui_size-normal_h11ix_ayzd6_153 awsui_variant-normal_h11ix_ayzd6_229"
             >
               <svg
                 aria-hidden="true"
@@ -176,13 +180,14 @@ exports[`KnowledgeGraph should render correctly 1`] = `
           class="iot-app-kit-graph-control-item"
         >
           <button
-            class="iot-app-kit-graph-button awsui_button_vjswe_qvh5k_101 awsui_variant-icon_vjswe_qvh5k_192 awsui_button-no-text_vjswe_qvh5k_999"
+            class="iot-app-kit-graph-button awsui_button_vjswe_15u39_105 awsui_variant-icon_vjswe_15u39_199 awsui_button-no-text_vjswe_15u39_1085"
             data-analytics-funnel-value="button:r8:"
+            data-analytics-performance-mark="12-1726870557983-8534"
             data-testid="zoom-out-button"
             type="submit"
           >
             <span
-              class="awsui_icon_vjswe_qvh5k_1025 awsui_icon-left_vjswe_qvh5k_1025 awsui_icon_h11ix_s5sg5_98 awsui_size-normal-mapped-height_h11ix_s5sg5_151 awsui_size-normal_h11ix_s5sg5_147 awsui_variant-normal_h11ix_s5sg5_219"
+              class="awsui_icon_vjswe_15u39_1111 awsui_icon-left_vjswe_15u39_1111 awsui_icon_h11ix_ayzd6_101 awsui_size-normal-mapped-height_h11ix_ayzd6_157 awsui_size-normal_h11ix_ayzd6_153 awsui_variant-normal_h11ix_ayzd6_229"
             >
               <svg
                 aria-hidden="true"
@@ -208,37 +213,39 @@ exports[`KnowledgeGraph should render correctly 1`] = `
       class="action-buttons"
     >
       <div
-        class="awsui_root_18582_189oq_93 awsui_horizontal_18582_189oq_108 awsui_horizontal-s_18582_189oq_121"
+        class="awsui_root_18582_jftqg_97 awsui_horizontal_18582_jftqg_112 awsui_horizontal-s_18582_jftqg_125"
       >
         <div
-          class="awsui_child_18582_189oq_97"
+          class="awsui_child_18582_jftqg_101"
         >
           <button
-            class="awsui_button_vjswe_qvh5k_101 awsui_variant-normal_vjswe_qvh5k_152 awsui_disabled_vjswe_qvh5k_228"
+            class="awsui_button_vjswe_15u39_105 awsui_variant-normal_vjswe_15u39_156 awsui_disabled_vjswe_15u39_241"
             data-analytics-funnel-value="button:ra:"
+            data-analytics-performance-mark="13-1726870557984-547"
             data-testid="explore-button"
             disabled=""
             type="submit"
           >
             <span
-              class="awsui_content_vjswe_qvh5k_97"
+              class="awsui_content_vjswe_15u39_101 awsui_label_1f1d4_ocied_5"
             >
               Explore
             </span>
           </button>
         </div>
         <div
-          class="awsui_child_18582_189oq_97"
+          class="awsui_child_18582_jftqg_101"
         >
           <button
-            class="awsui_button_vjswe_qvh5k_101 awsui_variant-normal_vjswe_qvh5k_152 awsui_disabled_vjswe_qvh5k_228"
+            class="awsui_button_vjswe_15u39_105 awsui_variant-normal_vjswe_15u39_156 awsui_disabled_vjswe_15u39_241"
             data-analytics-funnel-value="button:rc:"
+            data-analytics-performance-mark="14-1726870557984-823"
             data-testid="clear-button"
             disabled=""
             type="submit"
           >
             <span
-              class="awsui_content_vjswe_qvh5k_97"
+              class="awsui_content_vjswe_15u39_101 awsui_label_1f1d4_ocied_5"
             >
               Clear
             </span>