diff --git a/packages/react-catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap b/packages/react-catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap
index f8a94f89095..4033ee84f46 100644
--- a/packages/react-catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap
+++ b/packages/react-catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap
@@ -65,28 +65,32 @@ exports[`CatalogTile renders properly 1`] = `
             class="catalog-tile-pf-badge-container"
           >
             <span>
-              <span
-                class="catalog-tile-pf-badge"
+              <div
+                style="display: contents;"
               >
-                <svg
-                  aria-hidden="true"
-                  fill="currentColor"
-                  height="1em"
-                  role="img"
-                  style="vertical-align: -0.125em;"
-                  viewBox="0 0 512 512"
-                  width="1em"
-                >
-                  <path
-                    d="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"
-                  />
-                </svg>
                 <span
-                  class="pf-u-screen-reader"
+                  class="catalog-tile-pf-badge"
                 >
-                  Certified
+                  <svg
+                    aria-hidden="true"
+                    fill="currentColor"
+                    height="1em"
+                    role="img"
+                    style="vertical-align: -0.125em;"
+                    viewBox="0 0 512 512"
+                    width="1em"
+                  >
+                    <path
+                      d="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"
+                    />
+                  </svg>
+                  <span
+                    class="pf-u-screen-reader"
+                  >
+                    Certified
+                  </span>
                 </span>
-              </span>
+              </div>
             </span>
             <span>
               <span
@@ -165,52 +169,60 @@ exports[`CatalogTile renders properly 1`] = `
             class="catalog-tile-pf-badge-container"
           >
             <span>
-              <span
-                class="catalog-tile-pf-badge"
+              <div
+                style="display: contents;"
               >
-                <svg
-                  aria-hidden="true"
-                  fill="currentColor"
-                  height="1em"
-                  role="img"
-                  style="vertical-align: -0.125em;"
-                  viewBox="0 0 512 512"
-                  width="1em"
-                >
-                  <path
-                    d="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"
-                  />
-                </svg>
                 <span
-                  class="pf-u-screen-reader"
+                  class="catalog-tile-pf-badge"
                 >
-                  Certified
+                  <svg
+                    aria-hidden="true"
+                    fill="currentColor"
+                    height="1em"
+                    role="img"
+                    style="vertical-align: -0.125em;"
+                    viewBox="0 0 512 512"
+                    width="1em"
+                  >
+                    <path
+                      d="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"
+                    />
+                  </svg>
+                  <span
+                    class="pf-u-screen-reader"
+                  >
+                    Certified
+                  </span>
                 </span>
-              </span>
+              </div>
             </span>
             <span>
-              <span
-                class="catalog-tile-pf-badge"
+              <div
+                style="display: contents;"
               >
-                <svg
-                  aria-hidden="true"
-                  fill="currentColor"
-                  height="1em"
-                  role="img"
-                  style="vertical-align: -0.125em;"
-                  viewBox="0 0 512 512"
-                  width="1em"
-                >
-                  <path
-                    d="M256 8C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 48c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m140.204 130.267l-22.536-22.718c-4.667-4.705-12.265-4.736-16.97-.068L215.346 303.697l-59.792-60.277c-4.667-4.705-12.265-4.736-16.97-.069l-22.719 22.536c-4.705 4.667-4.736 12.265-.068 16.971l90.781 91.516c4.667 4.705 12.265 4.736 16.97.068l172.589-171.204c4.704-4.668 4.734-12.266.067-16.971z"
-                  />
-                </svg>
                 <span
-                  class="pf-u-screen-reader"
+                  class="catalog-tile-pf-badge"
                 >
-                  USDA Approved
+                  <svg
+                    aria-hidden="true"
+                    fill="currentColor"
+                    height="1em"
+                    role="img"
+                    style="vertical-align: -0.125em;"
+                    viewBox="0 0 512 512"
+                    width="1em"
+                  >
+                    <path
+                      d="M256 8C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 48c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m140.204 130.267l-22.536-22.718c-4.667-4.705-12.265-4.736-16.97-.068L215.346 303.697l-59.792-60.277c-4.667-4.705-12.265-4.736-16.97-.069l-22.719 22.536c-4.705 4.667-4.736 12.265-.068 16.971l90.781 91.516c4.667 4.705 12.265 4.736 16.97.068l172.589-171.204c4.704-4.668 4.734-12.266.067-16.971z"
+                    />
+                  </svg>
+                  <span
+                    class="pf-u-screen-reader"
+                  >
+                    USDA Approved
+                  </span>
                 </span>
-              </span>
+              </div>
             </span>
           </div>
         </div>
@@ -266,28 +278,32 @@ exports[`CatalogTile renders properly 1`] = `
             class="catalog-tile-pf-badge-container"
           >
             <span>
-              <span
-                class="catalog-tile-pf-badge"
+              <div
+                style="display: contents;"
               >
-                <svg
-                  aria-hidden="true"
-                  fill="currentColor"
-                  height="1em"
-                  role="img"
-                  style="vertical-align: -0.125em;"
-                  viewBox="0 0 512 512"
-                  width="1em"
-                >
-                  <path
-                    d="M256 8C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 48c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m140.204 130.267l-22.536-22.718c-4.667-4.705-12.265-4.736-16.97-.068L215.346 303.697l-59.792-60.277c-4.667-4.705-12.265-4.736-16.97-.069l-22.719 22.536c-4.705 4.667-4.736 12.265-.068 16.971l90.781 91.516c4.667 4.705 12.265 4.736 16.97.068l172.589-171.204c4.704-4.668 4.734-12.266.067-16.971z"
-                  />
-                </svg>
                 <span
-                  class="pf-u-screen-reader"
+                  class="catalog-tile-pf-badge"
                 >
-                  USDA Approved
+                  <svg
+                    aria-hidden="true"
+                    fill="currentColor"
+                    height="1em"
+                    role="img"
+                    style="vertical-align: -0.125em;"
+                    viewBox="0 0 512 512"
+                    width="1em"
+                  >
+                    <path
+                      d="M256 8C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 48c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m140.204 130.267l-22.536-22.718c-4.667-4.705-12.265-4.736-16.97-.068L215.346 303.697l-59.792-60.277c-4.667-4.705-12.265-4.736-16.97-.069l-22.719 22.536c-4.705 4.667-4.736 12.265-.068 16.971l90.781 91.516c4.667 4.705 12.265 4.736 16.97.068l172.589-171.204c4.704-4.668 4.734-12.266.067-16.971z"
+                    />
+                  </svg>
+                  <span
+                    class="pf-u-screen-reader"
+                  >
+                    USDA Approved
+                  </span>
                 </span>
-              </span>
+              </div>
             </span>
           </div>
         </div>
@@ -340,28 +356,32 @@ exports[`CatalogTile renders properly 1`] = `
             class="catalog-tile-pf-badge-container"
           >
             <span>
-              <span
-                class="catalog-tile-pf-badge"
+              <div
+                style="display: contents;"
               >
-                <svg
-                  aria-hidden="true"
-                  fill="currentColor"
-                  height="1em"
-                  role="img"
-                  style="vertical-align: -0.125em;"
-                  viewBox="0 0 512 512"
-                  width="1em"
-                >
-                  <path
-                    d="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"
-                  />
-                </svg>
                 <span
-                  class="pf-u-screen-reader"
+                  class="catalog-tile-pf-badge"
                 >
-                  Certified
+                  <svg
+                    aria-hidden="true"
+                    fill="currentColor"
+                    height="1em"
+                    role="img"
+                    style="vertical-align: -0.125em;"
+                    viewBox="0 0 512 512"
+                    width="1em"
+                  >
+                    <path
+                      d="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"
+                    />
+                  </svg>
+                  <span
+                    class="pf-u-screen-reader"
+                  >
+                    Certified
+                  </span>
                 </span>
-              </span>
+              </div>
             </span>
           </div>
         </div>
diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
index 62ff4d89587..3edfa6df0dd 100644
--- a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
+++ b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap
@@ -16,75 +16,87 @@ exports[`CodeEditor matches snapshot with all props 1`] = `
         <div
           class="pf-c-code-editor__controls"
         >
-          <button
-            aria-disabled="false"
-            aria-label="Copy code to clipboard"
-            class="pf-c-button pf-m-control"
-            data-ouia-component-id="OUIA-Generated-Button-control-1"
-            data-ouia-component-type="PF4/Button"
-            data-ouia-safe="true"
-            type="button"
+          <div
+            style="display: contents;"
           >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style="vertical-align: -0.125em;"
-              viewBox="0 0 448 512"
-              width="1em"
+            <button
+              aria-disabled="false"
+              aria-label="Copy code to clipboard"
+              class="pf-c-button pf-m-control"
+              data-ouia-component-id="OUIA-Generated-Button-control-1"
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe="true"
+              type="button"
             >
-              <path
-                d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-disabled="false"
-            aria-label="Upload code"
-            class="pf-c-button pf-m-control"
-            data-ouia-component-id="OUIA-Generated-Button-control-2"
-            data-ouia-component-type="PF4/Button"
-            data-ouia-safe="true"
-            type="button"
+              <svg
+                aria-hidden="true"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                style="vertical-align: -0.125em;"
+                viewBox="0 0 448 512"
+                width="1em"
+              >
+                <path
+                  d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
+                />
+              </svg>
+            </button>
+          </div>
+          <div
+            style="display: contents;"
           >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style="vertical-align: -0.125em;"
-              viewBox="0 0 512 512"
-              width="1em"
+            <button
+              aria-disabled="false"
+              aria-label="Upload code"
+              class="pf-c-button pf-m-control"
+              data-ouia-component-id="OUIA-Generated-Button-control-2"
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe="true"
+              type="button"
             >
-              <path
-                d="M296 384h-80c-13.3 0-24-10.7-24-24V192h-87.7c-17.8 0-26.7-21.5-14.1-34.1L242.3 5.7c7.5-7.5 19.8-7.5 27.3 0l152.2 152.2c12.6 12.6 3.7 34.1-14.1 34.1H320v168c0 13.3-10.7 24-24 24zm216-8v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h136v8c0 30.9 25.1 56 56 56h80c30.9 0 56-25.1 56-56v-8h136c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-disabled="false"
-            aria-label="Download code"
-            class="pf-c-button pf-m-control"
-            data-ouia-component-id="OUIA-Generated-Button-control-3"
-            data-ouia-component-type="PF4/Button"
-            data-ouia-safe="true"
-            type="button"
+              <svg
+                aria-hidden="true"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                style="vertical-align: -0.125em;"
+                viewBox="0 0 512 512"
+                width="1em"
+              >
+                <path
+                  d="M296 384h-80c-13.3 0-24-10.7-24-24V192h-87.7c-17.8 0-26.7-21.5-14.1-34.1L242.3 5.7c7.5-7.5 19.8-7.5 27.3 0l152.2 152.2c12.6 12.6 3.7 34.1-14.1 34.1H320v168c0 13.3-10.7 24-24 24zm216-8v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h136v8c0 30.9 25.1 56 56 56h80c30.9 0 56-25.1 56-56v-8h136c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"
+                />
+              </svg>
+            </button>
+          </div>
+          <div
+            style="display: contents;"
           >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style="vertical-align: -0.125em;"
-              viewBox="0 0 512 512"
-              width="1em"
+            <button
+              aria-disabled="false"
+              aria-label="Download code"
+              class="pf-c-button pf-m-control"
+              data-ouia-component-id="OUIA-Generated-Button-control-3"
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe="true"
+              type="button"
             >
-              <path
-                d="M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"
-              />
-            </svg>
-          </button>
+              <svg
+                aria-hidden="true"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                style="vertical-align: -0.125em;"
+                viewBox="0 0 512 512"
+                width="1em"
+              >
+                <path
+                  d="M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"
+                />
+              </svg>
+            </button>
+          </div>
         </div>
         <div
           class="pf-c-code-editor__header-main"
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx
index fbdd6548ce8..54bbc7525f0 100644
--- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx
+++ b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx
@@ -58,8 +58,6 @@ export interface ApplicationLauncherProps extends React.HTMLProps<HTMLDivElement
   favoritesLabel?: string;
   /** ID of toggle */
   toggleId?: string;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
 }
 
 export class ApplicationLauncher extends React.Component<ApplicationLauncherProps> {
@@ -82,8 +80,7 @@ export class ApplicationLauncher extends React.Component<ApplicationLauncherProp
     searchPlaceholderText: 'Filter by name...',
     searchNoResultsText: 'No results found',
     favoritesLabel: 'Favorites',
-    menuAppendTo: 'inline',
-    removeFindDomNode: false
+    menuAppendTo: 'inline'
   };
 
   createSearchBox = () => {
@@ -123,7 +120,6 @@ export class ApplicationLauncher extends React.Component<ApplicationLauncherProp
       favoritesLabel,
       searchNoResultsText,
       menuAppendTo,
-      removeFindDomNode,
       ...props
     } = this.props;
     let renderableItems: React.ReactNode[] = [];
@@ -184,7 +180,6 @@ export class ApplicationLauncher extends React.Component<ApplicationLauncherProp
             className={className}
             aria-label={ariaLabel}
             menuAppendTo={menuAppendTo}
-            removeFindDomNode={removeFindDomNode}
             toggle={
               <DropdownToggle
                 id={toggleId}
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx b/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
index e8ae476019e..bbb07940e19 100644
--- a/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
+++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
@@ -55,16 +55,18 @@ describe('ApplicationLauncher', () => {
 
   test('custom icon', () => {
     const { asFragment } = render(
-      <React.StrictMode>
-        <ApplicationLauncher items={dropdownItems} isOpen toggleIcon={<HelpIcon id="test-icon" />} />
-      </React.StrictMode>
+      <ApplicationLauncher items={dropdownItems} isOpen toggleIcon={<HelpIcon id="test-icon" />} />
     );
     expect(asFragment()).toMatchSnapshot();
   });
 
   test('Renders in strict mode', () => {
     const consoleError = jest.spyOn(console, 'error');
-    const { asFragment } = render(<ApplicationLauncher removeFindDomNode isOpen items={dropdownItems} />);
+    const { asFragment } = render(
+      <React.StrictMode>
+        <ApplicationLauncher isOpen items={dropdownItems} />{' '}
+      </React.StrictMode>
+    );
     expect(consoleError).not.toHaveBeenCalled();
     expect(asFragment()).toMatchSnapshot();
   });
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
index 478ec5517a2..76aba94ee2f 100644
--- a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
+++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = `
       data-ouia-component-id="OUIA-Generated-DropdownToggle-8"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
-      id="pf-dropdown-toggle-id-7"
+      id="pf-dropdown-toggle-id-6"
       type="button"
     >
       <span>
@@ -36,7 +36,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = `
       </span>
     </button>
     <ul
-      aria-labelledby="pf-dropdown-toggle-id-7"
+      aria-labelledby="pf-dropdown-toggle-id-6"
       class="pf-c-app-launcher__menu"
       role="menu"
     >
@@ -46,7 +46,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = `
         <a
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-19"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-14"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -61,7 +61,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = `
         <button
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-20"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-16"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -77,7 +77,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = `
         <a
           aria-disabled="true"
           class="pf-m-disabled pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-21"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-18"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -92,7 +92,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = `
         <button
           aria-disabled="true"
           class="pf-m-disabled pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-22"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-20"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -116,7 +116,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = `
         <a
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-23"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-22"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -143,6 +143,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = `
       </li>
     </ul>
   </nav>
+   
 </DocumentFragment>
 `;
 
@@ -159,7 +160,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
       aria-haspopup="true"
       aria-label="Application launcher"
       class="pf-c-app-launcher__toggle"
-      data-ouia-component-id="OUIA-Generated-DropdownToggle-7"
+      data-ouia-component-id="OUIA-Generated-DropdownToggle-6"
       data-ouia-component-type="PF4/DropdownToggle"
       data-ouia-safe="true"
       id="pf-dropdown-toggle-id-5"
@@ -193,7 +194,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <a
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-8"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-7"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -208,7 +209,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <button
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-10"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-8"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -224,7 +225,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <a
           aria-disabled="true"
           class="pf-m-disabled pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-12"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-9"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -239,7 +240,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <button
           aria-disabled="true"
           class="pf-m-disabled pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-14"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-10"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -263,7 +264,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <a
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-16"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-11"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
@@ -278,7 +279,7 @@ exports[`ApplicationLauncher custom icon 1`] = `
         <button
           aria-disabled="false"
           class="pf-c-app-launcher__menu-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-18"
+          data-ouia-component-id="OUIA-Generated-DropdownItem-12"
           data-ouia-component-type="PF4/DropdownItem"
           data-ouia-safe="true"
           role="menuitem"
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/Generated/__snapshots__/ClipboardCopy.test.tsx.snap b/packages/react-core/src/components/ClipboardCopy/__tests__/Generated/__snapshots__/ClipboardCopy.test.tsx.snap
index e88c25bf8e6..5667fb43e2d 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/Generated/__snapshots__/ClipboardCopy.test.tsx.snap
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/Generated/__snapshots__/ClipboardCopy.test.tsx.snap
@@ -21,31 +21,35 @@ exports[`ClipboardCopy should match snapshot (auto-generated) 1`] = `
         type="text"
         value="[object Object]"
       />
-      <button
-        aria-disabled="false"
-        aria-label="'Copy to clipboard'"
-        aria-labelledby="copy-button-0 text-input-0"
-        class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-1"
-        data-ouia-component-type="PF4/Button"
-        data-ouia-safe="true"
-        id="copy-button-0"
-        type="button"
+      <div
+        style="display: contents;"
       >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 448 512"
-          width="1em"
+        <button
+          aria-disabled="false"
+          aria-label="'Copy to clipboard'"
+          aria-labelledby="copy-button-0 text-input-0"
+          class="pf-c-button pf-m-control"
+          data-ouia-component-id="OUIA-Generated-Button-control-1"
+          data-ouia-component-type="PF4/Button"
+          data-ouia-safe="true"
+          id="copy-button-0"
+          type="button"
         >
-          <path
-            d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
-          />
-        </svg>
-      </button>
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
+            />
+          </svg>
+        </button>
+      </div>
     </div>
   </div>
 </DocumentFragment>
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap
index a736ec271d5..c4f121ead8e 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap
@@ -2,30 +2,34 @@
 
 exports[`copy button render 1`] = `
 <DocumentFragment>
-  <button
-    aria-disabled="false"
-    aria-label="click this button to copy text"
-    aria-labelledby="my-id my-text-id"
-    class="pf-c-button pf-m-control fancy-copy-button"
-    data-ouia-component-id="OUIA-Generated-Button-control-1"
-    data-ouia-component-type="PF4/Button"
-    data-ouia-safe="true"
-    id="my-id"
-    type="button"
+  <div
+    style="display: contents;"
   >
-    <svg
-      aria-hidden="true"
-      fill="currentColor"
-      height="1em"
-      role="img"
-      style="vertical-align: -0.125em;"
-      viewBox="0 0 448 512"
-      width="1em"
+    <button
+      aria-disabled="false"
+      aria-label="click this button to copy text"
+      aria-labelledby="my-id my-text-id"
+      class="pf-c-button pf-m-control fancy-copy-button"
+      data-ouia-component-id="OUIA-Generated-Button-control-1"
+      data-ouia-component-type="PF4/Button"
+      data-ouia-safe="true"
+      id="my-id"
+      type="button"
     >
-      <path
-        d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
-      />
-    </svg>
-  </button>
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="1em"
+        role="img"
+        style="vertical-align: -0.125em;"
+        viewBox="0 0 448 512"
+        width="1em"
+      >
+        <path
+          d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
+        />
+      </svg>
+    </button>
+  </div>
 </DocumentFragment>
 `;
diff --git a/packages/react-core/src/components/ContextSelector/ContextSelector.tsx b/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
index 1526adab6b6..8789969b137 100644
--- a/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
+++ b/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
@@ -65,8 +65,6 @@ export interface ContextSelectorProps extends OUIAProps {
   isFlipEnabled?: boolean;
   /** Id of the context selector */
   id?: string;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
   /** Value to overwrite the randomly generated data-ouia-component-id.*/
   ouiaId?: number | string;
   /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
@@ -94,8 +92,7 @@ export class ContextSelector extends React.Component<ContextSelectorProps, { oui
     footer: null as React.ReactNode,
     isPlain: false,
     isText: false,
-    isFlipEnabled: true,
-    removeFindDomNode: false
+    isFlipEnabled: true
   };
   constructor(props: ContextSelectorProps) {
     super(props);
@@ -137,7 +134,6 @@ export class ContextSelector extends React.Component<ContextSelectorProps, { oui
       disableFocusTrap,
       isFlipEnabled,
       id,
-      removeFindDomNode,
       ...props
     } = this.props;
 
@@ -233,7 +229,6 @@ export class ContextSelector extends React.Component<ContextSelectorProps, { oui
         popper={popperContainer}
         appendTo={menuAppendTo === 'parent' ? getParentElement() : menuAppendTo}
         isVisible={isOpen}
-        removeFindDomNode={removeFindDomNode}
       />
     );
   }
diff --git a/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx b/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx
index 50b1a58f065..d0fcc7fc758 100644
--- a/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx
+++ b/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx
@@ -33,7 +33,7 @@ describe('ContextSelector', () => {
     const consoleError = jest.spyOn(console, 'error');
     const { asFragment } = render(
       <React.StrictMode>
-        <ContextSelector removeFindDomNode isOpen id="render">
+        <ContextSelector isOpen id="render">
           {items}
         </ContextSelector>
       </React.StrictMode>
diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
index 9a4bb7ed87c..7f443f9bb13 100644
--- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
+++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
@@ -7,43 +7,47 @@ exports[`disabled date picker 1`] = `
     style="--pf-c-date-picker__input--c-form-control--width-chars: 10;"
   >
     <div
-      class="pf-c-date-picker__input"
+      style="display: contents;"
     >
       <div
-        class="pf-c-input-group"
+        class="pf-c-date-picker__input"
       >
-        <input
-          aria-invalid="false"
-          aria-label="disabled date picker"
-          class="pf-c-form-control"
-          data-ouia-component-id="OUIA-Generated-TextInputBase-1"
-          data-ouia-component-type="PF4/TextInput"
-          data-ouia-safe="true"
-          disabled=""
-          placeholder="YYYY-MM-DD"
-          type="text"
-          value="2020-11-20"
-        />
-        <button
-          aria-label="Toggle date picker"
-          class="pf-c-button pf-m-control"
-          disabled=""
-          type="button"
+        <div
+          class="pf-c-input-group"
         >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="1em"
-            role="img"
-            style="vertical-align: -0.125em;"
-            viewBox="0 0 448 512"
-            width="1em"
+          <input
+            aria-invalid="false"
+            aria-label="disabled date picker"
+            class="pf-c-form-control"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-1"
+            data-ouia-component-type="PF4/TextInput"
+            data-ouia-safe="true"
+            disabled=""
+            placeholder="YYYY-MM-DD"
+            type="text"
+            value="2020-11-20"
+          />
+          <button
+            aria-label="Toggle date picker"
+            class="pf-c-button pf-m-control"
+            disabled=""
+            type="button"
           >
-            <path
-              d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
-            />
-          </svg>
-        </button>
+            <svg
+              aria-hidden="true"
+              fill="currentColor"
+              height="1em"
+              role="img"
+              style="vertical-align: -0.125em;"
+              viewBox="0 0 448 512"
+              width="1em"
+            >
+              <path
+                d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
+              />
+            </svg>
+          </button>
+        </div>
       </div>
     </div>
   </div>
diff --git a/packages/react-core/src/components/Dropdown/Dropdown.tsx b/packages/react-core/src/components/Dropdown/Dropdown.tsx
index 4685fca9afa..8014f93cb49 100644
--- a/packages/react-core/src/components/Dropdown/Dropdown.tsx
+++ b/packages/react-core/src/components/Dropdown/Dropdown.tsx
@@ -56,8 +56,6 @@ export interface DropdownProps extends React.HTMLProps<HTMLDivElement>, OUIAProp
    * appended inline, e.g. `menuAppendTo="parent"`
    */
   isFlipEnabled?: boolean;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
   /** Value to overwrite the randomly generated data-ouia-component-id.*/
   ouiaId?: number | string;
   /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
@@ -74,7 +72,6 @@ export const Dropdown: React.FunctionComponent<DropdownProps> = ({
   contextProps,
   menuAppendTo = 'inline',
   isFlipEnabled = true,
-  removeFindDomNode = false,
   ...props
 }: DropdownProps) => (
   <DropdownContext.Provider
@@ -100,12 +97,7 @@ export const Dropdown: React.FunctionComponent<DropdownProps> = ({
       ...contextProps
     }}
   >
-    <DropdownWithContext
-      menuAppendTo={menuAppendTo}
-      isFlipEnabled={isFlipEnabled}
-      removeFindDomNode={removeFindDomNode}
-      {...props}
-    />
+    <DropdownWithContext menuAppendTo={menuAppendTo} isFlipEnabled={isFlipEnabled} {...props} />
   </DropdownContext.Provider>
 );
 Dropdown.displayName = 'Dropdown';
diff --git a/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx b/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
index 1cf7ff0638f..29c8600d1bc 100644
--- a/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
@@ -77,7 +77,6 @@ export class DropdownWithContext extends React.Component<DropdownProps & OUIAPro
       autoFocus,
       menuAppendTo,
       isFlipEnabled,
-      removeFindDomNode,
       ...props
     } = this.props;
     const id = toggle.props.id || `pf-dropdown-toggle-id-${DropdownWithContext.currentId++}`;
@@ -174,7 +173,6 @@ export class DropdownWithContext extends React.Component<DropdownProps & OUIAPro
               position={position}
               appendTo={menuAppendTo === 'parent' ? getParentElement() : menuAppendTo}
               isVisible={isOpen}
-              removeFindDomNode={removeFindDomNode}
               popperMatchesTriggerWidth={false}
             />
           );
diff --git a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
index 0a26700b785..77e6fd7abc0 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
+++ b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
@@ -132,7 +132,6 @@ describe('Dropdown', () => {
           isOpen
           dropdownItems={dropdownItems}
           toggle={<DropdownToggle id="Dropdown Toggle">Dropdown</DropdownToggle>}
-          removeFindDomNode
         />
       </React.StrictMode>
     );
diff --git a/packages/react-core/src/components/Nav/NavItem.tsx b/packages/react-core/src/components/Nav/NavItem.tsx
index 3e8c78a3abe..36eae7851dd 100644
--- a/packages/react-core/src/components/Nav/NavItem.tsx
+++ b/packages/react-core/src/components/Nav/NavItem.tsx
@@ -32,8 +32,6 @@ export interface NavItemProps extends Omit<React.HTMLProps<HTMLAnchorElement>, '
   flyout?: React.ReactElement;
   /** Callback when flyout is opened or closed */
   onShowFlyout?: () => void;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
   /** Value to overwrite the randomly generated data-ouia-component-id.*/
   ouiaId?: number | string;
   /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
@@ -55,7 +53,6 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
   onShowFlyout,
   ouiaId,
   ouiaSafe,
-  removeFindDomNode = false,
   ...props
 }: NavItemProps) => {
   const { flyoutRef, setFlyoutRef } = React.useContext(NavContext);
@@ -224,7 +221,6 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
       placement="right-start"
       isVisible={flyoutVisible}
       onDocumentKeyDown={handleFlyout}
-      removeFindDomNode={removeFindDomNode}
     />
   );
 
diff --git a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
index 2c471ccfd54..306266cef77 100644
--- a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
+++ b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
@@ -48,7 +48,7 @@ describe('Nav', () => {
         <Nav className="test-nav-class">
           <NavList className="test-nav-list-class">
             {props.items.map(item => (
-              <NavItem removeFindDomNode to={item.to} key={item.to} className="test-nav-item-class">
+              <NavItem to={item.to} key={item.to} className="test-nav-item-class">
                 {item.label}
               </NavItem>
             ))}
diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
index bf63bacc05f..a26728b5494 100644
--- a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
+++ b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
@@ -43,8 +43,6 @@ export interface OptionsMenuProps extends React.HTMLProps<HTMLDivElement>, OUIAP
    * menuAppendTo={document.getElementById('target')}
    */
   menuAppendTo?: HTMLElement | (() => HTMLElement) | 'inline' | 'parent';
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
   /** Value to overwrite the randomly generated data-ouia-component-id.*/
   ouiaId?: number | string;
   /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
@@ -63,7 +61,6 @@ export const OptionsMenu: React.FunctionComponent<OptionsMenuProps> = ({
   menuAppendTo = 'inline',
   ouiaId,
   ouiaSafe = true,
-  removeFindDomNode = false,
   ...props
 }: OptionsMenuProps) => (
   <DropdownContext.Provider
@@ -91,7 +88,6 @@ export const OptionsMenu: React.FunctionComponent<OptionsMenuProps> = ({
       isGrouped={isGrouped}
       toggle={toggle}
       menuAppendTo={menuAppendTo}
-      removeFindDomNode={removeFindDomNode}
       {...props}
     />
   </DropdownContext.Provider>
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/OptionsMenu.test.tsx b/packages/react-core/src/components/OptionsMenu/__tests__/OptionsMenu.test.tsx
index b45fd5b2d88..4d8a346aa31 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/OptionsMenu.test.tsx
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/OptionsMenu.test.tsx
@@ -36,7 +36,6 @@ describe('optionsMenu', () => {
     const { asFragment } = render(
       <React.StrictMode>
         <OptionsMenu
-          removeFindDomNode
           id="regular"
           menuItems={menuItems}
           isOpen
diff --git a/packages/react-core/src/components/Popover/Popover.tsx b/packages/react-core/src/components/Popover/Popover.tsx
index 4ee492261e2..790eed4b44d 100644
--- a/packages/react-core/src/components/Popover/Popover.tsx
+++ b/packages/react-core/src/components/Popover/Popover.tsx
@@ -190,8 +190,6 @@ export interface PopoverProps {
    * Usage: <Popover reference={() => document.getElementById('reference-element')} />
    */
   reference?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
   /**
    * Callback function that is only invoked when isVisible is also controlled. Called when the
    * popover close button is clicked, the enter key was used on it, or the escape key is used.
@@ -267,7 +265,6 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
   reference,
   hasNoPadding = false,
   hasAutoWidth = false,
-  removeFindDomNode = false,
   ...rest
 }: PopoverProps) => {
   // could make this a prop in the future (true | false | 'toggle')
@@ -475,7 +472,6 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
         enableFlip={enableFlip}
         zIndex={zIndex}
         flipBehavior={flipBehavior}
-        removeFindDomNode={removeFindDomNode}
       />
     </PopoverContext.Provider>
   );
diff --git a/packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap b/packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap
index 111dd2d55b9..85d0ac8b14c 100644
--- a/packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap
+++ b/packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap
@@ -2,41 +2,59 @@
 
 exports[`popover can close from content (uncontrolled) 1`] = `
 <DocumentFragment>
-  <button
-    id="uncontrolled-toggle"
+  <div
+    style="display: contents;"
   >
-    Toggle Popover
-  </button>
+    <button
+      id="uncontrolled-toggle"
+    >
+      Toggle Popover
+    </button>
+  </div>
 </DocumentFragment>
 `;
 
 exports[`popover can have a custom minimum width 1`] = `
 <DocumentFragment>
-  <div>
-    Toggle Popover
+  <div
+    style="display: contents;"
+  >
+    <div>
+      Toggle Popover
+    </div>
   </div>
 </DocumentFragment>
 `;
 
 exports[`popover can specify position as object value 1`] = `
 <DocumentFragment>
-  <div>
-    Toggle Popover
+  <div
+    style="display: contents;"
+  >
+    <div>
+      Toggle Popover
+    </div>
   </div>
 </DocumentFragment>
 `;
 
 exports[`popover renders close-button, header and body 1`] = `
 <DocumentFragment>
-  <div>
-    Toggle Popover
+  <div
+    style="display: contents;"
+  >
+    <div>
+      Toggle Popover
+    </div>
   </div>
 </DocumentFragment>
 `;
 
 exports[`popover renders in strict mode 1`] = `
 <DocumentFragment>
-  <div>
+  <div
+    style="display: contents;"
+  >
     <div>
       Toggle Popover
     </div>
diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx
index 28a05a42790..ede8bd987c3 100644
--- a/packages/react-core/src/components/SearchInput/SearchInput.tsx
+++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx
@@ -117,8 +117,6 @@ export interface SearchInputProps extends Omit<React.HTMLProps<HTMLDivElement>,
   placeholder?: string;
   /** Accessible label for the button to navigate to previous result. */
   previousNavigationButtonAriaLabel?: string;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
   /** Label for the button which resets the advanced search form and clears the search input. */
   resetButtonLabel?: string;
   /** The number of search results returned. Either a total number of results,
@@ -159,7 +157,6 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
   submitSearchButtonLabel = 'Search',
   isDisabled = false,
   appendTo,
-  removeFindDomNode = false,
   type = 'text',
   ...props
 }: SearchInputProps) => {
@@ -415,7 +412,6 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
             isVisible={isSearchMenuOpen}
             enableFlip={true}
             appendTo={() => appendTo || searchInputRef.current}
-            removeFindDomNode={removeFindDomNode}
           />
         </div>
       );
diff --git a/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx b/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
index a1e7d9e94cd..c7e8dbc304a 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
+++ b/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
@@ -49,7 +49,6 @@ describe('SearchInput', () => {
           onChange={props.onChange}
           onSearch={props.onSearch}
           onClear={props.onClear}
-          removeFindDomNode
         />
       </React.StrictMode>
     );
diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
index 478872de33e..7e7a837fe54 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
+++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
@@ -6,19 +6,56 @@ exports[`SearchInput advanced search 1`] = `
     class=""
   >
     <div
-      class="pf-c-input-group"
+      style="display: contents;"
     >
       <div
-        class="pf-c-text-input-group"
+        class="pf-c-input-group"
       >
         <div
-          class="pf-c-text-input-group__main pf-m-icon"
+          class="pf-c-text-input-group"
         >
-          <span
-            class="pf-c-text-input-group__text"
+          <div
+            class="pf-c-text-input-group__main pf-m-icon"
           >
             <span
-              class="pf-c-text-input-group__icon"
+              class="pf-c-text-input-group__text"
+            >
+              <span
+                class="pf-c-text-input-group__icon"
+              >
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 512 512"
+                  width="1em"
+                >
+                  <path
+                    d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                  />
+                </svg>
+              </span>
+              <input
+                aria-label="Search input"
+                class="pf-c-text-input-group__text-input"
+                type="text"
+                value="username:player firstname:john"
+              />
+            </span>
+          </div>
+          <div
+            class="pf-c-text-input-group__utilities"
+          >
+            <button
+              aria-disabled="false"
+              aria-label="Reset"
+              class="pf-c-button pf-m-plain"
+              data-ouia-component-id="OUIA-Generated-Button-plain-17"
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe="true"
+              type="button"
             >
               <svg
                 aria-hidden="true"
@@ -26,97 +63,64 @@ exports[`SearchInput advanced search 1`] = `
                 height="1em"
                 role="img"
                 style="vertical-align: -0.125em;"
-                viewBox="0 0 512 512"
+                viewBox="0 0 352 512"
                 width="1em"
               >
                 <path
-                  d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                  d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
                 />
               </svg>
-            </span>
-            <input
-              aria-label="Search input"
-              class="pf-c-text-input-group__text-input"
-              type="text"
-              value="username:player firstname:john"
-            />
-          </span>
+            </button>
+          </div>
         </div>
-        <div
-          class="pf-c-text-input-group__utilities"
+        <button
+          aria-disabled="false"
+          aria-expanded="false"
+          aria-label="Open advanced search"
+          class="pf-c-button pf-m-control"
+          data-ouia-component-id="OUIA-Generated-Button-control-10"
+          data-ouia-component-type="PF4/Button"
+          data-ouia-safe="true"
+          type="button"
         >
-          <button
-            aria-disabled="false"
-            aria-label="Reset"
-            class="pf-c-button pf-m-plain"
-            data-ouia-component-id="OUIA-Generated-Button-plain-17"
-            data-ouia-component-type="PF4/Button"
-            data-ouia-safe="true"
-            type="button"
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 320 512"
+            width="1em"
           >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style="vertical-align: -0.125em;"
-              viewBox="0 0 352 512"
-              width="1em"
-            >
-              <path
-                d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-label="Open advanced search"
-        class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-10"
-        data-ouia-component-type="PF4/Button"
-        data-ouia-safe="true"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 320 512"
-          width="1em"
-        >
-          <path
-            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-          />
-        </svg>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-label="Search"
-        class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-11"
-        data-ouia-component-type="PF4/Button"
-        data-ouia-safe="true"
-        type="submit"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 448 512"
-          width="1em"
+            <path
+              d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+            />
+          </svg>
+        </button>
+        <button
+          aria-disabled="false"
+          aria-label="Search"
+          class="pf-c-button pf-m-control"
+          data-ouia-component-id="OUIA-Generated-Button-control-11"
+          data-ouia-component-type="PF4/Button"
+          data-ouia-safe="true"
+          type="submit"
         >
-          <path
-            d="M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z"
-          />
-        </svg>
-      </button>
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z"
+            />
+          </svg>
+        </button>
+      </div>
     </div>
   </div>
 </DocumentFragment>
@@ -129,19 +133,56 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
     data-testid="test-id"
   >
     <div
-      class="pf-c-input-group"
+      style="display: contents;"
     >
       <div
-        class="pf-c-text-input-group"
+        class="pf-c-input-group"
       >
         <div
-          class="pf-c-text-input-group__main pf-m-icon"
+          class="pf-c-text-input-group"
         >
-          <span
-            class="pf-c-text-input-group__text"
+          <div
+            class="pf-c-text-input-group__main pf-m-icon"
           >
             <span
-              class="pf-c-text-input-group__icon"
+              class="pf-c-text-input-group__text"
+            >
+              <span
+                class="pf-c-text-input-group__icon"
+              >
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 512 512"
+                  width="1em"
+                >
+                  <path
+                    d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                  />
+                </svg>
+              </span>
+              <input
+                aria-label="Search input"
+                class="pf-c-text-input-group__text-input"
+                type="text"
+                value="username:player firstname:john"
+              />
+            </span>
+          </div>
+          <div
+            class="pf-c-text-input-group__utilities"
+          >
+            <button
+              aria-disabled="false"
+              aria-label="Reset"
+              class="pf-c-button pf-m-plain"
+              data-ouia-component-id="OUIA-Generated-Button-plain-18"
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe="true"
+              type="button"
             >
               <svg
                 aria-hidden="true"
@@ -149,285 +190,256 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
                 height="1em"
                 role="img"
                 style="vertical-align: -0.125em;"
-                viewBox="0 0 512 512"
+                viewBox="0 0 352 512"
                 width="1em"
               >
                 <path
-                  d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                  d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
                 />
               </svg>
-            </span>
-            <input
-              aria-label="Search input"
-              class="pf-c-text-input-group__text-input"
-              type="text"
-              value="username:player firstname:john"
-            />
-          </span>
+            </button>
+          </div>
         </div>
-        <div
-          class="pf-c-text-input-group__utilities"
+        <button
+          aria-disabled="false"
+          aria-expanded="true"
+          aria-label="Open advanced search"
+          class="pf-c-button pf-m-control pf-m-expanded"
+          data-ouia-component-id="OUIA-Generated-Button-control-12"
+          data-ouia-component-type="PF4/Button"
+          data-ouia-safe="true"
+          type="button"
         >
-          <button
-            aria-disabled="false"
-            aria-label="Reset"
-            class="pf-c-button pf-m-plain"
-            data-ouia-component-id="OUIA-Generated-Button-plain-18"
-            data-ouia-component-type="PF4/Button"
-            data-ouia-safe="true"
-            type="button"
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 320 512"
+            width="1em"
           >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style="vertical-align: -0.125em;"
-              viewBox="0 0 352 512"
-              width="1em"
-            >
-              <path
-                d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-      <button
-        aria-disabled="false"
-        aria-expanded="true"
-        aria-label="Open advanced search"
-        class="pf-c-button pf-m-control pf-m-expanded"
-        data-ouia-component-id="OUIA-Generated-Button-control-12"
-        data-ouia-component-type="PF4/Button"
-        data-ouia-safe="true"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 320 512"
-          width="1em"
-        >
-          <path
-            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-          />
-        </svg>
-      </button>
-      <button
-        aria-disabled="false"
-        aria-label="Search"
-        class="pf-c-button pf-m-control"
-        data-ouia-component-id="OUIA-Generated-Button-control-13"
-        data-ouia-component-type="PF4/Button"
-        data-ouia-safe="true"
-        type="submit"
-      >
-        <svg
-          aria-hidden="true"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          style="vertical-align: -0.125em;"
-          viewBox="0 0 448 512"
-          width="1em"
+            <path
+              d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+            />
+          </svg>
+        </button>
+        <button
+          aria-disabled="false"
+          aria-label="Search"
+          class="pf-c-button pf-m-control"
+          data-ouia-component-id="OUIA-Generated-Button-control-13"
+          data-ouia-component-type="PF4/Button"
+          data-ouia-safe="true"
+          type="submit"
         >
-          <path
-            d="M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z"
-          />
-        </svg>
-      </button>
+          <svg
+            aria-hidden="true"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            style="vertical-align: -0.125em;"
+            viewBox="0 0 448 512"
+            width="1em"
+          >
+            <path
+              d="M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z"
+            />
+          </svg>
+        </button>
+      </div>
     </div>
     <div
-      class=""
-      data-popper-escaped="true"
-      data-popper-placement="bottom-start"
-      data-popper-reference-hidden="true"
-      style="position: absolute; top: 0px; left: 0px; transform: translate(0px, 0px); width: 0px; z-index: 9999;"
+      style="display: contents;"
     >
       <div
-        class="pf-c-panel pf-m-raised"
+        class=""
+        data-popper-escaped="true"
+        data-popper-placement="bottom-start"
+        data-popper-reference-hidden="true"
+        style="position: absolute; top: 0px; left: 0px; transform: translate(0px, 0px); width: 0px; z-index: 9999;"
       >
         <div
-          class="pf-c-panel__main"
+          class="pf-c-panel pf-m-raised"
         >
           <div
-            class="pf-c-panel__main-body"
+            class="pf-c-panel__main"
           >
-            <form
-              class="pf-c-form"
-              novalidate=""
+            <div
+              class="pf-c-panel__main-body"
             >
-              <div
-                class="pf-c-form__group"
+              <form
+                class="pf-c-form"
+                novalidate=""
               >
                 <div
-                  class="pf-c-form__group-label"
+                  class="pf-c-form__group"
                 >
-                  <label
-                    class="pf-c-form__label"
-                    for="username_0"
+                  <div
+                    class="pf-c-form__group-label"
                   >
-                    <span
-                      class="pf-c-form__label-text"
+                    <label
+                      class="pf-c-form__label"
+                      for="username_0"
                     >
-                      Username
-                    </span>
-                  </label>
-                   
-                </div>
-                <div
-                  class="pf-c-form__group-control"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="pf-c-form-control"
-                    data-ouia-component-id="OUIA-Generated-TextInputBase-1"
-                    data-ouia-component-type="PF4/TextInput"
-                    data-ouia-safe="true"
-                    id="username_0"
-                    type="text"
-                    value="player"
-                  />
-                </div>
-              </div>
-              <div
-                class="pf-c-form__group"
-              >
-                <div
-                  class="pf-c-form__group-label"
-                >
-                  <label
-                    class="pf-c-form__label"
-                    for="firstname_1"
+                      <span
+                        class="pf-c-form__label-text"
+                      >
+                        Username
+                      </span>
+                    </label>
+                     
+                  </div>
+                  <div
+                    class="pf-c-form__group-control"
                   >
-                    <span
-                      class="pf-c-form__label-text"
-                    >
-                      First name
-                    </span>
-                  </label>
-                   
-                </div>
-                <div
-                  class="pf-c-form__group-control"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="pf-c-form-control"
-                    data-ouia-component-id="OUIA-Generated-TextInputBase-2"
-                    data-ouia-component-type="PF4/TextInput"
-                    data-ouia-safe="true"
-                    id="firstname_1"
-                    type="text"
-                    value="john"
-                  />
+                    <input
+                      aria-invalid="false"
+                      class="pf-c-form-control"
+                      data-ouia-component-id="OUIA-Generated-TextInputBase-1"
+                      data-ouia-component-type="PF4/TextInput"
+                      data-ouia-safe="true"
+                      id="username_0"
+                      type="text"
+                      value="player"
+                    />
+                  </div>
                 </div>
-              </div>
-              <div
-                class="pf-c-form__group"
-              >
                 <div
-                  class="pf-c-form__group-label"
+                  class="pf-c-form__group"
                 >
-                  <label
-                    class="pf-c-form__label"
-                    for="pf-random-id-2"
+                  <div
+                    class="pf-c-form__group-label"
                   >
-                    <span
-                      class="pf-c-form__label-text"
+                    <label
+                      class="pf-c-form__label"
+                      for="firstname_1"
                     >
-                      Has words
-                    </span>
-                  </label>
-                   
-                </div>
-                <div
-                  class="pf-c-form__group-control"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="pf-c-form-control"
-                    data-ouia-component-id="OUIA-Generated-TextInputBase-3"
-                    data-ouia-component-type="PF4/TextInput"
-                    data-ouia-safe="true"
-                    id="pf-random-id-2"
-                    type="text"
-                    value=""
-                  />
+                      <span
+                        class="pf-c-form__label-text"
+                      >
+                        First name
+                      </span>
+                    </label>
+                     
+                  </div>
+                  <div
+                    class="pf-c-form__group-control"
+                  >
+                    <input
+                      aria-invalid="false"
+                      class="pf-c-form-control"
+                      data-ouia-component-id="OUIA-Generated-TextInputBase-2"
+                      data-ouia-component-type="PF4/TextInput"
+                      data-ouia-safe="true"
+                      id="firstname_1"
+                      type="text"
+                      value="john"
+                    />
+                  </div>
                 </div>
-              </div>
-              <div
-                class="pf-c-form__group"
-              >
                 <div
-                  class="pf-c-form__group-control"
+                  class="pf-c-form__group"
                 >
-                  <button
-                    aria-disabled="false"
-                    class="pf-c-button pf-m-link pf-m-inline"
-                    data-ouia-component-id="OUIA-Generated-Button-link-1"
-                    data-ouia-component-type="PF4/Button"
-                    data-ouia-safe="true"
-                    type="button"
+                  <div
+                    class="pf-c-form__group-label"
                   >
-                    Link
-                    <span
-                      class="pf-c-button__icon pf-m-end"
+                    <label
+                      class="pf-c-form__label"
+                      for="pf-random-id-2"
                     >
-                      <svg
-                        aria-hidden="true"
-                        fill="currentColor"
-                        height="1em"
-                        role="img"
-                        style="vertical-align: -0.125em;"
-                        viewBox="0 0 448 512"
-                        width="1em"
+                      <span
+                        class="pf-c-form__label-text"
                       >
-                        <path
-                          d="M448 80v352c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V80c0-26.51 21.49-48 48-48h352c26.51 0 48 21.49 48 48zm-88 16H248.029c-21.313 0-32.08 25.861-16.971 40.971l31.984 31.987L67.515 364.485c-4.686 4.686-4.686 12.284 0 16.971l31.029 31.029c4.687 4.686 12.285 4.686 16.971 0l195.526-195.526 31.988 31.991C358.058 263.977 384 253.425 384 231.979V120c0-13.255-10.745-24-24-24z"
-                        />
-                      </svg>
-                    </span>
-                  </button>
+                        Has words
+                      </span>
+                    </label>
+                     
+                  </div>
+                  <div
+                    class="pf-c-form__group-control"
+                  >
+                    <input
+                      aria-invalid="false"
+                      class="pf-c-form-control"
+                      data-ouia-component-id="OUIA-Generated-TextInputBase-3"
+                      data-ouia-component-type="PF4/TextInput"
+                      data-ouia-safe="true"
+                      id="pf-random-id-2"
+                      type="text"
+                      value=""
+                    />
+                  </div>
                 </div>
-              </div>
-              <div
-                class="pf-c-form__group pf-m-action"
-              >
                 <div
-                  class="pf-c-form__group-control"
+                  class="pf-c-form__group"
                 >
                   <div
-                    class="pf-c-form__actions"
+                    class="pf-c-form__group-control"
                   >
                     <button
                       aria-disabled="false"
-                      class="pf-c-button pf-m-primary"
-                      data-ouia-component-id="OUIA-Generated-Button-primary-1"
+                      class="pf-c-button pf-m-link pf-m-inline"
+                      data-ouia-component-id="OUIA-Generated-Button-link-1"
                       data-ouia-component-type="PF4/Button"
                       data-ouia-safe="true"
-                      type="submit"
+                      type="button"
                     >
-                      Search
+                      Link
+                      <span
+                        class="pf-c-button__icon pf-m-end"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          fill="currentColor"
+                          height="1em"
+                          role="img"
+                          style="vertical-align: -0.125em;"
+                          viewBox="0 0 448 512"
+                          width="1em"
+                        >
+                          <path
+                            d="M448 80v352c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V80c0-26.51 21.49-48 48-48h352c26.51 0 48 21.49 48 48zm-88 16H248.029c-21.313 0-32.08 25.861-16.971 40.971l31.984 31.987L67.515 364.485c-4.686 4.686-4.686 12.284 0 16.971l31.029 31.029c4.687 4.686 12.285 4.686 16.971 0l195.526-195.526 31.988 31.991C358.058 263.977 384 253.425 384 231.979V120c0-13.255-10.745-24-24-24z"
+                          />
+                        </svg>
+                      </span>
                     </button>
-                    <button
-                      aria-disabled="false"
-                      class="pf-c-button pf-m-link"
-                      data-ouia-component-id="OUIA-Generated-Button-link-2"
-                      data-ouia-component-type="PF4/Button"
-                      data-ouia-safe="true"
-                      type="reset"
+                  </div>
+                </div>
+                <div
+                  class="pf-c-form__group pf-m-action"
+                >
+                  <div
+                    class="pf-c-form__group-control"
+                  >
+                    <div
+                      class="pf-c-form__actions"
                     >
-                      Reset
-                    </button>
+                      <button
+                        aria-disabled="false"
+                        class="pf-c-button pf-m-primary"
+                        data-ouia-component-id="OUIA-Generated-Button-primary-1"
+                        data-ouia-component-type="PF4/Button"
+                        data-ouia-safe="true"
+                        type="submit"
+                      >
+                        Search
+                      </button>
+                      <button
+                        aria-disabled="false"
+                        class="pf-c-button pf-m-link"
+                        data-ouia-component-id="OUIA-Generated-Button-link-2"
+                        data-ouia-component-type="PF4/Button"
+                        data-ouia-safe="true"
+                        type="reset"
+                      >
+                        Reset
+                      </button>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </form>
+              </form>
+            </div>
           </div>
         </div>
       </div>
@@ -441,7 +453,9 @@ exports[`SearchInput renders search input in strict mode 1`] = `
   <div
     class=""
   >
-    <div>
+    <div
+      style="display: contents;"
+    >
       <div
         class="pf-c-input-group"
       >
diff --git a/packages/react-core/src/components/Select/Select.tsx b/packages/react-core/src/components/Select/Select.tsx
index fc8393ac1db..ca2ce1def12 100644
--- a/packages/react-core/src/components/Select/Select.tsx
+++ b/packages/react-core/src/components/Select/Select.tsx
@@ -183,8 +183,6 @@ export interface SelectProps
    * appended inline, e.g. `menuAppendTo="parent"`
    */
   isFlipEnabled?: boolean;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
   /** Value to overwrite the randomly generated data-ouia-component-id.*/
   ouiaId?: number | string;
   /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
@@ -265,8 +263,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
     isInputFilterPersisted: false,
     isCreateSelectOptionObject: false,
     shouldResetOnSelect: true,
-    isFlipEnabled: true,
-    removeFindDomNode: false
+    isFlipEnabled: true
   };
 
   state: SelectState = {
@@ -1032,7 +1029,6 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
       isCreateOptionOnTop,
       shouldResetOnSelect,
       isFlipEnabled,
-      removeFindDomNode,
       ...props
     } = this.props;
     const {
@@ -1476,7 +1472,6 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
                 direction={direction}
                 appendTo={menuAppendTo === 'parent' ? getParentElement() : menuAppendTo}
                 isVisible={isOpen}
-                removeFindDomNode={removeFindDomNode}
               />
             )}
           </SelectContext.Provider>
diff --git a/packages/react-core/src/components/Select/__tests__/Select.test.tsx b/packages/react-core/src/components/Select/__tests__/Select.test.tsx
index 1309ee434fa..b8d1d991176 100644
--- a/packages/react-core/src/components/Select/__tests__/Select.test.tsx
+++ b/packages/react-core/src/components/Select/__tests__/Select.test.tsx
@@ -86,14 +86,7 @@ describe('Select', () => {
       const consoleError = jest.spyOn(console, 'error');
       const { asFragment } = render(
         <React.StrictMode>
-          <Select
-            removeFindDomNode
-            variant={SelectVariant.single}
-            onSelect={jest.fn()}
-            onToggle={jest.fn()}
-            isOpen
-            ouiaId="test-id"
-          >
+          <Select variant={SelectVariant.single} onSelect={jest.fn()} onToggle={jest.fn()} isOpen ouiaId="test-id">
             {selectOptions}
           </Select>
         </React.StrictMode>
@@ -591,4 +584,4 @@ test('prepends create option to list of options if isCreateOptionOnTop flag is s
 
   const createOption = screen.getAllByRole('option')[0];
   expect(createOption).toHaveTextContent('Create "m"');
-});
\ No newline at end of file
+});
diff --git a/packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap b/packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap
index ee3e42150d9..e360ae58742 100644
--- a/packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap
+++ b/packages/react-core/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap
@@ -639,16 +639,20 @@ exports[`slider renders slider with tooltip on thumb 1`] = `
         </div>
       </div>
       <div
-        aria-disabled="false"
-        aria-label="Value"
-        aria-valuemax="100"
-        aria-valuemin="0"
-        aria-valuenow="50"
-        aria-valuetext="50"
-        class="pf-c-slider__thumb"
-        role="slider"
-        tabindex="0"
-      />
+        style="display: contents;"
+      >
+        <div
+          aria-disabled="false"
+          aria-label="Value"
+          aria-valuemax="100"
+          aria-valuemin="0"
+          aria-valuenow="50"
+          aria-valuetext="50"
+          class="pf-c-slider__thumb"
+          role="slider"
+          tabindex="0"
+        />
+      </div>
     </div>
   </div>
 </DocumentFragment>
diff --git a/packages/react-core/src/components/Tabs/OverflowTab.tsx b/packages/react-core/src/components/Tabs/OverflowTab.tsx
index faf696d6979..0d715ff4feb 100644
--- a/packages/react-core/src/components/Tabs/OverflowTab.tsx
+++ b/packages/react-core/src/components/Tabs/OverflowTab.tsx
@@ -19,8 +19,6 @@ export interface OverflowTabProps extends React.HTMLProps<HTMLLIElement> {
   defaultTitleText?: string;
   /** The aria label applied to the button which toggles the tab overflow menu */
   toggleAriaLabel?: string;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
 }
 
 export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
@@ -29,7 +27,6 @@ export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
   showTabCount,
   defaultTitleText = 'More',
   toggleAriaLabel,
-  removeFindDomNode = false,
   ...props
 }: OverflowTabProps) => {
   const menuRef = React.useRef<HTMLDivElement>();
@@ -132,14 +129,17 @@ export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
   );
 
   return (
-    <Popper
-      trigger={overflowTab}
-      popper={overflowMenu}
-      isVisible={isExpanded}
-      popperMatchesTriggerWidth={false}
-      appendTo={overflowLIRef.current}
-      removeFindDomNode={removeFindDomNode}
-    />
+    <React.Fragment>
+      {overflowTab}
+      <Popper
+        reference={overflowTabRef}
+        popper={overflowMenu}
+        popperRef={menuRef}
+        isVisible={isExpanded}
+        popperMatchesTriggerWidth={false}
+        appendTo={overflowLIRef.current}
+      />
+    </React.Fragment>
   );
 };
 
diff --git a/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx b/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
index 5174344c00e..5b3f748cb68 100644
--- a/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
@@ -183,7 +183,6 @@ test('Renders tabs passed via overflowingTabs when expanded in strict mode', asy
   const { asFragment } = render(
     <React.StrictMode>
       <OverflowTab
-        removeFindDomNode
         overflowingTabs={[
           { title: 'Tab one', eventKey: 1 },
           { title: 'Tab two', eventKey: 2 }
diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap
index 121967a487a..c5c13b9e85e 100644
--- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap
+++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap
@@ -2,48 +2,47 @@
 
 exports[`Matches snapshot when expanded 1`] = `
 <DocumentFragment>
+  <li
+    class="pf-c-tabs__item pf-m-overflow pf-m-current"
+    role="presentation"
+  >
+    <button
+      aria-expanded="true"
+      aria-haspopup="menu"
+      class="pf-c-tabs__link pf-m-expanded"
+      role="tab"
+      type="button"
+    >
+      <span
+        class="pf-c-tabs__item-text"
+      >
+        Tab one
+      </span>
+      <span
+        class="pf-c-tabs__link-toggle-icon"
+      >
+        <svg
+          aria-hidden="true"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          style="vertical-align: -0.125em;"
+          viewBox="0 0 256 512"
+          width="1em"
+        >
+          <path
+            d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
+          />
+        </svg>
+      </span>
+    </button>
+  </li>
   <div
     data-testid="popper-mock"
   >
     <div
       data-testid="trigger"
-    >
-      <li
-        class="pf-c-tabs__item pf-m-overflow pf-m-current"
-        role="presentation"
-      >
-        <button
-          aria-expanded="true"
-          aria-haspopup="menu"
-          class="pf-c-tabs__link pf-m-expanded"
-          role="tab"
-          type="button"
-        >
-          <span
-            class="pf-c-tabs__item-text"
-          >
-            Tab one
-          </span>
-          <span
-            class="pf-c-tabs__link-toggle-icon"
-          >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style="vertical-align: -0.125em;"
-              viewBox="0 0 256 512"
-              width="1em"
-            >
-              <path
-                d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-              />
-            </svg>
-          </span>
-        </button>
-      </li>
-    </div>
+    />
     <div
       data-testid="popper"
     >
@@ -91,48 +90,47 @@ exports[`Matches snapshot when expanded 1`] = `
 
 exports[`Renders tabs passed via overflowingTabs when expanded in strict mode 1`] = `
 <DocumentFragment>
+  <li
+    class="pf-c-tabs__item pf-m-overflow"
+    role="presentation"
+  >
+    <button
+      aria-expanded="true"
+      aria-haspopup="menu"
+      class="pf-c-tabs__link pf-m-expanded"
+      role="tab"
+      type="button"
+    >
+      <span
+        class="pf-c-tabs__item-text"
+      >
+        More
+      </span>
+      <span
+        class="pf-c-tabs__link-toggle-icon"
+      >
+        <svg
+          aria-hidden="true"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          style="vertical-align: -0.125em;"
+          viewBox="0 0 256 512"
+          width="1em"
+        >
+          <path
+            d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
+          />
+        </svg>
+      </span>
+    </button>
+  </li>
   <div
     data-testid="popper-mock"
   >
     <div
       data-testid="trigger"
-    >
-      <li
-        class="pf-c-tabs__item pf-m-overflow"
-        role="presentation"
-      >
-        <button
-          aria-expanded="true"
-          aria-haspopup="menu"
-          class="pf-c-tabs__link pf-m-expanded"
-          role="tab"
-          type="button"
-        >
-          <span
-            class="pf-c-tabs__item-text"
-          >
-            More
-          </span>
-          <span
-            class="pf-c-tabs__link-toggle-icon"
-          >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style="vertical-align: -0.125em;"
-              viewBox="0 0 256 512"
-              width="1em"
-            >
-              <path
-                d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-              />
-            </svg>
-          </span>
-        </button>
-      </li>
-    </div>
+    />
     <div
       data-testid="popper"
     >
diff --git a/packages/react-core/src/components/TimePicker/TimePicker.tsx b/packages/react-core/src/components/TimePicker/TimePicker.tsx
index 3983310965b..ea83d55ae75 100644
--- a/packages/react-core/src/components/TimePicker/TimePicker.tsx
+++ b/packages/react-core/src/components/TimePicker/TimePicker.tsx
@@ -71,8 +71,6 @@ export interface TimePickerProps
   isOpen?: boolean;
   /** Handler invoked each time the open state of time picker updates */
   setIsOpen?: (isOpen?: boolean) => void;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
 }
 
 interface TimePickerState {
@@ -110,8 +108,7 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
     minTime: '',
     maxTime: '',
     isOpen: false,
-    setIsOpen: () => {},
-    removeFindDomNode: false
+    setIsOpen: () => {}
   };
 
   constructor(props: TimePickerProps) {
@@ -444,7 +441,6 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
       maxTime,
       includeSeconds,
       /* eslint-enable @typescript-eslint/no-unused-vars */
-      removeFindDomNode,
       ...props
     } = this.props;
     const { timeState, isTimeOptionsOpen, isInvalid, minTimeState, maxTimeState } = this.state;
@@ -518,7 +514,6 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
                   trigger={textInput}
                   popper={menuContainer}
                   isVisible={isTimeOptionsOpen}
-                  removeFindDomNode={removeFindDomNode}
                 />
               </div>
             </div>
diff --git a/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx b/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
index 94b1fe34838..9087f63c91a 100644
--- a/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
+++ b/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
@@ -14,7 +14,7 @@ describe('TimePicker', () => {
     const consoleError = jest.spyOn(console, 'error');
     const { asFragment } = render(
       <React.StrictMode>
-        <TimePicker removeFindDomNode value={'00:00'} validateTime={validateTime} aria-label="time picker" />
+        <TimePicker value={'00:00'} validateTime={validateTime} aria-label="time picker" />
       </React.StrictMode>
     );
     expect(consoleError).not.toHaveBeenCalled();
diff --git a/packages/react-core/src/components/Tooltip/Tooltip.tsx b/packages/react-core/src/components/Tooltip/Tooltip.tsx
index 8fe2c413df8..816bf24a63c 100644
--- a/packages/react-core/src/components/Tooltip/Tooltip.tsx
+++ b/packages/react-core/src/components/Tooltip/Tooltip.tsx
@@ -133,8 +133,6 @@ export interface TooltipProps extends Omit<React.HTMLProps<HTMLDivElement>, 'con
   id?: string;
   /** CSS fade transition animation duration */
   animationDuration?: number;
-  /** @beta Opt-in for updated popper that does not use findDOMNode. */
-  removeFindDomNode?: boolean;
 }
 
 // id for associating trigger with the content aria-describedby or aria-labelledby
@@ -162,7 +160,6 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   animationDuration = 300,
   reference,
   'aria-live': ariaLive = reference ? 'polite' : 'off',
-  removeFindDomNode = false,
   onTooltipHidden = () => {},
   ...rest
 }: TooltipProps) => {
@@ -338,7 +335,6 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
       enableFlip={enableFlip}
       zIndex={zIndex}
       flipBehavior={flipBehavior}
-      removeFindDomNode={removeFindDomNode}
     />
   );
 };
diff --git a/packages/react-core/src/components/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap b/packages/react-core/src/components/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
index 570cd7fa1e6..4822142c27f 100644
--- a/packages/react-core/src/components/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
+++ b/packages/react-core/src/components/Tooltip/__tests__/__snapshots__/Tooltip.test.tsx.snap
@@ -2,15 +2,21 @@
 
 exports[`tooltip renders 1`] = `
 <DocumentFragment>
-  <div>
-    Toggle tooltip
+  <div
+    style="display: contents;"
+  >
+    <div>
+      Toggle tooltip
+    </div>
   </div>
 </DocumentFragment>
 `;
 
 exports[`tooltip renders in strict mode 1`] = `
 <DocumentFragment>
-  <div>
+  <div
+    style="display: contents;"
+  >
     <div>
       Toggle tooltip
     </div>
diff --git a/packages/react-core/src/helpers/Popper/FindRefWrapper.tsx b/packages/react-core/src/helpers/Popper/FindRefWrapper.tsx
deleted file mode 100644
index fd7ec45959e..00000000000
--- a/packages/react-core/src/helpers/Popper/FindRefWrapper.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-
-interface FindRefWrapperProps {
-  children: React.ReactNode;
-  onFoundRef: any;
-}
-
-/**
- * This component wraps any ReactNode and finds its ref
- * It has to be a class for findDOMNode to work
- * Ideally, all components used as triggers/toggles are either:
- * - class based components we can assign our own ref to
- * - functional components that have forwardRef implemented
- * However, there is no guarantee that is what will get passed in as trigger/toggle in the case of tooltips and popovers
- */
-export class FindRefWrapper extends React.Component<FindRefWrapperProps> {
-  static displayName = 'FindRefWrapper';
-  componentDidMount() {
-    // eslint-disable-next-line react/no-find-dom-node
-    const root = ReactDOM.findDOMNode(this);
-    this.props.onFoundRef(root);
-  }
-
-  render() {
-    return this.props.children || null;
-  }
-}
diff --git a/packages/react-core/src/helpers/Popper/Popper.tsx b/packages/react-core/src/helpers/Popper/Popper.tsx
index 7ed5a3a07ed..75fc3630803 100644
--- a/packages/react-core/src/helpers/Popper/Popper.tsx
+++ b/packages/react-core/src/helpers/Popper/Popper.tsx
@@ -3,7 +3,6 @@ import * as ReactDOM from 'react-dom';
 import { usePopper } from './thirdparty/react-popper/usePopper';
 import { Placement, Modifier } from './thirdparty/popper-core';
 import { css } from '@patternfly/react-styles';
-import { FindRefWrapper } from './FindRefWrapper';
 import '@patternfly/react-styles/css/components/Popper/Popper.css';
 
 const hash = {
@@ -54,7 +53,6 @@ export interface PopperProps {
   /**
    * The reference element to which the Popover is relatively placed to.
    * Use either trigger or reference, not both.
-   * Passing this property or the removeFindDomNode property, will bypass the use of findDOMNode for the trigger in react strict mode.
    */
   reference?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
   /** The popper (menu/tooltip/popover) element */
@@ -139,9 +137,7 @@ export interface PopperProps {
         | 'right-start'
         | 'right-end'
       )[];
-  /** @beta Bypasses the use of findDOMNode for both the popper and trigger in react strict mode. Without this flag, the trigger and popper will require passed references via the reference property (trigger) and popperRef property (popper) for strict mode. */
-  removeFindDomNode?: boolean;
-  /** @beta Reference to the popper (menu/tooltip/popover) element. Passing this property or the removeFindDomNode property, will bypass the use of findDOMNode for the popper in react strict mode. The popper property is still required. */
+  /** @beta Reference to the popper (menu/tooltip/popover) element. */
   popperRef?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
 }
 
@@ -171,7 +167,6 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
   enableFlip = true,
   flipBehavior = 'flip',
   reference,
-  removeFindDomNode = false,
   popperRef
 }) => {
   const [triggerElement, setTriggerElement] = React.useState(null);
@@ -299,7 +294,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     [popperMatchesTriggerWidth]
   );
 
-  const { styles: popperStyles, attributes, update } = usePopper(refOrTrigger, popperElement, {
+  const { styles: popperStyles, attributes, update, forceUpdate } = usePopper(refOrTrigger, popperElement, {
     placement: getPlacementMemo,
     modifiers: [
       {
@@ -328,6 +323,10 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     ]
   });
 
+  React.useEffect(() => {
+    forceUpdate && forceUpdate();
+  }, [popper]);
+
   // Returns the CSS modifier class in order to place the Popper's arrow properly
   // Depends on the position of the Popper relative to the reference element
   const modifierFromPopperPosition = () => {
@@ -357,40 +356,25 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     return appendTo;
   };
 
-  /**
-   * To enable strict mode, the popper must either have its reference defined via the popperRef property,
-   * or the removeFindDomNode flag must be present. Even if the reference is passed in, unlike the trigger,
-   * the popper property must still be passed.
-   * The trigger must similarly have either its reference defined via the reference property, or the
-   * removeFindDomNode flag must be present. The trigger property is not required when the reference is passed.
-   *
-   * Strict mode may be enabled by passing both reference properties to Popper, or by passing the
-   * removeFindDomNode flag with either reference property, or by solely passing the removeFindDomNode
-   * flag.
-   */
-  let popperPortal;
-  if (removeFindDomNode) {
-    // If removeFindDomNode is passed, use the removeFindDomNode method of wrapping divs
-    popperPortal = <div ref={node => setPopperElement(node?.firstElementChild as HTMLElement)}>{menuWithPopper}</div>;
-  } else if (popperRef) {
-    // If removeFindDomNode is not passed and popperRef is passed, use the popperRef method
-    popperPortal = menuWithPopper;
-  } else {
-    // If neither removeFindDomNode and popperRef exist, use the old method of FindRefWrapper
-    popperPortal = (
-      <FindRefWrapper onFoundRef={(foundRef: any) => setPopperElement(foundRef)}>{menuWithPopper}</FindRefWrapper>
-    );
-  }
-
   return (
     <>
-      {!reference && trigger && React.isValidElement(trigger) && !removeFindDomNode && (
-        <FindRefWrapper onFoundRef={(foundRef: any) => setTriggerElement(foundRef)}>{trigger}</FindRefWrapper>
-      )}
-      {!reference && trigger && React.isValidElement(trigger) && removeFindDomNode && (
-        <div ref={node => setTriggerElement(node?.firstElementChild as HTMLElement)}>{trigger}</div>
+      {!reference && trigger && React.isValidElement(trigger) && (
+        <div style={{ display: 'contents' }} ref={node => setTriggerElement(node?.firstElementChild as HTMLElement)}>
+          {trigger}
+        </div>
       )}
-      {ready && isVisible && ReactDOM.createPortal(popperPortal, getTarget())}
+      {ready &&
+        isVisible &&
+        ReactDOM.createPortal(
+          popperRef ? (
+            menuWithPopper
+          ) : (
+            <div style={{ display: 'contents' }} ref={node => setPopperElement(node?.firstElementChild as HTMLElement)}>
+              {menuWithPopper}
+            </div>
+          ),
+          getTarget()
+        )}
     </>
   );
 };
diff --git a/packages/react-core/src/helpers/Popper/__tests__/Generated/FindRefWrapper.test.tsx b/packages/react-core/src/helpers/Popper/__tests__/Generated/FindRefWrapper.test.tsx
deleted file mode 100644
index 86e039186f3..00000000000
--- a/packages/react-core/src/helpers/Popper/__tests__/Generated/FindRefWrapper.test.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * This test was generated
- */
-import * as React from 'react';
-import { render } from '@testing-library/react';
-import { FindRefWrapper } from '../../FindRefWrapper';
-
-it('FindRefWrapper should match snapshot (auto-generated)', () => {
-  const { asFragment } = render(<FindRefWrapper children={<div>ReactNode</div>} onFoundRef={(foundRef: any) => {}} />);
-  expect(asFragment()).toMatchSnapshot();
-});
diff --git a/packages/react-core/src/helpers/Popper/__tests__/Generated/__snapshots__/FindRefWrapper.test.tsx.snap b/packages/react-core/src/helpers/Popper/__tests__/Generated/__snapshots__/FindRefWrapper.test.tsx.snap
deleted file mode 100644
index 2a153c6768e..00000000000
--- a/packages/react-core/src/helpers/Popper/__tests__/Generated/__snapshots__/FindRefWrapper.test.tsx.snap
+++ /dev/null
@@ -1,9 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`FindRefWrapper should match snapshot (auto-generated) 1`] = `
-<DocumentFragment>
-  <div>
-    ReactNode
-  </div>
-</DocumentFragment>
-`;
diff --git a/packages/react-core/src/next/components/Dropdown/Dropdown.tsx b/packages/react-core/src/next/components/Dropdown/Dropdown.tsx
index 83a9996ee1a..d5a1e15eb8e 100644
--- a/packages/react-core/src/next/components/Dropdown/Dropdown.tsx
+++ b/packages/react-core/src/next/components/Dropdown/Dropdown.tsx
@@ -115,7 +115,6 @@ const DropdownBase: React.FunctionComponent<DropdownProps> = ({
     <div ref={containerRef} {...ouiaProps}>
       <Popper
         trigger={toggle(toggleRef)}
-        removeFindDomNode
         popper={menu}
         appendTo={containerRef.current || undefined}
         isVisible={isOpen}
diff --git a/packages/react-core/src/next/components/Select/Select.tsx b/packages/react-core/src/next/components/Select/Select.tsx
index b2eed72f714..fe63ef44a65 100644
--- a/packages/react-core/src/next/components/Select/Select.tsx
+++ b/packages/react-core/src/next/components/Select/Select.tsx
@@ -113,7 +113,6 @@ const SelectBase: React.FunctionComponent<SelectProps & OUIAProps> = ({
     <div ref={containerRef}>
       <Popper
         trigger={toggle(toggleRef)}
-        removeFindDomNode
         popper={menu}
         appendTo={containerRef.current || undefined}
         isVisible={isOpen}
diff --git a/packages/react-integration/cypress/integration/alert.spec.ts b/packages/react-integration/cypress/integration/alert.spec.ts
index 2285ec420be..47a057ce6a5 100644
--- a/packages/react-integration/cypress/integration/alert.spec.ts
+++ b/packages/react-integration/cypress/integration/alert.spec.ts
@@ -22,7 +22,7 @@ describe('Alert Demo Test', () => {
   });
 
   it('Verify truncateTitle alert and tooltip', () => {
-    cy.get('#long-title-alert > .pf-c-alert__title')
+    cy.get('#long-title-alert .pf-c-alert__title')
       .should('have.class', 'pf-m-truncate')
       .then((tooltipLink: JQuery<HTMLDivElement>) => {
         cy.get('.pf-c-tooltip').should('not.exist');
diff --git a/packages/react-integration/cypress/integration/datepicker.spec.ts b/packages/react-integration/cypress/integration/datepicker.spec.ts
index c0601ffe62d..90048c9b0a2 100644
--- a/packages/react-integration/cypress/integration/datepicker.spec.ts
+++ b/packages/react-integration/cypress/integration/datepicker.spec.ts
@@ -8,6 +8,7 @@ it('Verify validation error can be cleared from outside', () => {
     .within(() => {
       cy.get('input');
     })
+    .children()
     .click();
   cy.focused()
     .clear()
diff --git a/packages/react-integration/cypress/integration/descriptionlist.spec.ts b/packages/react-integration/cypress/integration/descriptionlist.spec.ts
index d7af38489ac..3111a11076f 100644
--- a/packages/react-integration/cypress/integration/descriptionlist.spec.ts
+++ b/packages/react-integration/cypress/integration/descriptionlist.spec.ts
@@ -9,7 +9,7 @@ describe('Description List Demo Test', () => {
       .children('.pf-c-description-list__group');
     cy.get('.pf-c-popover__content').should('not.exist');
     cy.get(
-      '#description-list-help-text > :nth-child(1) > .pf-c-description-list__term > .pf-c-description-list__text'
+      '#description-list-help-text > :nth-child(1) > .pf-c-description-list__term .pf-c-description-list__text'
     ).click();
     cy.get('.pf-c-popover__content').should('exist');
   });
diff --git a/packages/react-integration/cypress/integration/dropdown.spec.ts b/packages/react-integration/cypress/integration/dropdown.spec.ts
index b48fe68b6f5..90ad8d9ad7e 100644
--- a/packages/react-integration/cypress/integration/dropdown.spec.ts
+++ b/packages/react-integration/cypress/integration/dropdown.spec.ts
@@ -357,9 +357,7 @@ describe('Dropdown with menu on document body demo test', () => {
   });
 
   it('Verify dropdown menu is on document.body', () => {
-    cy.get('body')
-      .children('.pf-c-dropdown')
-      .should('exist');
+    cy.get('body .pf-c-dropdown').should('exist');
   });
 
   it('Verify dropdown menu closed', () => {
diff --git a/packages/react-integration/cypress/integration/notificationdrawerbasic.spec.ts b/packages/react-integration/cypress/integration/notificationdrawerbasic.spec.ts
index faefd1c26aa..2b9238cba7e 100644
--- a/packages/react-integration/cypress/integration/notificationdrawerbasic.spec.ts
+++ b/packages/react-integration/cypress/integration/notificationdrawerbasic.spec.ts
@@ -111,7 +111,7 @@ describe('Notification Drawer Basic Demo Test', () => {
   });
 
   it('Verify truncateTitle in drawer header list item header and no tooltip on short text', () => {
-    cy.get('#info-alert-item > .pf-c-notification-drawer__list-item-header-title')
+    cy.get('#info-alert-item .pf-c-notification-drawer__list-item-header-title')
       .should('have.class', 'pf-m-truncate')
       .then((noTooltipLink: JQuery<HTMLDivElement>) => {
         cy.wrap(noTooltipLink)
@@ -123,7 +123,7 @@ describe('Notification Drawer Basic Demo Test', () => {
   });
 
   it('Verify truncateTitle in drawer group title and tooltip', () => {
-    cy.get('#long-title-item > .pf-c-notification-drawer__list-item-header-title')
+    cy.get('#long-title-item .pf-c-notification-drawer__list-item-header-title')
       .should('have.class', 'pf-m-truncate')
       .then((tooltipLink: JQuery<HTMLDivElement>) => {
         cy.get('.pf-c-tooltip').should('not.exist');
diff --git a/packages/react-integration/cypress/integration/notificationdrawergroups.spec.ts b/packages/react-integration/cypress/integration/notificationdrawergroups.spec.ts
index 1efb2874858..e1ed4f6dfbc 100644
--- a/packages/react-integration/cypress/integration/notificationdrawergroups.spec.ts
+++ b/packages/react-integration/cypress/integration/notificationdrawergroups.spec.ts
@@ -145,7 +145,7 @@ describe('Notification Drawer Groups Demo Test', () => {
 
   it('Verify truncateTitle group title and tooltip', () => {
     cy.get(
-      '#long-group-title > h1 > .pf-c-notification-drawer__group-toggle > .pf-c-notification-drawer__group-toggle-title'
+      '#long-group-title > h1 > .pf-c-notification-drawer__group-toggle .pf-c-notification-drawer__group-toggle-title'
     ).then((tooltipLink: JQuery<HTMLDivElement>) => {
       cy.get('.pf-c-tooltip').should('not.exist');
       cy.wrap(tooltipLink)
@@ -158,7 +158,7 @@ describe('Notification Drawer Groups Demo Test', () => {
 
   it('Verify truncated with no truncateTitle prop group title and tooltip on long title', () => {
     cy.get(
-      '#long-title-no-truncate-prop > h1 > .pf-c-notification-drawer__group-toggle > .pf-c-notification-drawer__group-toggle-title'
+      '#long-title-no-truncate-prop > h1 > .pf-c-notification-drawer__group-toggle .pf-c-notification-drawer__group-toggle-title'
     ).then((tooltipLink: JQuery<HTMLDivElement>) => {
       cy.get('.pf-c-tooltip').should('not.exist');
       cy.wrap(tooltipLink)
diff --git a/packages/react-topology/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap b/packages/react-topology/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap
index 2ddb8b2a7cc..e7904ed6547 100644
--- a/packages/react-topology/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap
+++ b/packages/react-topology/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap
@@ -22,88 +22,100 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
           <div
             class="pf-c-toolbar__item"
           >
-            <button
-              aria-disabled="false"
-              class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
-              data-ouia-component-id="OUIA-Generated-Button-tertiary-6"
-              data-ouia-component-type="PF4/Button"
-              data-ouia-safe="true"
-              id="zoom-in"
-              type="button"
+            <div
+              style="display: contents;"
             >
-              <span>
-                test zoom in
-              </span>
-              <span
-                class="pf-u-screen-reader"
+              <button
+                aria-disabled="false"
+                class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
+                data-ouia-component-id="OUIA-Generated-Button-tertiary-6"
+                data-ouia-component-type="PF4/Button"
+                data-ouia-safe="true"
+                id="zoom-in"
+                type="button"
               >
-                test-zoom-in-aria-label
-              </span>
-            </button>
+                <span>
+                  test zoom in
+                </span>
+                <span
+                  class="pf-u-screen-reader"
+                >
+                  test-zoom-in-aria-label
+                </span>
+              </button>
+            </div>
           </div>
           <div
             class="pf-c-toolbar__item"
           >
-            <button
-              aria-disabled="false"
-              class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
-              data-ouia-component-id="OUIA-Generated-Button-tertiary-7"
-              data-ouia-component-type="PF4/Button"
-              data-ouia-safe="true"
-              id="zoom-out"
-              type="button"
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                style="vertical-align: -0.125em;"
-                viewBox="0 0 512 512"
-                width="1em"
-              >
-                <path
-                  d="M304 192v32c0 6.6-5.4 12-12 12H124c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm201 284.7L476.7 505c-9.4 9.4-24.6 9.4-33.9 0L343 405.3c-4.5-4.5-7-10.6-7-17V372c-35.3 27.6-79.7 44-128 44C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208c0 48.3-16.4 92.7-44 128h16.3c6.4 0 12.5 2.5 17 7l99.7 99.7c9.3 9.4 9.3 24.6 0 34zM344 208c0-75.2-60.8-136-136-136S72 132.8 72 208s60.8 136 136 136 136-60.8 136-136z"
-                />
-              </svg>
-              <span
-                class="pf-u-screen-reader"
+              <button
+                aria-disabled="false"
+                class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
+                data-ouia-component-id="OUIA-Generated-Button-tertiary-7"
+                data-ouia-component-type="PF4/Button"
+                data-ouia-safe="true"
+                id="zoom-out"
+                type="button"
               >
-                Zoom Out
-              </span>
-            </button>
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 512 512"
+                  width="1em"
+                >
+                  <path
+                    d="M304 192v32c0 6.6-5.4 12-12 12H124c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm201 284.7L476.7 505c-9.4 9.4-24.6 9.4-33.9 0L343 405.3c-4.5-4.5-7-10.6-7-17V372c-35.3 27.6-79.7 44-128 44C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208c0 48.3-16.4 92.7-44 128h16.3c6.4 0 12.5 2.5 17 7l99.7 99.7c9.3 9.4 9.3 24.6 0 34zM344 208c0-75.2-60.8-136-136-136S72 132.8 72 208s60.8 136 136 136 136-60.8 136-136z"
+                  />
+                </svg>
+                <span
+                  class="pf-u-screen-reader"
+                >
+                  Zoom Out
+                </span>
+              </button>
+            </div>
           </div>
           <div
             class="pf-c-toolbar__item"
           >
-            <button
-              aria-disabled="false"
-              class="pf-c-button pf-m-tertiary pf-topology-control-bar__button pf-m-disabled"
-              data-ouia-component-id="OUIA-Generated-Button-tertiary-8"
-              data-ouia-component-type="PF4/Button"
-              data-ouia-safe="true"
-              id="reset-view"
-              type="button"
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                style="vertical-align: -0.125em;"
-                viewBox="0 0 448 512"
-                width="1em"
-              >
-                <path
-                  d="M0 180V56c0-13.3 10.7-24 24-24h124c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H64v84c0 6.6-5.4 12-12 12H12c-6.6 0-12-5.4-12-12zM288 44v40c0 6.6 5.4 12 12 12h84v84c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12V56c0-13.3-10.7-24-24-24H300c-6.6 0-12 5.4-12 12zm148 276h-40c-6.6 0-12 5.4-12 12v84h-84c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h124c13.3 0 24-10.7 24-24V332c0-6.6-5.4-12-12-12zM160 468v-40c0-6.6-5.4-12-12-12H64v-84c0-6.6-5.4-12-12-12H12c-6.6 0-12 5.4-12 12v124c0 13.3 10.7 24 24 24h124c6.6 0 12-5.4 12-12z"
-                />
-              </svg>
-              <span
-                class="pf-u-screen-reader"
+              <button
+                aria-disabled="false"
+                class="pf-c-button pf-m-tertiary pf-topology-control-bar__button pf-m-disabled"
+                data-ouia-component-id="OUIA-Generated-Button-tertiary-8"
+                data-ouia-component-type="PF4/Button"
+                data-ouia-safe="true"
+                id="reset-view"
+                type="button"
               >
-                Reset View
-              </span>
-            </button>
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 448 512"
+                  width="1em"
+                >
+                  <path
+                    d="M0 180V56c0-13.3 10.7-24 24-24h124c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H64v84c0 6.6-5.4 12-12 12H12c-6.6 0-12-5.4-12-12zM288 44v40c0 6.6 5.4 12 12 12h84v84c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12V56c0-13.3-10.7-24-24-24H300c-6.6 0-12 5.4-12 12zm148 276h-40c-6.6 0-12 5.4-12 12v84h-84c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h124c13.3 0 24-10.7 24-24V332c0-6.6-5.4-12-12-12zM160 468v-40c0-6.6-5.4-12-12-12H64v-84c0-6.6-5.4-12-12-12H12c-6.6 0-12 5.4-12 12v124c0 13.3 10.7 24 24 24h124c6.6 0 12-5.4 12-12z"
+                  />
+                </svg>
+                <span
+                  class="pf-u-screen-reader"
+                >
+                  Reset View
+                </span>
+              </button>
+            </div>
           </div>
         </div>
       </div>
@@ -150,130 +162,146 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
           <div
             class="pf-c-toolbar__item"
           >
-            <button
-              aria-disabled="false"
-              class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
-              data-ouia-component-id="OUIA-Generated-Button-tertiary-1"
-              data-ouia-component-type="PF4/Button"
-              data-ouia-safe="true"
-              id="zoom-in"
-              type="button"
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                style="vertical-align: -0.125em;"
-                viewBox="0 0 512 512"
-                width="1em"
-              >
-                <path
-                  d="M304 192v32c0 6.6-5.4 12-12 12h-56v56c0 6.6-5.4 12-12 12h-32c-6.6 0-12-5.4-12-12v-56h-56c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h56v-56c0-6.6 5.4-12 12-12h32c6.6 0 12 5.4 12 12v56h56c6.6 0 12 5.4 12 12zm201 284.7L476.7 505c-9.4 9.4-24.6 9.4-33.9 0L343 405.3c-4.5-4.5-7-10.6-7-17V372c-35.3 27.6-79.7 44-128 44C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208c0 48.3-16.4 92.7-44 128h16.3c6.4 0 12.5 2.5 17 7l99.7 99.7c9.3 9.4 9.3 24.6 0 34zM344 208c0-75.2-60.8-136-136-136S72 132.8 72 208s60.8 136 136 136 136-60.8 136-136z"
-                />
-              </svg>
-              <span
-                class="pf-u-screen-reader"
+              <button
+                aria-disabled="false"
+                class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
+                data-ouia-component-id="OUIA-Generated-Button-tertiary-1"
+                data-ouia-component-type="PF4/Button"
+                data-ouia-safe="true"
+                id="zoom-in"
+                type="button"
               >
-                Zoom In
-              </span>
-            </button>
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 512 512"
+                  width="1em"
+                >
+                  <path
+                    d="M304 192v32c0 6.6-5.4 12-12 12h-56v56c0 6.6-5.4 12-12 12h-32c-6.6 0-12-5.4-12-12v-56h-56c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h56v-56c0-6.6 5.4-12 12-12h32c6.6 0 12 5.4 12 12v56h56c6.6 0 12 5.4 12 12zm201 284.7L476.7 505c-9.4 9.4-24.6 9.4-33.9 0L343 405.3c-4.5-4.5-7-10.6-7-17V372c-35.3 27.6-79.7 44-128 44C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208c0 48.3-16.4 92.7-44 128h16.3c6.4 0 12.5 2.5 17 7l99.7 99.7c9.3 9.4 9.3 24.6 0 34zM344 208c0-75.2-60.8-136-136-136S72 132.8 72 208s60.8 136 136 136 136-60.8 136-136z"
+                  />
+                </svg>
+                <span
+                  class="pf-u-screen-reader"
+                >
+                  Zoom In
+                </span>
+              </button>
+            </div>
           </div>
           <div
             class="pf-c-toolbar__item"
           >
-            <button
-              aria-disabled="false"
-              class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
-              data-ouia-component-id="OUIA-Generated-Button-tertiary-2"
-              data-ouia-component-type="PF4/Button"
-              data-ouia-safe="true"
-              id="zoom-out"
-              type="button"
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                style="vertical-align: -0.125em;"
-                viewBox="0 0 512 512"
-                width="1em"
+              <button
+                aria-disabled="false"
+                class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
+                data-ouia-component-id="OUIA-Generated-Button-tertiary-2"
+                data-ouia-component-type="PF4/Button"
+                data-ouia-safe="true"
+                id="zoom-out"
+                type="button"
               >
-                <path
-                  d="M304 192v32c0 6.6-5.4 12-12 12H124c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm201 284.7L476.7 505c-9.4 9.4-24.6 9.4-33.9 0L343 405.3c-4.5-4.5-7-10.6-7-17V372c-35.3 27.6-79.7 44-128 44C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208c0 48.3-16.4 92.7-44 128h16.3c6.4 0 12.5 2.5 17 7l99.7 99.7c9.3 9.4 9.3 24.6 0 34zM344 208c0-75.2-60.8-136-136-136S72 132.8 72 208s60.8 136 136 136 136-60.8 136-136z"
-                />
-              </svg>
-              <span
-                class="pf-u-screen-reader"
-              >
-                Zoom Out
-              </span>
-            </button>
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 512 512"
+                  width="1em"
+                >
+                  <path
+                    d="M304 192v32c0 6.6-5.4 12-12 12H124c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm201 284.7L476.7 505c-9.4 9.4-24.6 9.4-33.9 0L343 405.3c-4.5-4.5-7-10.6-7-17V372c-35.3 27.6-79.7 44-128 44C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208c0 48.3-16.4 92.7-44 128h16.3c6.4 0 12.5 2.5 17 7l99.7 99.7c9.3 9.4 9.3 24.6 0 34zM344 208c0-75.2-60.8-136-136-136S72 132.8 72 208s60.8 136 136 136 136-60.8 136-136z"
+                  />
+                </svg>
+                <span
+                  class="pf-u-screen-reader"
+                >
+                  Zoom Out
+                </span>
+              </button>
+            </div>
           </div>
           <div
             class="pf-c-toolbar__item"
           >
-            <button
-              aria-disabled="false"
-              class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
-              data-ouia-component-id="OUIA-Generated-Button-tertiary-3"
-              data-ouia-component-type="PF4/Button"
-              data-ouia-safe="true"
-              id="fit-to-screen"
-              type="button"
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                style="vertical-align: -0.125em;"
-                viewBox="0 0 448 512"
-                width="1em"
-              >
-                <path
-                  d="M448 344v112a23.94 23.94 0 0 1-24 24H312c-21.39 0-32.09-25.9-17-41l36.2-36.2L224 295.6 116.77 402.9 153 439c15.09 15.1 4.39 41-17 41H24a23.94 23.94 0 0 1-24-24V344c0-21.4 25.89-32.1 41-17l36.19 36.2L184.46 256 77.18 148.7 41 185c-15.1 15.1-41 4.4-41-17V56a23.94 23.94 0 0 1 24-24h112c21.39 0 32.09 25.9 17 41l-36.2 36.2L224 216.4l107.23-107.3L295 73c-15.09-15.1-4.39-41 17-41h112a23.94 23.94 0 0 1 24 24v112c0 21.4-25.89 32.1-41 17l-36.19-36.2L263.54 256l107.28 107.3L407 327.1c15.1-15.2 41-4.5 41 16.9z"
-                />
-              </svg>
-              <span
-                class="pf-u-screen-reader"
+              <button
+                aria-disabled="false"
+                class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
+                data-ouia-component-id="OUIA-Generated-Button-tertiary-3"
+                data-ouia-component-type="PF4/Button"
+                data-ouia-safe="true"
+                id="fit-to-screen"
+                type="button"
               >
-                Fit to Screen
-              </span>
-            </button>
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 448 512"
+                  width="1em"
+                >
+                  <path
+                    d="M448 344v112a23.94 23.94 0 0 1-24 24H312c-21.39 0-32.09-25.9-17-41l36.2-36.2L224 295.6 116.77 402.9 153 439c15.09 15.1 4.39 41-17 41H24a23.94 23.94 0 0 1-24-24V344c0-21.4 25.89-32.1 41-17l36.19 36.2L184.46 256 77.18 148.7 41 185c-15.1 15.1-41 4.4-41-17V56a23.94 23.94 0 0 1 24-24h112c21.39 0 32.09 25.9 17 41l-36.2 36.2L224 216.4l107.23-107.3L295 73c-15.09-15.1-4.39-41 17-41h112a23.94 23.94 0 0 1 24 24v112c0 21.4-25.89 32.1-41 17l-36.19-36.2L263.54 256l107.28 107.3L407 327.1c15.1-15.2 41-4.5 41 16.9z"
+                  />
+                </svg>
+                <span
+                  class="pf-u-screen-reader"
+                >
+                  Fit to Screen
+                </span>
+              </button>
+            </div>
           </div>
           <div
             class="pf-c-toolbar__item"
           >
-            <button
-              aria-disabled="false"
-              class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
-              data-ouia-component-id="OUIA-Generated-Button-tertiary-4"
-              data-ouia-component-type="PF4/Button"
-              data-ouia-safe="true"
-              id="reset-view"
-              type="button"
+            <div
+              style="display: contents;"
             >
-              <svg
-                aria-hidden="true"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                style="vertical-align: -0.125em;"
-                viewBox="0 0 448 512"
-                width="1em"
-              >
-                <path
-                  d="M0 180V56c0-13.3 10.7-24 24-24h124c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H64v84c0 6.6-5.4 12-12 12H12c-6.6 0-12-5.4-12-12zM288 44v40c0 6.6 5.4 12 12 12h84v84c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12V56c0-13.3-10.7-24-24-24H300c-6.6 0-12 5.4-12 12zm148 276h-40c-6.6 0-12 5.4-12 12v84h-84c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h124c13.3 0 24-10.7 24-24V332c0-6.6-5.4-12-12-12zM160 468v-40c0-6.6-5.4-12-12-12H64v-84c0-6.6-5.4-12-12-12H12c-6.6 0-12 5.4-12 12v124c0 13.3 10.7 24 24 24h124c6.6 0 12-5.4 12-12z"
-                />
-              </svg>
-              <span
-                class="pf-u-screen-reader"
+              <button
+                aria-disabled="false"
+                class="pf-c-button pf-m-tertiary pf-topology-control-bar__button"
+                data-ouia-component-id="OUIA-Generated-Button-tertiary-4"
+                data-ouia-component-type="PF4/Button"
+                data-ouia-safe="true"
+                id="reset-view"
+                type="button"
               >
-                Reset View
-              </span>
-            </button>
+                <svg
+                  aria-hidden="true"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  style="vertical-align: -0.125em;"
+                  viewBox="0 0 448 512"
+                  width="1em"
+                >
+                  <path
+                    d="M0 180V56c0-13.3 10.7-24 24-24h124c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H64v84c0 6.6-5.4 12-12 12H12c-6.6 0-12-5.4-12-12zM288 44v40c0 6.6 5.4 12 12 12h84v84c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12V56c0-13.3-10.7-24-24-24H300c-6.6 0-12 5.4-12 12zm148 276h-40c-6.6 0-12 5.4-12 12v84h-84c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h124c13.3 0 24-10.7 24-24V332c0-6.6-5.4-12-12-12zM160 468v-40c0-6.6-5.4-12-12-12H64v-84c0-6.6-5.4-12-12-12H12c-6.6 0-12 5.4-12 12v124c0 13.3 10.7 24 24 24h124c6.6 0 12-5.4 12-12z"
+                  />
+                </svg>
+                <span
+                  class="pf-u-screen-reader"
+                >
+                  Reset View
+                </span>
+              </button>
+            </div>
           </div>
           <div
             class="pf-c-toolbar__item"