diff --git a/packages/patternfly-4/react-charts/src/components/ChartDonutUtilization/ChartDonutThreshold.tsx b/packages/patternfly-4/react-charts/src/components/ChartDonutUtilization/ChartDonutThreshold.tsx
index 5e3f7343830..3d7bebbb9fb 100644
--- a/packages/patternfly-4/react-charts/src/components/ChartDonutUtilization/ChartDonutThreshold.tsx
+++ b/packages/patternfly-4/react-charts/src/components/ChartDonutUtilization/ChartDonutThreshold.tsx
@@ -392,6 +392,7 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
   children,
   data = [],
   donutOrientation = 'left',
+  labels = [], // Don't show any tooltip labels by default, let consumer override if needed
   standalone = true,
   themeColor,
   themeVariant,
@@ -405,25 +406,34 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
   donutHeight = Math.min(height, width),
   donutWidth = Math.min(height, width),
   innerRadius = (Math.min(donutHeight, donutWidth) - 34) / 2,
-
   ...rest
 }: ChartDonutThresholdProps) => {
+
   // Returns computed data representing pie chart slices
   const getComputedData = () => {
-    const computedData = [];
-    const datum = getData(data);
-    let prevYVal = 0;
-    datum.forEach((dataPoint: {_x?: any, _y: any}) => {
-      computedData.push({ x: dataPoint._x, y: dataPoint._y ? Math.abs(dataPoint._y - prevYVal) : 0 });
-      prevYVal = dataPoint._y;
-    });
-    computedData.push({ y: prevYVal ? Math.abs(100 - prevYVal) : 0 });
-    return computedData;
-  };
+    // Format and sort data. Sorting ensures thresholds are displayed in the correct order and simplifies calculations.
+    const datum = Data.formatData(data, {x, y, ...rest}, ['x', 'y']).sort((a: any,b: any) => a._y - b._y);
 
-  const getData = (datum: any[]) => {
-    const accessorTypes = ['x', 'y'];
-    return Data.formatData(datum, { x, y, ...rest }, accessorTypes);
+    // Data must be offset so that the sum of all data point y-values (including the final slice) == 100.
+    const [prev, computedData] = datum.reduce((acc: [number, any], dataPoint: {_x: number | string, _y: number}) => {
+      return [
+        dataPoint._y, // Set the previous value to current y value
+        [
+          ...acc[1],
+          {
+            x: dataPoint._x, // Conditionally add x property only if it is in the original data object
+            y: dataPoint._y - acc[0] // Must be offset by previous value
+          }
+        ]
+      ];
+    }, [0, []]);
+
+    return [
+      ...computedData,
+      {
+        y: prev ? (100 - prev) : 0
+      }
+    ];
   };
 
   // Returns the horizontal shift for the dynamic utilization donut cart
@@ -449,24 +459,27 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
   const renderChildren = () =>
     React.Children.toArray(children).map(child => {
       if (child.props) {
-        const datum = getData([{ ...child.props.data }]);
-        const orientation = child.props.donutOrientation || donutOrientation;
+        const {data: childData, ...childProps} = child.props;
+        const datum = Data.formatData([childData], childProps, ['x', 'y']); // Format child data independently of this component's props
+        const orientation = childProps.donutOrientation || donutOrientation;
         const dynamicTheme =
-          child.props.theme ||
-          getDonutThresholdDynamicTheme(child.props.themeColor || themeColor,
-            child.props.themeVariant || themeVariant);
+          childProps.theme ||
+          getDonutThresholdDynamicTheme(childProps.themeColor || themeColor,
+            childProps.themeVariant || themeVariant);
         return React.cloneElement(child, {
-          donutDx: child.props.donutDx || getDynamicDonutDx(dynamicTheme, orientation),
-          donutDy: child.props.donutDy || getDynamicDonutDy(dynamicTheme),
-          donutHeight: child.props.donutHeight || donutHeight - (theme.pie.height - dynamicTheme.pie.height),
+          data: childData,
+          donutDx: getDynamicDonutDx(dynamicTheme, orientation),
+          donutDy: getDynamicDonutDy(dynamicTheme),
+          donutHeight: donutHeight - (theme.pie.height - dynamicTheme.pie.height),
           donutOrientation: orientation,
-          donutWidth: child.props.donutWidth || donutWidth - (theme.pie.width - dynamicTheme.pie.width),
-          endAngle: child.props.endAngle || 360 * (datum[0]._y ? datum[0]._y / 100 : 100),
-          height: child.props.height || height,
-          showStatic: child.props.showStatic || false,
+          donutWidth: donutWidth - (theme.pie.width - dynamicTheme.pie.width),
+          endAngle: 360 * (datum[0]._y ? datum[0]._y / 100 : 100),
+          height,
+          showStatic: false,
           standalone: false,
           theme: dynamicTheme,
-          width: child.props.width || width
+          width: width,
+          ...childProps,
         });
       }
       return child;
@@ -479,6 +492,7 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
         data={getComputedData()}
         height={donutHeight}
         innerRadius={innerRadius > 0 ? innerRadius : 0}
+        labels={labels}
         origin={getChartOrigin({
           chartHeight: donutHeight,
           chartWidth: donutWidth,
diff --git a/packages/patternfly-4/react-charts/src/components/ChartDonutUtilization/__snapshots__/ChartDonutThreshold.test.tsx.snap b/packages/patternfly-4/react-charts/src/components/ChartDonutUtilization/__snapshots__/ChartDonutThreshold.test.tsx.snap
index 49ca44c31d1..170da596cec 100644
--- a/packages/patternfly-4/react-charts/src/components/ChartDonutUtilization/__snapshots__/ChartDonutThreshold.test.tsx.snap
+++ b/packages/patternfly-4/react-charts/src/components/ChartDonutUtilization/__snapshots__/ChartDonutThreshold.test.tsx.snap
@@ -15,6 +15,7 @@ exports[`Chart 1`] = `
     }
     height={230}
     innerRadius={98}
+    labels={Array []}
     origin={
       Object {
         "x": 115,
@@ -494,6 +495,7 @@ exports[`Chart 2`] = `
     }
     height={230}
     innerRadius={98}
+    labels={Array []}
     origin={
       Object {
         "x": 115,
@@ -966,25 +968,26 @@ exports[`renders component data 1`] = `
   <Component
     data={
       Array [
+        Object {
+          "x": "Birds",
+          "y": 10,
+        },
         Object {
           "x": "Cats",
-          "y": 35,
+          "y": 25,
         },
         Object {
           "x": "Dogs",
           "y": 20,
         },
         Object {
-          "x": "Birds",
           "y": 45,
         },
-        Object {
-          "y": 90,
-        },
       ]
     }
     height={200}
     innerRadius={83}
+    labels={Array []}
     origin={
       Object {
         "x": 100,
diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap b/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
index d001a6a5701..0367c897b2f 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap
@@ -11,7 +11,6 @@ exports[`AboutModalBoxCloseButton Test 1`] = `
   >
     <TimesIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
@@ -30,7 +29,6 @@ exports[`AboutModalBoxCloseButton Test onclose 1`] = `
   >
     <TimesIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
diff --git a/packages/patternfly-4/react-core/src/components/Accordion/Accordion.test.tsx b/packages/patternfly-4/react-core/src/components/Accordion/Accordion.test.tsx
index 854b313db7f..b35c036ceb2 100644
--- a/packages/patternfly-4/react-core/src/components/Accordion/Accordion.test.tsx
+++ b/packages/patternfly-4/react-core/src/components/Accordion/Accordion.test.tsx
@@ -2,6 +2,8 @@ import React from 'react';
 import { shallow, mount } from 'enzyme';
 import { Accordion } from './Accordion';
 import { AccordionToggle } from './AccordionToggle';
+import { AccordionContent } from './AccordionContent';
+import { AccordionItem } from './AccordionItem';
 
 describe('Accordion', () => {
   test('Accordion default', () => {
@@ -25,4 +27,17 @@ describe('Accordion', () => {
     expect(button.props['aria-expanded']).toBe(true);
     expect(button.props.className).toContain('pf-m-expanded');
   });
+
+  test('Accordion with non-default headingLevel', () => {
+    const view = shallow(
+      <Accordion headingLevel="h2">
+        <AccordionItem>
+          <AccordionToggle id="item-1">Item One</AccordionToggle>
+          <AccordionContent>Item One Content</AccordionContent>
+        </AccordionItem>
+      </Accordion>
+    );
+    expect(view.render()).toMatchSnapshot();
+  });
+
 });
diff --git a/packages/patternfly-4/react-core/src/components/Accordion/Accordion.tsx b/packages/patternfly-4/react-core/src/components/Accordion/Accordion.tsx
index 750917c06c6..04ab0892ede 100644
--- a/packages/patternfly-4/react-core/src/components/Accordion/Accordion.tsx
+++ b/packages/patternfly-4/react-core/src/components/Accordion/Accordion.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 
+export const AccordionContext = React.createContext('h3');
+
 export interface AccordionProps extends React.HTMLProps<HTMLDListElement> {
   /** Content rendered inside the Accordion  */
   children?: React.ReactNode;
@@ -9,15 +11,18 @@ export interface AccordionProps extends React.HTMLProps<HTMLDListElement> {
   className?: string;
   /** Adds accessible text to the Accordion */
   'aria-label'?: string;
+  /** the heading level to use */
+  headingLevel?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 }
 
 export const Accordion: React.FunctionComponent<AccordionProps> = ({
   children = null,
   className = '',
   'aria-label': ariaLabel = '',
+  headingLevel = 'h3',
   ...props
 }: AccordionProps) => (
   <dl className={css(styles.accordion, className)} aria-label={ariaLabel} {...props}>
-    {children}
+    <AccordionContext.Provider value={headingLevel}>{children}</AccordionContext.Provider>
   </dl>
 );
diff --git a/packages/patternfly-4/react-core/src/components/Accordion/AccordionToggle.tsx b/packages/patternfly-4/react-core/src/components/Accordion/AccordionToggle.tsx
index 6ba130e5fda..aa384c96462 100644
--- a/packages/patternfly-4/react-core/src/components/Accordion/AccordionToggle.tsx
+++ b/packages/patternfly-4/react-core/src/components/Accordion/AccordionToggle.tsx
@@ -2,7 +2,9 @@ import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 import { AngleRightIcon } from '@patternfly/react-icons';
+import { AccordionContext } from './Accordion';
 import { Omit } from '../../helpers/typeUtils';
+import { ElementType } from 'react';
 
 export interface AccordionToggleProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'type'> {
   /** Content rendered inside the Accordion toggle  */
@@ -23,16 +25,20 @@ export const AccordionToggle: React.FunctionComponent<AccordionToggleProps> = ({
   ...props
 }: AccordionToggleProps) => (
   <dt>
-    <h3>
-      <button
-        id={id}
-        className={css(styles.accordionToggle, isExpanded && styles.modifiers.expanded, className)}
-        {...props}
-        aria-expanded={isExpanded}
-      >
-        <span className={css(styles.accordionToggleText)}>{children}</span>
-        <AngleRightIcon className={css(styles.accordionToggleIcon)} />
-      </button>
-    </h3>
+    <AccordionContext.Consumer>
+      {(AccordionHeadingLevel: any) => (
+        <AccordionHeadingLevel>
+          <button
+            id={id}
+            className={css(styles.accordionToggle, isExpanded && styles.modifiers.expanded, className)}
+            {...props}
+            aria-expanded={isExpanded}
+          >
+            <span className={css(styles.accordionToggleText)}>{children}</span>
+            <AngleRightIcon className={css(styles.accordionToggleIcon)} />
+          </button>
+        </AccordionHeadingLevel>
+      )}
+    </AccordionContext.Consumer>
   </dt>
 );
diff --git a/packages/patternfly-4/react-core/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap b/packages/patternfly-4/react-core/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap
index 8b5b87cfc40..98bdd56bc51 100644
--- a/packages/patternfly-4/react-core/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap
+++ b/packages/patternfly-4/react-core/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap
@@ -6,3 +6,52 @@ exports[`Accordion Accordion default 1`] = `
   class="pf-c-accordion"
 />
 `;
+
+exports[`Accordion Accordion with non-default headingLevel 1`] = `
+<dl
+  aria-label=""
+  class="pf-c-accordion"
+>
+  <dt>
+    <h2>
+      <button
+        aria-expanded="false"
+        class="pf-c-accordion__toggle"
+        id="item-1"
+      >
+        <span
+          class="pf-c-accordion__toggle-text"
+        >
+          Item One
+        </span>
+        <svg
+          aria-hidden="true"
+          class="pf-c-accordion__toggle-icon"
+          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"
+            transform=""
+          />
+        </svg>
+      </button>
+    </h2>
+  </dt>
+  <dd
+    aria-label=""
+    class="pf-c-accordion__expanded-content pf-m-expanded"
+    id=""
+  >
+    <div
+      class="pf-c-accordion__expanded-content-body"
+    >
+      Item One Content
+    </div>
+  </dd>
+</dl>
+`;
diff --git a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.tsx.snap b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.tsx.snap
index 152755dd083..763aec0dd54 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.tsx.snap
+++ b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.tsx.snap
@@ -23,7 +23,6 @@ exports[`Alert - danger Action Close Button 1`] = `
       >
         <ExclamationCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -90,7 +89,6 @@ exports[`Alert - danger Action Close Button 1`] = `
           >
             <TimesIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -144,7 +142,6 @@ exports[`Alert - danger Action Link 1`] = `
       >
         <ExclamationCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -240,7 +237,6 @@ exports[`Alert - danger Action and Title 1`] = `
       >
         <ExclamationCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -338,7 +334,6 @@ exports[`Alert - danger Custom aria label 1`] = `
       >
         <ExclamationCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -430,7 +425,6 @@ exports[`Alert - danger Description 1`] = `
       >
         <ExclamationCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -493,7 +487,6 @@ exports[`Alert - danger Title 1`] = `
       >
         <ExclamationCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -558,7 +551,6 @@ exports[`Alert - danger inline variation 1`] = `
       >
         <ExclamationCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -628,7 +620,6 @@ exports[`Alert - info Action Close Button 1`] = `
       >
         <InfoCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -695,7 +686,6 @@ exports[`Alert - info Action Close Button 1`] = `
           >
             <TimesIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -749,7 +739,6 @@ exports[`Alert - info Action Link 1`] = `
       >
         <InfoCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -845,7 +834,6 @@ exports[`Alert - info Action and Title 1`] = `
       >
         <InfoCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -943,7 +931,6 @@ exports[`Alert - info Custom aria label 1`] = `
       >
         <InfoCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1035,7 +1022,6 @@ exports[`Alert - info Description 1`] = `
       >
         <InfoCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1098,7 +1084,6 @@ exports[`Alert - info Title 1`] = `
       >
         <InfoCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1163,7 +1148,6 @@ exports[`Alert - info inline variation 1`] = `
       >
         <InfoCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1233,7 +1217,6 @@ exports[`Alert - success Action Close Button 1`] = `
       >
         <CheckCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1300,7 +1283,6 @@ exports[`Alert - success Action Close Button 1`] = `
           >
             <TimesIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1354,7 +1336,6 @@ exports[`Alert - success Action Link 1`] = `
       >
         <CheckCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1450,7 +1431,6 @@ exports[`Alert - success Action and Title 1`] = `
       >
         <CheckCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1548,7 +1528,6 @@ exports[`Alert - success Custom aria label 1`] = `
       >
         <CheckCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1640,7 +1619,6 @@ exports[`Alert - success Description 1`] = `
       >
         <CheckCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1703,7 +1681,6 @@ exports[`Alert - success Title 1`] = `
       >
         <CheckCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1768,7 +1745,6 @@ exports[`Alert - success inline variation 1`] = `
       >
         <CheckCircleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1838,7 +1814,6 @@ exports[`Alert - warning Action Close Button 1`] = `
       >
         <ExclamationTriangleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1905,7 +1880,6 @@ exports[`Alert - warning Action Close Button 1`] = `
           >
             <TimesIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1959,7 +1933,6 @@ exports[`Alert - warning Action Link 1`] = `
       >
         <ExclamationTriangleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -2055,7 +2028,6 @@ exports[`Alert - warning Action and Title 1`] = `
       >
         <ExclamationTriangleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -2153,7 +2125,6 @@ exports[`Alert - warning Custom aria label 1`] = `
       >
         <ExclamationTriangleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -2245,7 +2216,6 @@ exports[`Alert - warning Description 1`] = `
       >
         <ExclamationTriangleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -2308,7 +2278,6 @@ exports[`Alert - warning Title 1`] = `
       >
         <ExclamationTriangleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -2373,7 +2342,6 @@ exports[`Alert - warning inline variation 1`] = `
       >
         <ExclamationTriangleIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
diff --git a/packages/patternfly-4/react-core/src/components/ApplicationLauncher/__snapshots__/ApplicationLauncher.test.js.snap b/packages/patternfly-4/react-core/src/components/ApplicationLauncher/__snapshots__/ApplicationLauncher.test.js.snap
index 57043bfbdb1..97e567c01d0 100644
--- a/packages/patternfly-4/react-core/src/components/ApplicationLauncher/__snapshots__/ApplicationLauncher.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/ApplicationLauncher/__snapshots__/ApplicationLauncher.test.js.snap
@@ -286,7 +286,6 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
       >
         <ThIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />
@@ -346,7 +345,6 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
             >
               <ThIcon
                 color="currentColor"
-                noVerticalAlign={false}
                 size="sm"
                 title={null}
               >
@@ -665,7 +663,6 @@ exports[`ApplicationLauncher dropup 1`] = `
       >
         <ThIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />
@@ -725,7 +722,6 @@ exports[`ApplicationLauncher dropup 1`] = `
             >
               <ThIcon
                 color="currentColor"
-                noVerticalAlign={false}
                 size="sm"
                 title={null}
               >
@@ -1044,7 +1040,6 @@ exports[`ApplicationLauncher expanded 1`] = `
       >
         <ThIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />
@@ -1104,7 +1099,6 @@ exports[`ApplicationLauncher expanded 1`] = `
             >
               <ThIcon
                 color="currentColor"
-                noVerticalAlign={false}
                 size="sm"
                 title={null}
               >
@@ -1681,7 +1675,6 @@ exports[`ApplicationLauncher regular 1`] = `
       >
         <ThIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />
@@ -1741,7 +1734,6 @@ exports[`ApplicationLauncher regular 1`] = `
             >
               <ThIcon
                 color="currentColor"
-                noVerticalAlign={false}
                 size="sm"
                 title={null}
               >
@@ -2060,7 +2052,6 @@ exports[`ApplicationLauncher right aligned 1`] = `
       >
         <ThIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />
@@ -2120,7 +2111,6 @@ exports[`ApplicationLauncher right aligned 1`] = `
             >
               <ThIcon
                 color="currentColor"
-                noVerticalAlign={false}
                 size="sm"
                 title={null}
               >
diff --git a/packages/patternfly-4/react-core/src/components/Breadcrumb/__snapshots__/BreadcrumbItem.test.tsx.snap b/packages/patternfly-4/react-core/src/components/Breadcrumb/__snapshots__/BreadcrumbItem.test.tsx.snap
index e30f4ed22ec..847784e33c7 100644
--- a/packages/patternfly-4/react-core/src/components/Breadcrumb/__snapshots__/BreadcrumbItem.test.tsx.snap
+++ b/packages/patternfly-4/react-core/src/components/Breadcrumb/__snapshots__/BreadcrumbItem.test.tsx.snap
@@ -18,7 +18,6 @@ exports[`BreadcrumbItem component should render breadcrumbItem with className 1`
   >
     <AngleRightIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
@@ -38,7 +37,6 @@ exports[`BreadcrumbItem component should render breadcrumbItem with custom eleme
   >
     <AngleRightIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
@@ -57,7 +55,6 @@ exports[`BreadcrumbItem component should render breadcrumbItem with id 1`] = `
   >
     <AngleRightIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
@@ -75,7 +72,6 @@ exports[`BreadcrumbItem component should render breadcrumbItem with target 1`] =
   >
     <AngleRightIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
@@ -93,7 +89,6 @@ exports[`BreadcrumbItem component should render default breadcrumbItem 1`] = `
   >
     <AngleRightIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
@@ -117,7 +112,6 @@ exports[`BreadcrumbItem component should render link breadcrumbItem 1`] = `
   >
     <AngleRightIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
diff --git a/packages/patternfly-4/react-core/src/components/ClipboardCopy/__snapshots__/CopyButton.test.js.snap b/packages/patternfly-4/react-core/src/components/ClipboardCopy/__snapshots__/CopyButton.test.js.snap
index 1d391d85575..d1ccfaee515 100644
--- a/packages/patternfly-4/react-core/src/components/ClipboardCopy/__snapshots__/CopyButton.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/ClipboardCopy/__snapshots__/CopyButton.test.js.snap
@@ -27,7 +27,6 @@ exports[`copy button render 1`] = `
   >
     <CopyIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
diff --git a/packages/patternfly-4/react-core/src/components/ClipboardCopy/__snapshots__/ToggleButton.test.js.snap b/packages/patternfly-4/react-core/src/components/ClipboardCopy/__snapshots__/ToggleButton.test.js.snap
index a2c1fbb0630..24cbc3ab3e0 100644
--- a/packages/patternfly-4/react-core/src/components/ClipboardCopy/__snapshots__/ToggleButton.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/ClipboardCopy/__snapshots__/ToggleButton.test.js.snap
@@ -14,7 +14,6 @@ exports[`toggle button render 1`] = `
     aria-hidden="true"
     className="pf-c-clipboard-copy__group-toggle-icon"
     color="currentColor"
-    noVerticalAlign={false}
     size="sm"
     title={null}
   />
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.d.ts b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.d.ts
deleted file mode 100644
index 4edddc55989..00000000000
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { FunctionComponent, ReactNode } from 'react';
-import { OneOf } from '../../helpers/typeUtils';
-
-export interface ContextSelectorProps {
-  children?: ReactNode;
-  isOpen?: boolean;
-  onToggle?(value: boolean): void;
-  onSelect?(event: React.SyntheticEvent<HTMLButtonElement>, value: ReactNode): void;
-  screenReaderLabel?: string;
-  toggleText?: string;
-  searchButtonAriaLabel?: string;
-  searchInputValue?: string;
-  onSearchInputChange?(value: string): void;
-  searchInputPlaceholder?: string;
-  onSearchButtonClick?(event: React.SyntheticEvent<HTMLButtonElement>): void;
-}
-
-declare const ContextSelector: FunctionComponent<ContextSelectorProps>;
-
-export default ContextSelector;
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.md b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.md
index 44b0d45e7af..92a3071b239 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.md
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.md
@@ -1,6 +1,7 @@
 ---
 title: 'Context selector'
 propComponents: ['ContextSelector', 'ContextSelectorItem']
+typescript: true
 ---
 
 import { ContextSelector, ContextSelectorItem } from '@patternfly/react-core';
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.test.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.test.tsx
similarity index 89%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.test.js
rename to packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.test.tsx
index 0c37498c512..3333c27f63c 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.test.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow, mount } from 'enzyme';
-import ContextSelector from './ContextSelector';
-import ContextSelectorItem from './ContextSelectorItem';
+import { ContextSelector } from './ContextSelector';
+import { ContextSelectorItem } from './ContextSelectorItem';
 
 const items = [
   <ContextSelectorItem key="0">My Project</ContextSelectorItem>,
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.tsx
similarity index 71%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js
rename to packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.tsx
index a3bce11b1fc..3cedc5c3a41 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.tsx
@@ -1,67 +1,71 @@
-import React from 'react';
-import styles from '@patternfly/react-styles/css/components/ContextSelector/context-selector';
+import * as React from 'react';
+import styles from '@patternfly/react-styles/css/components/ContextSelector/context-selector'
 import { css } from '@patternfly/react-styles';
-import PropTypes from 'prop-types';
-import FocusTrap from 'focus-trap-react';
 import { SearchIcon } from '@patternfly/react-icons';
-import ContextSelectorToggle from './ContextSelectorToggle';
-import ContextSelectorMenuList from './ContextSelectorMenuList';
+import { ContextSelectorToggle } from './ContextSelectorToggle';
+import { ContextSelectorMenuList } from './ContextSelectorMenuList';
 import { ContextSelectorContext } from './contextSelectorConstants';
 import { Button, ButtonVariant } from '../Button';
 import { TextInput } from '../TextInput';
 import { InputGroup } from '../InputGroup';
 import { KEY_CODES } from '../../helpers/constants';
 
+// Can't use ES6 imports :(
+// The types for it are also wrong, we should probably ditch this dependency.
+// tslint:disable-next-line
+const FocusTrap: any = require('focus-trap-react');
+
 // seed for the aria-labelledby ID
 let currentId = 0;
 const newId = currentId++;
 
-const propTypes = {
+export interface ContextSelectorProps {
   /** content rendered inside the Context Selector */
-  children: PropTypes.node,
+  children?: React.ReactNode;
   /** Classes applied to root element of Context Selector */
-  className: PropTypes.string,
+  className?: string;
   /** Flag to indicate if Context Selector is opened */
-  isOpen: PropTypes.bool,
+  isOpen?: boolean;
   /** Function callback called when user clicks toggle button */
-  onToggle: PropTypes.func,
+  onToggle?: (value: boolean) => void;
   /** Function callback called when user selects item */
-  onSelect: PropTypes.func,
+  onSelect?: (event: any, value: React.ReactNode) => void;
   /** Labels the Context Selector for Screen Readers */
-  screenReaderLabel: PropTypes.string,
+  screenReaderLabel?: string;
   /** Text that appears in the Context Selector Toggle */
-  toggleText: PropTypes.string,
+  toggleText?: string;
   /** aria-label for the Context Selector Search Button */
-  searchButtonAriaLabel: PropTypes.string,
+  searchButtonAriaLabel?: string;
   /** Value in the Search field */
-  searchInputValue: PropTypes.string,
+  searchInputValue?: string;
   /** Function callback called when user changes the Search Input */
-  onSearchInputChange: PropTypes.func,
+  onSearchInputChange?(value: string): void; 
   /** Search Input placeholder */
-  searchInputPlaceholder: PropTypes.string,
+  searchInputPlaceholder?: string;
   /** Function callback for when Search Button is clicked */
-  onSearchButtonClick: PropTypes.func
-};
+  onSearchButtonClick?(event?: React.SyntheticEvent<HTMLButtonElement>): void; 
+}
+
+export class ContextSelector extends React.Component<ContextSelectorProps> {
 
-const defaultProps = {
-  children: null,
-  className: '',
-  isOpen: false,
-  onToggle: () => {},
-  onSelect: () => {},
-  screenReaderLabel: '',
-  toggleText: '',
-  searchButtonAriaLabel: 'Search menu items',
-  searchInputValue: '',
-  onSearchInputChange: () => {},
-  searchInputPlaceholder: 'Search',
-  onSearchButtonClick: () => {}
-};
+  static defaultProps = {
+    children: null as React.ReactNode,
+    className: '',
+    isOpen: false,
+    onToggle: () => undefined as any,
+    onSelect: () => undefined as any,
+    screenReaderLabel: '',
+    toggleText: '',
+    searchButtonAriaLabel: 'Search menu items',
+    searchInputValue: '',
+    onSearchInputChange: () => undefined as any,
+    searchInputPlaceholder: 'Search',
+    onSearchButtonClick: () => undefined as any
+  }
 
-class ContextSelector extends React.Component {
-  parentRef = React.createRef();
+  parentRef: React.RefObject<HTMLDivElement> = React.createRef();
 
-  onEnterPressed = event => {
+  onEnterPressed = (event: any) => {
     if (event.charCode === KEY_CODES.ENTER) {
       this.props.onSearchButtonClick();
     }
@@ -140,8 +144,3 @@ class ContextSelector extends React.Component {
     );
   }
 }
-
-ContextSelector.propTypes = propTypes;
-ContextSelector.defaultProps = defaultProps;
-
-export default ContextSelector;
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.d.ts b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.d.ts
deleted file mode 100644
index 8daec453c25..00000000000
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { FunctionComponent, HTMLProps, ReactType } from 'react';
-
-export interface ContextSelectorItemProps {
-  isDisabled?: boolean;
-  isSelected?: boolean;
-  isHovered?: boolean;
-  onClick?: Function;
-}
-
-declare const ContextSelectorItem: FunctionComponent<ContextSelectorItemProps>;
-
-export default ContextSelectorItem;
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.test.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.test.tsx
similarity index 83%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.test.js
rename to packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.test.tsx
index ac165f7e5fc..996ad870ae9 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.test.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.test.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import { shallow, mount } from 'enzyme';
-import ContextSelectorItem from './ContextSelectorItem';
+import { ContextSelectorItem } from './ContextSelectorItem';
 
 test('Renders ContextSelectorItem', () => {
   const view = shallow(
-    <ContextSelectorItem sendRef={jest.fn()} index="0">
+    <ContextSelectorItem sendRef={jest.fn()} index={0}>
       My Project
     </ContextSelectorItem>
   );
@@ -13,7 +13,7 @@ test('Renders ContextSelectorItem', () => {
 
 test('Renders ContextSelectorItem disabled and hovered', () => {
   const view = shallow(
-    <ContextSelectorItem isDisabled isHovered sendRef={jest.fn()} index="0">
+    <ContextSelectorItem isDisabled isHovered sendRef={jest.fn()} index={0}>
       My Project
     </ContextSelectorItem>
   );
@@ -23,7 +23,7 @@ test('Renders ContextSelectorItem disabled and hovered', () => {
 test('Verify onClick is called ', () => {
   const mockfn = jest.fn();
   const view = mount(
-    <ContextSelectorItem isHovered onClick={mockfn} sendRef={jest.fn()} index="0">
+    <ContextSelectorItem isHovered onClick={mockfn} sendRef={jest.fn()} index={0}>
       My Project
     </ContextSelectorItem>
   );
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.tsx
similarity index 62%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.js
rename to packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.tsx
index fcce248005e..8564583cb99 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorItem.tsx
@@ -1,40 +1,38 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/ContextSelector/context-selector';
 import { css } from '@patternfly/react-styles';
 import { ContextSelectorContext } from './contextSelectorConstants';
 
-const propTypes = {
+export interface ContextSelectorItemProps {
   /** Anything which can be rendered as Context Selector item */
-  children: PropTypes.node,
+  children?: React.ReactNode; 
   /** Classes applied to root element of the Context Selector item */
-  className: PropTypes.string,
+  className?: string; 
   /** Render Context  Selector item as disabled */
-  isDisabled: PropTypes.bool,
+  isDisabled?: boolean; 
+  // isSelected?
   /** Forces display of the hover state of the element */
-  isHovered: PropTypes.bool,
+  isHovered?: boolean; 
   /** Callback for click event */
-  onClick: PropTypes.func,
+  onClick: (event: React.MouseEvent) => void; 
   /** internal index of the item */
-  index: PropTypes.number,
+  index: number; 
   /** Internal callback for ref tracking */
-  sendRef: PropTypes.func,
-  /** Additional props are spread to the button element */
-  '': PropTypes.any // eslint-disable-line react/require-default-props
-};
-
-const defaultProps = {
-  children: null,
-  className: '',
-  isHovered: false,
-  isDisabled: false,
-  onClick: () => {},
-  index: undefined,
-  sendRef: Function.prototype
-};
+  sendRef: (index: number, current: any) => void; 
+}
 
-class ContextSelectorItem extends React.Component {
-  ref = React.createRef();
+export class ContextSelectorItem extends React.Component<ContextSelectorItemProps>{
+  static defaultProps = {
+    children: null as React.ReactNode,
+    className: '',
+    isHovered: false,
+    isDisabled: false,
+    onClick: (): any => undefined,
+    index: undefined as number,
+    sendRef: Function.prototype
+  }
+  
+  ref: React.RefObject<HTMLButtonElement> = React.createRef();
 
   componentDidMount() {
     /* eslint-disable-next-line */
@@ -57,8 +55,8 @@ class ContextSelectorItem extends React.Component {
               ref={this.ref}
               onClick={event => {
                 if (!isDisabled) {
-                  onClick && onClick(event);
-                  onSelect && onSelect(event, children);
+                  onClick(event);
+                  onSelect(event, children);
                 }
               }}
               {...props}
@@ -71,8 +69,3 @@ class ContextSelectorItem extends React.Component {
     );
   }
 }
-
-ContextSelectorItem.propTypes = propTypes;
-ContextSelectorItem.defaultProps = defaultProps;
-
-export default ContextSelectorItem;
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.js
deleted file mode 100644
index d989a4ecf98..00000000000
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import styles from '@patternfly/react-styles/css/components/ContextSelector/context-selector';
-import { css } from '@patternfly/react-styles';
-
-const propTypes = {
-  /** Content rendered inside the Context Selector Menu */
-  children: PropTypes.node,
-  /** Classess applied to root element of Context Selector menu */
-  className: PropTypes.string,
-  /** Flag to indicate if Context Selector menu is opened */
-  isOpen: PropTypes.bool,
-  /** Additional props are spread to the container component */
-  '': PropTypes.any // eslint-disable-line react/require-default-props
-};
-
-const defaultProps = {
-  children: null,
-  className: '',
-  isOpen: true
-};
-
-class ContextSelectorMenuList extends React.Component {
-  refsCollection = [];
-
-  sendRef = (index, ref) => {
-    this.refsCollection[index] = ref;
-  };
-
-  extendChildren() {
-    return React.Children.map(this.props.children, (child, index) =>
-      React.cloneElement(child, {
-        sendRef: this.sendRef,
-        index
-      })
-    );
-  }
-
-  render() {
-    const { className, isOpen, children, ...props } = this.props;
-
-    return (
-      <ul className={css(styles.contextSelectorMenuList, className)} hidden={!isOpen} role="menu" {...props}>
-        {this.extendChildren()}
-      </ul>
-    );
-  }
-}
-
-ContextSelectorMenuList.propTypes = propTypes;
-ContextSelectorMenuList.defaultProps = defaultProps;
-
-export default ContextSelectorMenuList;
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.test.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.test.tsx
similarity index 69%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.test.js
rename to packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.test.tsx
index 88a2993ccf8..1db53b46de0 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.test.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import ContextSelectorItem from './ContextSelectorItem';
-import ContextSelectorMenuList from './ContextSelectorMenuList';
+import { ContextSelectorItem } from './ContextSelectorItem';
+import { ContextSelectorMenuList } from './ContextSelectorMenuList';
 
 const items = [
   <ContextSelectorItem key="0">My Project</ContextSelectorItem>,
@@ -13,7 +13,7 @@ const items = [
 
 test('Renders ContextSelectorMenuList open', () => {
   const view = shallow(
-    <ContextSelectorMenuList isOpen openedOnEnter={false}>
+    <ContextSelectorMenuList isOpen={false}>
       {items}
     </ContextSelectorMenuList>
   );
@@ -21,6 +21,9 @@ test('Renders ContextSelectorMenuList open', () => {
 });
 
 test('Renders ContextSelectorMenuList closed', () => {
-  const view = shallow(<ContextSelectorMenuList openedOnEnter={false}>{items}</ContextSelectorMenuList>);
+  const view = shallow(
+    <ContextSelectorMenuList isOpen={false}>
+      {items}
+    </ContextSelectorMenuList>);
   expect(view).toMatchSnapshot();
 });
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.tsx b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.tsx
new file mode 100644
index 00000000000..db590237578
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorMenuList.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react';
+import styles from '@patternfly/react-styles/css/components/ContextSelector/context-selector';
+import { css } from '@patternfly/react-styles';
+
+export interface ContextSelectorMenuListProps {
+  /** Content rendered inside the Context Selector Menu */
+  children?: React.ReactNode;
+  /** Classess applied to root element of Context Selector menu */
+  className?: string; 
+  /** Flag to indicate if Context Selector menu is opened */
+  isOpen?: boolean; 
+}
+
+export class ContextSelectorMenuList extends React.Component<ContextSelectorMenuListProps> {
+
+  static defaultProps = {
+    children: null as React.ReactNode,
+    className: '',
+    isOpen: true
+  }
+
+  refsCollection = [] as any;
+
+  sendRef = (index: number, ref: any) => {
+    this.refsCollection[index] = ref;
+  };
+
+  extendChildren() {
+    return React.Children.map(this.props.children, (child, index) =>
+      React.cloneElement(child as React.ReactElement<any>, {
+        sendRef: this.sendRef,
+        index
+      })
+    );
+  }
+
+  render = () => {
+    const { 
+      className, 
+      isOpen, 
+      children, 
+      ...props 
+    } = this.props;
+    return (
+      <ul className={css(styles.contextSelectorMenuList, className)} hidden={!isOpen} role="menu" {...props}>
+        {this.extendChildren()}
+      </ul>
+    );
+  }
+}
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.test.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.test.tsx
similarity index 95%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.test.js
rename to packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.test.tsx
index 71d1c50fad7..7b0fc303272 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.test.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow, mount } from 'enzyme';
-import ContextSelectorToggle from './ContextSelectorToggle';
+import { ContextSelectorToggle } from './ContextSelectorToggle';
 
 test('Renders ContextSelectorToggle', () => {
   const view = shallow(<ContextSelectorToggle id="toggle-id" />);
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.tsx
similarity index 66%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.js
rename to packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.tsx
index 5b0d38928ad..8c7a167c379 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelectorToggle.tsx
@@ -1,48 +1,47 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import * as React from 'react';
 import { CaretDownIcon } from '@patternfly/react-icons';
 import styles from '@patternfly/react-styles/css/components/ContextSelector/context-selector';
 import { css } from '@patternfly/react-styles';
 import { KEY_CODES } from '../../helpers/constants';
 
-const propTypes = {
+export interface ContextSelectorToggleProps {
   /** HTML ID of toggle */
-  id: PropTypes.string.isRequired,
+  id: string;
   /** Classes applied to root element of toggle */
-  className: PropTypes.string,
+  className?: string; 
   /** Text that appears in the Context Selector Toggle */
-  toggleText: PropTypes.string,
+  toggleText?: string; 
   /** Flag to indicate if menu is opened */
-  isOpen: PropTypes.bool,
+  isOpen?: boolean; 
   /** Callback called when toggle is clicked */
-  onToggle: PropTypes.func,
+  onToggle?: (event: any, value: boolean) => void;
   /** Callback for toggle open on keyboard entry */
-  onEnter: PropTypes.func,
+  onEnter: () => void; 
   /** Element which wraps toggle */
-  parentRef: PropTypes.any,
+  parentRef?: any; 
   /** Forces focus state */
-  isFocused: PropTypes.bool,
+  isFocused?: boolean; 
   /** Forces hover state */
-  isHovered: PropTypes.bool,
+  isHovered?: boolean;
   /** Forces active state */
-  isActive: PropTypes.bool,
-  /** Additional props are spread to the container <button> */
-  '': PropTypes.any // eslint-disable-line react/require-default-props
-};
+  isActive?: boolean; 
+}
+
+export class ContextSelectorToggle extends React.Component<ContextSelectorToggleProps> {
+  static defaultProps = {
+    className: '',
+    toggleText: '',
+    isOpen: false,
+    onEnter: () => undefined as any,
+    parentRef: null as any,
+    isFocused: false,
+    isHovered: false,
+    isActive: false,
+    onToggle: (event: any, value: boolean) => undefined as any 
+  };
 
-const defaultProps = {
-  className: '',
-  toggleText: '',
-  isOpen: false,
-  onEnter: () => {},
-  parentRef: null,
-  isFocused: false,
-  isHovered: false,
-  isActive: false,
-  onToggle: () => {}
-};
+  toggle: React.RefObject<HTMLButtonElement> = React.createRef();
 
-class ContextSelectorToggle extends Component {
   componentDidMount = () => {
     document.addEventListener('mousedown', this.onDocClick);
     document.addEventListener('touchstart', this.onDocClick);
@@ -55,34 +54,34 @@ class ContextSelectorToggle extends Component {
     document.removeEventListener('keydown', this.onEscPress);
   };
 
-  onDocClick = event => {
+  onDocClick = (event: any) => {
     const { isOpen, parentRef, onToggle } = this.props;
     if (isOpen && parentRef && !parentRef.contains(event.target)) {
-      onToggle && onToggle(false);
-      this.toggle.focus();
+      onToggle(null, false);
+      this.toggle.current.focus();
     }
   };
 
-  onEscPress = event => {
+  onEscPress = (event: any) => {
     const { isOpen, parentRef, onToggle } = this.props;
     const keyCode = event.keyCode || event.which;
     if (isOpen && keyCode === KEY_CODES.ESCAPE_KEY && parentRef && parentRef.contains(event.target)) {
-      onToggle && onToggle(false);
-      this.toggle.focus();
+      onToggle(null, false);
+      this.toggle.current.focus();
     }
   };
 
-  onKeyDown = event => {
+  onKeyDown = (event: any) => {
     const { isOpen, onToggle, onEnter } = this.props;
-    if ((event.keyCode === KEY_CODES.TAB && !isOpen) || event.key !== KEY_CODES.ENTER) return;
+    if ((event.keyCode === KEY_CODES.TAB && !isOpen) || event.key !== KEY_CODES.ENTER) { return };
     event.preventDefault();
     if (
       (event.keyCode === KEY_CODES.TAB || event.keyCode === KEY_CODES.ENTER || event.key !== KEY_CODES.SPACE) &&
       isOpen
     ) {
-      onToggle(!isOpen);
+      onToggle(null, !isOpen);
     } else if ((event.keyCode === KEY_CODES.ENTER || event.key === ' ') && !isOpen) {
-      onToggle(!isOpen);
+      onToggle(null, !isOpen);
       onEnter();
     }
   };
@@ -105,9 +104,7 @@ class ContextSelectorToggle extends Component {
       <button
         {...props}
         id={id}
-        ref={toggle => {
-          this.toggle = toggle;
-        }}
+        ref={this.toggle}
         className={css(
           styles.contextSelectorToggle,
           isFocused && styles.modifiers.focus,
@@ -116,9 +113,7 @@ class ContextSelectorToggle extends Component {
           className
         )}
         type="button"
-        onClick={event => {
-          onToggle && onToggle(event, !isOpen);
-        }}
+        onClick={event => onToggle(event, !isOpen)}
         aria-expanded={isOpen}
         onKeyDown={this.onKeyDown}
       >
@@ -127,9 +122,4 @@ class ContextSelectorToggle extends Component {
       </button>
     );
   }
-}
-
-ContextSelectorToggle.propTypes = propTypes;
-ContextSelectorToggle.defaultProps = defaultProps;
-
-export default ContextSelectorToggle;
+}
\ No newline at end of file
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelector.test.js.snap b/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelector.test.tsx.snap
similarity index 99%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelector.test.js.snap
rename to packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelector.test.tsx.snap
index ca876950c62..50b4e78b02b 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelector.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelector.test.tsx.snap
@@ -80,7 +80,6 @@ exports[`Renders ContextSelector open 1`] = `
             <SearchIcon
               aria-hidden="true"
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             />
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorItem.test.js.snap b/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorItem.test.tsx.snap
similarity index 100%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorItem.test.js.snap
rename to packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorItem.test.tsx.snap
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorMenuList.test.js.snap b/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorMenuList.test.tsx.snap
similarity index 96%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorMenuList.test.js.snap
rename to packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorMenuList.test.tsx.snap
index 7f046c60d19..1f2525ffafe 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorMenuList.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorMenuList.test.tsx.snap
@@ -3,8 +3,7 @@
 exports[`Renders ContextSelectorMenuList closed 1`] = `
 <ul
   className="pf-c-context-selector__menu-list"
-  hidden={false}
-  openedOnEnter={false}
+  hidden={true}
   role="menu"
 >
   <ContextSelectorItem
@@ -68,8 +67,7 @@ exports[`Renders ContextSelectorMenuList closed 1`] = `
 exports[`Renders ContextSelectorMenuList open 1`] = `
 <ul
   className="pf-c-context-selector__menu-list"
-  hidden={false}
-  openedOnEnter={false}
+  hidden={true}
   role="menu"
 >
   <ContextSelectorItem
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorToggle.test.js.snap b/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorToggle.test.tsx.snap
similarity index 97%
rename from packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorToggle.test.js.snap
rename to packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorToggle.test.tsx.snap
index e3a2047118e..88c5660c8af 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorToggle.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/__snapshots__/ContextSelectorToggle.test.tsx.snap
@@ -16,7 +16,6 @@ exports[`Renders ContextSelectorToggle 1`] = `
     aria-hidden={true}
     className="pf-c-context-selector__toggle-icon"
     color="currentColor"
-    noVerticalAlign={false}
     size="sm"
     title={null}
   />
@@ -51,7 +50,6 @@ exports[`Verify ESC press  1`] = `
       aria-hidden={true}
       className="pf-c-context-selector__toggle-icon"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     >
@@ -108,7 +106,6 @@ exports[`Verify ESC press with not isOpen 1`] = `
       aria-hidden={true}
       className="pf-c-context-selector__toggle-icon"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     >
@@ -165,7 +162,6 @@ exports[`Verify keydown enter  1`] = `
       aria-hidden={true}
       className="pf-c-context-selector__toggle-icon"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     >
@@ -222,7 +218,6 @@ exports[`Verify keydown tab  1`] = `
       aria-hidden={true}
       className="pf-c-context-selector__toggle-icon"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     >
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/contextSelectorConstants.js b/packages/patternfly-4/react-core/src/components/ContextSelector/contextSelectorConstants.js
deleted file mode 100644
index c566379c630..00000000000
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/contextSelectorConstants.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react';
-
-export const ContextSelectorContext = React.createContext({
-  onSelect: () => {}
-});
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/contextSelectorConstants.tsx b/packages/patternfly-4/react-core/src/components/ContextSelector/contextSelectorConstants.tsx
new file mode 100644
index 00000000000..4da4958db7c
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/contextSelectorConstants.tsx
@@ -0,0 +1,5 @@
+import * as React from 'react';
+
+export const ContextSelectorContext = React.createContext({
+  onSelect: (event: any, value: React.ReactNode): any => undefined 
+});
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/index.d.ts b/packages/patternfly-4/react-core/src/components/ContextSelector/index.d.ts
deleted file mode 100644
index a69dda91f4f..00000000000
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/index.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as ContextSelector, ContextSelectorProps } from './ContextSelector';
-export { default as ContextSelectorItem, ContextSelectorItemProps } from './ContextSelectorItem';
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/index.js b/packages/patternfly-4/react-core/src/components/ContextSelector/index.js
deleted file mode 100644
index 92122688a86..00000000000
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as ContextSelector } from './ContextSelector';
-export { default as ContextSelectorItem } from './ContextSelectorItem';
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/index.ts b/packages/patternfly-4/react-core/src/components/ContextSelector/index.ts
new file mode 100644
index 00000000000..a34ba322f81
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/index.ts
@@ -0,0 +1,2 @@
+export * from './ContextSelector';
+export * from './ContextSelectorItem';
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
index 0046014a3ba..a1aedffb601 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
@@ -100,7 +100,6 @@ exports[`KebabToggle basic 1`] = `
           >
             <EllipsisVIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -508,7 +507,6 @@ exports[`KebabToggle dropup + right aligned 1`] = `
           >
             <EllipsisVIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -888,7 +886,6 @@ exports[`KebabToggle dropup 1`] = `
           >
             <EllipsisVIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1268,7 +1265,6 @@ exports[`KebabToggle expanded 1`] = `
           >
             <EllipsisVIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1906,7 +1902,6 @@ exports[`KebabToggle plain 1`] = `
           >
             <EllipsisVIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2286,7 +2281,6 @@ exports[`KebabToggle regular 1`] = `
           >
             <EllipsisVIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2666,7 +2660,6 @@ exports[`KebabToggle right aligned 1`] = `
           >
             <EllipsisVIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2803,7 +2796,6 @@ exports[`dropdown basic 1`] = `
             <CaretDownIcon
               className="pf-c-dropdown__toggle-icon"
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -3217,7 +3209,6 @@ exports[`dropdown dropup + right aligned 1`] = `
             <CaretDownIcon
               className="pf-c-dropdown__toggle-icon"
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -3603,7 +3594,6 @@ exports[`dropdown dropup 1`] = `
             <CaretDownIcon
               className="pf-c-dropdown__toggle-icon"
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -3989,7 +3979,6 @@ exports[`dropdown expanded 1`] = `
             <CaretDownIcon
               className="pf-c-dropdown__toggle-icon"
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -4633,7 +4622,6 @@ exports[`dropdown regular 1`] = `
             <CaretDownIcon
               className="pf-c-dropdown__toggle-icon"
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -5019,7 +5007,6 @@ exports[`dropdown right aligned 1`] = `
             <CaretDownIcon
               className="pf-c-dropdown__toggle-icon"
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownToggle.test.js.snap b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownToggle.test.js.snap
index 0e3a49fc0ca..cc2706ccf32 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownToggle.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownToggle.test.js.snap
@@ -45,7 +45,6 @@ exports[`state active 1`] = `
       <CaretDownIcon
         className="pf-c-dropdown__toggle-icon"
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -120,7 +119,6 @@ exports[`state focus 1`] = `
       <CaretDownIcon
         className="pf-c-dropdown__toggle-icon"
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -195,7 +193,6 @@ exports[`state hover 1`] = `
       <CaretDownIcon
         className="pf-c-dropdown__toggle-icon"
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Toggle.test.js.snap b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Toggle.test.js.snap
index 39c8e7c2659..0e70cdbbd6d 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Toggle.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Toggle.test.js.snap
@@ -45,7 +45,6 @@ exports[`Dropdown toggle 1`] = `
       <CaretDownIcon
         className="pf-c-dropdown__toggle-icon"
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -117,7 +116,6 @@ exports[`Kebab toggle 1`] = `
     >
       <EllipsisVIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
diff --git a/packages/patternfly-4/react-core/src/components/Expandable/__snapshots__/Expandable.test.tsx.snap b/packages/patternfly-4/react-core/src/components/Expandable/__snapshots__/Expandable.test.tsx.snap
index 88a87ebbb0a..b0affdc881a 100644
--- a/packages/patternfly-4/react-core/src/components/Expandable/__snapshots__/Expandable.test.tsx.snap
+++ b/packages/patternfly-4/react-core/src/components/Expandable/__snapshots__/Expandable.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`Expandable 1`] = `
       aria-hidden={true}
       className="pf-c-expandable__toggle-icon"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
@@ -41,7 +40,6 @@ exports[`Renders Expandable expanded 1`] = `
       aria-hidden={true}
       className="pf-c-expandable__toggle-icon"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
diff --git a/packages/patternfly-4/react-core/src/components/Modal/__snapshots__/ModalBoxCloseButton.test.tsx.snap b/packages/patternfly-4/react-core/src/components/Modal/__snapshots__/ModalBoxCloseButton.test.tsx.snap
index 017023e98f8..9d90add6d9f 100644
--- a/packages/patternfly-4/react-core/src/components/Modal/__snapshots__/ModalBoxCloseButton.test.tsx.snap
+++ b/packages/patternfly-4/react-core/src/components/Modal/__snapshots__/ModalBoxCloseButton.test.tsx.snap
@@ -10,7 +10,6 @@ exports[`ModalBoxCloseButton Test 1`] = `
   >
     <TimesIcon
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     />
diff --git a/packages/patternfly-4/react-core/src/components/Nav/__snapshots__/Nav.test.tsx.snap b/packages/patternfly-4/react-core/src/components/Nav/__snapshots__/Nav.test.tsx.snap
index e4ad4bdd820..f808c431627 100644
--- a/packages/patternfly-4/react-core/src/components/Nav/__snapshots__/Nav.test.tsx.snap
+++ b/packages/patternfly-4/react-core/src/components/Nav/__snapshots__/Nav.test.tsx.snap
@@ -241,7 +241,6 @@ exports[`Expandable Nav List - Trigger toggle 1`] = `
                 <AngleRightIcon
                   aria-hidden="true"
                   color="currentColor"
-                  noVerticalAlign={false}
                   size="sm"
                   title={null}
                 >
@@ -402,7 +401,6 @@ exports[`Expandable Nav List 1`] = `
                 <AngleRightIcon
                   aria-hidden="true"
                   color="currentColor"
-                  noVerticalAlign={false}
                   size="sm"
                   title={null}
                 >
@@ -563,7 +561,6 @@ exports[`Expandable Nav List with aria label 1`] = `
                 <AngleRightIcon
                   aria-hidden="true"
                   color="currentColor"
-                  noVerticalAlign={false}
                   size="sm"
                   title={null}
                 >
@@ -705,7 +702,6 @@ exports[`Horizontal Nav List 1`] = `
       >
         <AngleLeftIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -809,7 +805,6 @@ exports[`Horizontal Nav List 1`] = `
       >
         <AngleRightIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1076,7 +1071,6 @@ exports[`Nav List with custom item nodes 1`] = `
       >
         <AngleLeftIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1128,7 +1122,6 @@ exports[`Nav List with custom item nodes 1`] = `
       >
         <AngleRightIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1276,7 +1269,6 @@ exports[`Tertiary Nav List 1`] = `
       >
         <AngleLeftIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1380,7 +1372,6 @@ exports[`Tertiary Nav List 1`] = `
       >
         <AngleRightIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
diff --git a/packages/patternfly-4/react-core/src/components/OptionsMenu/__snapshots__/OptionsMenu.test.js.snap b/packages/patternfly-4/react-core/src/components/OptionsMenu/__snapshots__/OptionsMenu.test.js.snap
index a6094ee1339..7f9b62a884a 100644
--- a/packages/patternfly-4/react-core/src/components/OptionsMenu/__snapshots__/OptionsMenu.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/OptionsMenu/__snapshots__/OptionsMenu.test.js.snap
@@ -64,7 +64,6 @@ exports[`optionsMenu expanded 1`] = `
           aria-hidden={true}
           className="pf-c-options-menu__toggle-icon"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -123,7 +122,6 @@ exports[`optionsMenu expanded 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
@@ -171,7 +169,6 @@ exports[`optionsMenu expanded 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
@@ -220,7 +217,6 @@ exports[`optionsMenu expanded 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
@@ -268,7 +264,6 @@ exports[`optionsMenu expanded 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
@@ -335,7 +330,6 @@ exports[`optionsMenu expanded 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
@@ -383,7 +377,6 @@ exports[`optionsMenu expanded 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
@@ -483,7 +476,6 @@ exports[`optionsMenu open up 1`] = `
           aria-hidden={true}
           className="pf-c-options-menu__toggle-icon"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -575,7 +567,6 @@ exports[`optionsMenu plain 1`] = `
           aria-hidden={true}
           className="pf-c-options-menu__toggle-icon"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -669,7 +660,6 @@ exports[`optionsMenu regular 1`] = `
           aria-hidden={true}
           className="pf-c-options-menu__toggle-icon"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -765,7 +755,6 @@ exports[`optionsMenu right aligned + open up 1`] = `
           aria-hidden={true}
           className="pf-c-options-menu__toggle-icon"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -860,7 +849,6 @@ exports[`optionsMenu right aligned 1`] = `
           aria-hidden={true}
           className="pf-c-options-menu__toggle-icon"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
diff --git a/packages/patternfly-4/react-core/src/components/Page/PageHeader.d.ts b/packages/patternfly-4/react-core/src/components/Page/PageHeader.d.ts
index cbe3c9a09dd..9b9bcb492aa 100644
--- a/packages/patternfly-4/react-core/src/components/Page/PageHeader.d.ts
+++ b/packages/patternfly-4/react-core/src/components/Page/PageHeader.d.ts
@@ -7,7 +7,7 @@ export interface PageHeaderProps extends HTMLProps<HTMLDivElement> {
   toolbar?: ReactNode;
   avatar?: ReactNode;
   topNav?: ReactNode;
-  linkComponent?: ReactNode;
+  logoComponent?: ReactNode;
   showNavToggle?: boolean;
   isNavOpen?: boolean;
   onNavToggle?: Function;
diff --git a/packages/patternfly-4/react-core/src/components/Page/__snapshots__/Page.test.js.snap b/packages/patternfly-4/react-core/src/components/Page/__snapshots__/Page.test.js.snap
index 3aec120b09c..2b6a333af43 100644
--- a/packages/patternfly-4/react-core/src/components/Page/__snapshots__/Page.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Page/__snapshots__/Page.test.js.snap
@@ -458,7 +458,6 @@ exports[`Check page to verify skip to content is created 1`] = `
                   >
                     <AngleRightIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
@@ -503,7 +502,6 @@ exports[`Check page to verify skip to content is created 1`] = `
                   >
                     <AngleRightIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
@@ -548,7 +546,6 @@ exports[`Check page to verify skip to content is created 1`] = `
                   >
                     <AngleRightIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     >
diff --git a/packages/patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.js.snap b/packages/patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.js.snap
index 622cb37aa61..3366e4b59ed 100644
--- a/packages/patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.js.snap
@@ -133,7 +133,6 @@ exports[`component render custom pagination toggle 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -235,7 +234,6 @@ exports[`component render custom pagination toggle 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -384,7 +382,6 @@ exports[`component render custom pagination toggle 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -460,7 +457,6 @@ exports[`component render custom pagination toggle 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -505,7 +501,6 @@ exports[`component render custom pagination toggle 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -571,7 +566,6 @@ exports[`component render custom pagination toggle 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -616,7 +610,6 @@ exports[`component render custom pagination toggle 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -910,7 +903,6 @@ exports[`component render custom perPageOptions 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -986,7 +978,6 @@ exports[`component render custom perPageOptions 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1031,7 +1022,6 @@ exports[`component render custom perPageOptions 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1097,7 +1087,6 @@ exports[`component render custom perPageOptions 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1142,7 +1131,6 @@ exports[`component render custom perPageOptions 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1307,7 +1295,6 @@ exports[`component render custom start end 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -1409,7 +1396,6 @@ exports[`component render custom start end 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -1576,7 +1562,6 @@ exports[`component render custom start end 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -1652,7 +1637,6 @@ exports[`component render custom start end 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1697,7 +1681,6 @@ exports[`component render custom start end 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1763,7 +1746,6 @@ exports[`component render custom start end 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -1808,7 +1790,6 @@ exports[`component render custom start end 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2055,7 +2036,6 @@ exports[`component render empty per page options 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2100,7 +2080,6 @@ exports[`component render empty per page options 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2166,7 +2145,6 @@ exports[`component render empty per page options 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2211,7 +2189,6 @@ exports[`component render empty per page options 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2376,7 +2353,6 @@ exports[`component render last page 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -2478,7 +2454,6 @@ exports[`component render last page 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -2645,7 +2620,6 @@ exports[`component render last page 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -2721,7 +2695,6 @@ exports[`component render last page 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2766,7 +2739,6 @@ exports[`component render last page 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2832,7 +2804,6 @@ exports[`component render last page 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -2877,7 +2848,6 @@ exports[`component render last page 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -3058,7 +3028,6 @@ exports[`component render limited number of pages 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -3160,7 +3129,6 @@ exports[`component render limited number of pages 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -3311,7 +3279,6 @@ exports[`component render limited number of pages 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -3387,7 +3354,6 @@ exports[`component render limited number of pages 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -3432,7 +3398,6 @@ exports[`component render limited number of pages 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -3498,7 +3463,6 @@ exports[`component render limited number of pages 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -3543,7 +3507,6 @@ exports[`component render limited number of pages 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -3708,7 +3671,6 @@ exports[`component render no items 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -3810,7 +3772,6 @@ exports[`component render no items 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -3977,7 +3938,6 @@ exports[`component render no items 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -4053,7 +4013,6 @@ exports[`component render no items 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -4098,7 +4057,6 @@ exports[`component render no items 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -4164,7 +4122,6 @@ exports[`component render no items 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -4209,7 +4166,6 @@ exports[`component render no items 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -4369,7 +4325,6 @@ exports[`component render should render correctly bottom 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -4471,7 +4426,6 @@ exports[`component render should render correctly bottom 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -4638,7 +4592,6 @@ exports[`component render should render correctly bottom 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -4714,7 +4667,6 @@ exports[`component render should render correctly bottom 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -4759,7 +4711,6 @@ exports[`component render should render correctly bottom 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -4825,7 +4776,6 @@ exports[`component render should render correctly bottom 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -4870,7 +4820,6 @@ exports[`component render should render correctly bottom 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -5035,7 +4984,6 @@ exports[`component render should render correctly top 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -5137,7 +5085,6 @@ exports[`component render should render correctly top 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -5304,7 +5251,6 @@ exports[`component render should render correctly top 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -5380,7 +5326,6 @@ exports[`component render should render correctly top 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -5425,7 +5370,6 @@ exports[`component render should render correctly top 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -5491,7 +5435,6 @@ exports[`component render should render correctly top 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -5536,7 +5479,6 @@ exports[`component render should render correctly top 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -5692,7 +5634,6 @@ exports[`component render titles 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -5794,7 +5735,6 @@ exports[`component render titles 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -5961,7 +5901,6 @@ exports[`component render titles 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -6037,7 +5976,6 @@ exports[`component render titles 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -6082,7 +6020,6 @@ exports[`component render titles 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -6148,7 +6085,6 @@ exports[`component render titles 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -6193,7 +6129,6 @@ exports[`component render titles 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -6358,7 +6293,6 @@ exports[`component render up drop direction 1`] = `
                 >
                   <CheckIcon
                     color="currentColor"
-                    noVerticalAlign={false}
                     size="sm"
                     title={null}
                   />
@@ -6460,7 +6394,6 @@ exports[`component render up drop direction 1`] = `
                   >
                     <CheckIcon
                       color="currentColor"
-                      noVerticalAlign={false}
                       size="sm"
                       title={null}
                     />
@@ -6627,7 +6560,6 @@ exports[`component render up drop direction 1`] = `
                         <CaretDownIcon
                           className=""
                           color="currentColor"
-                          noVerticalAlign={false}
                           size="sm"
                           title={null}
                         >
@@ -6703,7 +6635,6 @@ exports[`component render up drop direction 1`] = `
           >
             <AngleDoubleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -6748,7 +6679,6 @@ exports[`component render up drop direction 1`] = `
           >
             <AngleLeftIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -6814,7 +6744,6 @@ exports[`component render up drop direction 1`] = `
           >
             <AngleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
@@ -6859,7 +6788,6 @@ exports[`component render up drop direction 1`] = `
           >
             <AngleDoubleRightIcon
               color="currentColor"
-              noVerticalAlign={false}
               size="sm"
               title={null}
             >
diff --git a/packages/patternfly-4/react-core/src/components/Progress/__snapshots__/Progress.test.js.snap b/packages/patternfly-4/react-core/src/components/Progress/__snapshots__/Progress.test.js.snap
index 90812a1bca3..5a443664318 100644
--- a/packages/patternfly-4/react-core/src/components/Progress/__snapshots__/Progress.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Progress/__snapshots__/Progress.test.js.snap
@@ -735,7 +735,6 @@ exports[`Progress variant danger 1`] = `
         >
           <TimesCircleIcon
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -939,7 +938,6 @@ exports[`Progress variant success 1`] = `
         >
           <CheckCircleIcon
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
diff --git a/packages/patternfly-4/react-core/src/components/Select/__snapshots__/Select.test.js.snap b/packages/patternfly-4/react-core/src/components/Select/__snapshots__/Select.test.js.snap
index c2871d830b6..268709ac2f2 100644
--- a/packages/patternfly-4/react-core/src/components/Select/__snapshots__/Select.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Select/__snapshots__/Select.test.js.snap
@@ -65,7 +65,6 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
         <CaretDownIcon
           className="pf-c-select__toggle-arrow"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -483,7 +482,6 @@ exports[`checkbox select renders closed successfully 1`] = `
         <CaretDownIcon
           className="pf-c-select__toggle-arrow"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -579,7 +577,6 @@ exports[`checkbox select renders expanded successfully 1`] = `
         <CaretDownIcon
           className="pf-c-select__toggle-arrow"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -839,7 +836,6 @@ exports[`select single select renders closed successfully 1`] = `
         <CaretDownIcon
           className="pf-c-select__toggle-arrow"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -937,7 +933,6 @@ exports[`select single select renders expanded successfully 1`] = `
         <CaretDownIcon
           className="pf-c-select__toggle-arrow"
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         >
@@ -1183,7 +1178,6 @@ exports[`typeahead multi select renders closed successfully 1`] = `
           <CaretDownIcon
             className="pf-c-select__toggle-arrow"
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -1293,7 +1287,6 @@ exports[`typeahead multi select renders expanded successfully 1`] = `
           <CaretDownIcon
             className="pf-c-select__toggle-arrow"
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -1588,7 +1581,6 @@ exports[`typeahead multi select renders selected successfully 1`] = `
                             <TimesCircleIcon
                               aria-hidden="true"
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -1685,7 +1677,6 @@ exports[`typeahead multi select renders selected successfully 1`] = `
           <TimesCircleIcon
             aria-hidden={true}
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -1722,7 +1713,6 @@ exports[`typeahead multi select renders selected successfully 1`] = `
           <CaretDownIcon
             className="pf-c-select__toggle-arrow"
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -2084,7 +2074,6 @@ exports[`typeahead multi select test onChange 1`] = `
           <CaretDownIcon
             className="pf-c-select__toggle-arrow"
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -2241,7 +2230,6 @@ exports[`typeahead select renders closed successfully 1`] = `
           <CaretDownIcon
             className="pf-c-select__toggle-arrow"
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -2351,7 +2339,6 @@ exports[`typeahead select renders expanded successfully 1`] = `
           <CaretDownIcon
             className="pf-c-select__toggle-arrow"
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -2594,7 +2581,6 @@ exports[`typeahead select renders selected successfully 1`] = `
           <TimesCircleIcon
             aria-hidden={true}
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -2631,7 +2617,6 @@ exports[`typeahead select renders selected successfully 1`] = `
           <CaretDownIcon
             className="pf-c-select__toggle-arrow"
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -2963,7 +2948,6 @@ exports[`typeahead select test onChange 1`] = `
           <CaretDownIcon
             className="pf-c-select__toggle-arrow"
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
diff --git a/packages/patternfly-4/react-core/src/components/Select/__snapshots__/SelectToggle.test.js.snap b/packages/patternfly-4/react-core/src/components/Select/__snapshots__/SelectToggle.test.js.snap
index f0ff77514b0..2cc430e71e2 100644
--- a/packages/patternfly-4/react-core/src/components/Select/__snapshots__/SelectToggle.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Select/__snapshots__/SelectToggle.test.js.snap
@@ -33,7 +33,6 @@ exports[`state active 1`] = `
     <CaretDownIcon
       className="pf-c-select__toggle-arrow"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     >
@@ -95,7 +94,6 @@ exports[`state focus 1`] = `
     <CaretDownIcon
       className="pf-c-select__toggle-arrow"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     >
@@ -157,7 +155,6 @@ exports[`state hover 1`] = `
     <CaretDownIcon
       className="pf-c-select__toggle-arrow"
       color="currentColor"
-      noVerticalAlign={false}
       size="sm"
       title={null}
     >
diff --git a/packages/patternfly-4/react-core/src/components/Tabs/__snapshots__/Tabs.test.js.snap b/packages/patternfly-4/react-core/src/components/Tabs/__snapshots__/Tabs.test.js.snap
index 8e384327bba..f08ae0270c4 100644
--- a/packages/patternfly-4/react-core/src/components/Tabs/__snapshots__/Tabs.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Tabs/__snapshots__/Tabs.test.js.snap
@@ -26,7 +26,6 @@ exports[`should call handleScrollButtons tabs with scrolls 1`] = `
     >
       <AngleLeftIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -199,7 +198,6 @@ exports[`should call handleScrollButtons tabs with scrolls 1`] = `
     >
       <AngleRightIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -389,7 +387,6 @@ exports[`should call scrollLeft tabs with scrolls 1`] = `
     >
       <AngleLeftIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -562,7 +559,6 @@ exports[`should call scrollLeft tabs with scrolls 1`] = `
     >
       <AngleRightIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -752,7 +748,6 @@ exports[`should call scrollRight tabs with scrolls 1`] = `
     >
       <AngleLeftIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -925,7 +920,6 @@ exports[`should call scrollRight tabs with scrolls 1`] = `
     >
       <AngleRightIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       >
@@ -1104,7 +1098,6 @@ exports[`should render accessible tabs 1`] = `
     >
       <AngleLeftIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       />
@@ -1170,7 +1163,6 @@ exports[`should render accessible tabs 1`] = `
     >
       <AngleRightIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       />
@@ -1239,7 +1231,6 @@ exports[`should render filled tabs 1`] = `
     >
       <AngleLeftIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       />
@@ -1302,7 +1293,6 @@ exports[`should render filled tabs 1`] = `
     >
       <AngleRightIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       />
@@ -1368,7 +1358,6 @@ exports[`should render secondary tabs 1`] = `
     >
       <AngleLeftIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       />
@@ -1431,7 +1420,6 @@ exports[`should render secondary tabs 1`] = `
     >
       <AngleRightIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       />
@@ -1529,7 +1517,6 @@ exports[`should render simple tabs 1`] = `
     >
       <AngleLeftIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       />
@@ -1592,7 +1579,6 @@ exports[`should render simple tabs 1`] = `
     >
       <AngleRightIcon
         color="currentColor"
-        noVerticalAlign={false}
         size="sm"
         title={null}
       />
diff --git a/packages/patternfly-4/react-inline-edit-extension/src/components/CancelButton/__snapshots__/CancelButton.test.js.snap b/packages/patternfly-4/react-inline-edit-extension/src/components/CancelButton/__snapshots__/CancelButton.test.js.snap
index 16dcdfdd18b..b968eccb4fc 100644
--- a/packages/patternfly-4/react-inline-edit-extension/src/components/CancelButton/__snapshots__/CancelButton.test.js.snap
+++ b/packages/patternfly-4/react-inline-edit-extension/src/components/CancelButton/__snapshots__/CancelButton.test.js.snap
@@ -6,7 +6,6 @@ exports[`it renders properly 1`] = `
 >
   <CloseIcon
     color="currentColor"
-    noVerticalAlign={false}
     size="sm"
     title={null}
   />
diff --git a/packages/patternfly-4/react-inline-edit-extension/src/components/ConfirmButton/__snapshots__/ConfirmButton.test.js.snap b/packages/patternfly-4/react-inline-edit-extension/src/components/ConfirmButton/__snapshots__/ConfirmButton.test.js.snap
index 497e3ba92d7..42c77a2406c 100644
--- a/packages/patternfly-4/react-inline-edit-extension/src/components/ConfirmButton/__snapshots__/ConfirmButton.test.js.snap
+++ b/packages/patternfly-4/react-inline-edit-extension/src/components/ConfirmButton/__snapshots__/ConfirmButton.test.js.snap
@@ -6,7 +6,6 @@ exports[`it renders properly 1`] = `
 >
   <CheckIcon
     color="currentColor"
-    noVerticalAlign={false}
     size="sm"
     title={null}
   />
diff --git a/packages/patternfly-4/react-inline-edit-extension/src/components/InlineEdit/__snapshots__/ConfirmButtons.test.js.snap b/packages/patternfly-4/react-inline-edit-extension/src/components/InlineEdit/__snapshots__/ConfirmButtons.test.js.snap
index 483476e8ced..52de8a21ca2 100644
--- a/packages/patternfly-4/react-inline-edit-extension/src/components/InlineEdit/__snapshots__/ConfirmButtons.test.js.snap
+++ b/packages/patternfly-4/react-inline-edit-extension/src/components/InlineEdit/__snapshots__/ConfirmButtons.test.js.snap
@@ -71,7 +71,6 @@ exports[`ConfirmButtons renders correctly 1`] = `
         >
           <CheckIcon
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
@@ -120,7 +119,6 @@ exports[`ConfirmButtons renders correctly 1`] = `
         >
           <CloseIcon
             color="currentColor"
-            noVerticalAlign={false}
             size="sm"
             title={null}
           >
diff --git a/packages/patternfly-4/react-integration/cypress/integration/applicationlauncher.spec.ts b/packages/patternfly-4/react-integration/cypress/integration/applicationlauncher.spec.ts
index 4cdd6c38bce..f8cc5a3f20f 100644
--- a/packages/patternfly-4/react-integration/cypress/integration/applicationlauncher.spec.ts
+++ b/packages/patternfly-4/react-integration/cypress/integration/applicationlauncher.spec.ts
@@ -16,13 +16,9 @@ describe('Application Launcher Demo Test', () => {
     cy.get('.pf-c-app-launcher__menu').should('not.exist'); 
   });
 
-  // it('Verify onSelect', () => {
-  //   cy.window().then(win => {
-  //     const spy = cy.spy(win.console, "log");
-  //     cy.get('#pf-random-id-0').click(); 
-  //     cy.get('.pf-c-app-launcher__menu-item').first().click();
-  //     win.console.log('hi'); 
-  //     expect(spy).to.be.called.callCount(2);
-  //   });
-  // });
+  it('Verify application click works', () => {
+    cy.get('#pf-random-id-0').click(); 
+    cy.get('.pf-c-app-launcher__menu-item').first().click();
+    cy.url().should('eq', 'http://patternfly-react.surge.sh/');
+  })
 });
diff --git a/packages/patternfly-4/react-integration/cypress/integration/contextselector.spec.ts b/packages/patternfly-4/react-integration/cypress/integration/contextselector.spec.ts
new file mode 100644
index 00000000000..5f9ac18234a
--- /dev/null
+++ b/packages/patternfly-4/react-integration/cypress/integration/contextselector.spec.ts
@@ -0,0 +1,21 @@
+describe('Context Selector Demo Test', () => {
+  it('Navigate to demo section', () => {
+    cy.visit('http://localhost:3000/');
+    cy.get('#context-selector-demo-nav-item-link').click(); 
+    cy.url().should('eq', 'http://localhost:3000/context-selector-demo-nav-link');
+  });
+  
+  it('Verify toggle class', () => {
+    cy.get('#pf-context-selector-toggle-id-0').should('have.class', 'pf-c-context-selector__toggle')
+  });
+
+  it('Verify toggle button works', () => {
+    cy.get('.pf-c-context-selector__toggle').click(); 
+    cy.get('.pf-c-context-selector__menu').should('exist'); 
+  }); 
+
+  it('Verify toggle text changes with selection', () => {
+    cy.get('.pf-c-context-selector__menu-list-item').last().click() 
+    cy.get('.pf-c-context-selector__toggle-text').contains('Azure 2'); 
+  });
+});
\ No newline at end of file
diff --git a/packages/patternfly-4/react-integration/demo-app-ts/src/Demos.ts b/packages/patternfly-4/react-integration/demo-app-ts/src/Demos.ts
index 749f14e3bcc..34dc9be68de 100644
--- a/packages/patternfly-4/react-integration/demo-app-ts/src/Demos.ts
+++ b/packages/patternfly-4/react-integration/demo-app-ts/src/Demos.ts
@@ -80,6 +80,11 @@ export const Demos: DemoInterface[] = [
     name: 'ChipGroup Demo',
     componentType: Examples.BadgeChip 
   },
+  {
+    id: 'context-selector-demo', 
+    name: 'ContextSelector Demo', 
+    componentType: Examples.ContextSelectorDemo
+  },
   {
     id: 'empty-state-demo',
     name: 'Empty State Demo',
diff --git a/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/ApplicationLauncherDemo/ApplicationLauncherDemo.tsx b/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/ApplicationLauncherDemo/ApplicationLauncherDemo.tsx
index f65293b6108..d1367efd742 100644
--- a/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/ApplicationLauncherDemo/ApplicationLauncherDemo.tsx
+++ b/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/ApplicationLauncherDemo/ApplicationLauncherDemo.tsx
@@ -31,7 +31,7 @@ export class ApplicationLauncherDemo extends React.Component<null, ApplicationLa
     const { isOpen } = this.state;
     const dropdownItems = [
       <Tooltip content={<div>Launch Application 1</div>}>
-        <DropdownItem key="application_1" component="a">
+        <DropdownItem key="application_1" component="a" href="http://patternfly-react.surge.sh/">
           Application 1
         </DropdownItem>
       </Tooltip>
diff --git a/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/ContextSelectorDemo/ContextSelectorDemo.tsx b/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/ContextSelectorDemo/ContextSelectorDemo.tsx
new file mode 100644
index 00000000000..efdebb17192
--- /dev/null
+++ b/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/ContextSelectorDemo/ContextSelectorDemo.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { ContextSelector, ContextSelectorItem } from '@patternfly/react-core';
+
+interface ContextSelectorState {
+  isOpen: boolean; 
+  selected: string;
+  searchValue: string; 
+  filteredItems: Array<string>; 
+}
+
+export class ContextSelectorDemo extends React.Component<{}, ContextSelectorState> {
+  items: Array<string>; 
+  onToggle: (event: any, isOpen: any) => void;
+  onSelect: (event: any, value: string) => void; 
+  onSearchInputChange: (value: string) => void; 
+  onSearchButtonClick: (event: any) => void; 
+  constructor(props) {
+    super(props);
+    this.items = [
+      'My Project',
+      'OpenShift Cluster',
+      'Production Ansible',
+      'AWS',
+      'Azure',
+      'My Project 2',
+      'OpenShift Cluster ',
+      'Production Ansible 2 ',
+      'AWS 2',
+      'Azure 2'
+    ];
+
+    this.state = {
+      isOpen: false,
+      selected: this.items[0],
+      searchValue: '',
+      filteredItems: this.items
+    };
+
+    this.onToggle = (event, isOpen) => {
+      this.setState({
+        isOpen
+      });
+    };
+
+    this.onSelect = (event, value) => {
+      this.setState({
+        selected: value,
+        isOpen: !this.state.isOpen
+      });
+    };
+
+    this.onSearchInputChange = value => {
+      this.setState({ searchValue: value });
+    };
+
+    this.onSearchButtonClick = event => {
+      const filtered =
+        this.state.searchValue === ''
+          ? this.items
+          : this.items.filter(str => str.toLowerCase().indexOf(this.state.searchValue.toLowerCase()) !== -1);
+
+      this.setState({ filteredItems: filtered || [] });
+    };
+  }
+
+  render() {
+    const { isOpen, selected, searchValue, filteredItems } = this.state;
+    return (
+      <ContextSelector
+        toggleText={selected}
+        onSearchInputChange={this.onSearchInputChange}
+        isOpen={isOpen}
+        searchInputValue={searchValue}
+        onToggle={(event: any) => this.onToggle(event, !isOpen)}
+        onSelect={this.onSelect}
+        onSearchButtonClick={this.onSearchButtonClick}
+        screenReaderLabel="Selected Project:"
+      >
+        {filteredItems.map((item, index) => (
+          <ContextSelectorItem key={index}>{item}</ContextSelectorItem>
+        ))}
+      </ContextSelector>
+    );
+  }
+}
diff --git a/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/PageDemo/PageDemo.tsx b/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/PageDemo/PageDemo.tsx
index 4f1ca993d2a..98117b8c97e 100644
--- a/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/PageDemo/PageDemo.tsx
+++ b/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/PageDemo/PageDemo.tsx
@@ -28,7 +28,7 @@ export class PageDemo extends React.Component {
         showNavToggle
         isNavOpen={isNavOpen}
         onNavToggle={this.onNavToggle}
-		linkComponent={'div'}
+		    logoComponent={'div'}
       />
     );
     const Sidebar = <PageSidebar nav="Navigation" isNavOpen={isNavOpen} />;
diff --git a/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/index.ts b/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/index.ts
index 5dd12fbb712..965617b0218 100644
--- a/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/index.ts
+++ b/packages/patternfly-4/react-integration/demo-app-ts/src/components/demos/index.ts
@@ -12,6 +12,7 @@ export * from './ButtonDemo/ButtonDemo';
 export * from './CardDemo/CardDemo'; 
 export * from './CheckboxDemo/CheckboxDemo'; 
 export * from './ChipGroupDemo/ChipGroupDemo';
+export * from './ContextSelectorDemo/ContextSelectorDemo'; 
 export * from './EmptyStateDemo/EmptyStateDemo';
 export * from './FormDemo/FormDemo'; 
 export * from './LabelDemo/LabelDemo';
diff --git a/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap b/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
index 6a94199e33a..af00faaf0c4 100644
--- a/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
+++ b/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
@@ -706,7 +706,6 @@ exports[`Actions table 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -3077,83 +3076,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-10"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -3164,70 +3107,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-10"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-10"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -3904,83 +3829,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-11"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -3991,70 +3860,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-11"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-11"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -4731,83 +4582,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-12"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -4818,70 +4613,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-12"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-12"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -5558,83 +5335,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-13"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -5645,70 +5366,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-13"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-13"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -6385,83 +6088,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-14"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -6472,70 +6119,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-14"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-14"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -7212,83 +6841,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-15"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -7299,70 +6872,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-15"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-15"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -8039,83 +7594,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-16"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -8126,70 +7625,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-16"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-16"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -8866,83 +8347,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-17"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -8953,70 +8378,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-17"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-17"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -9693,83 +9100,27 @@ exports[`Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-18"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -9780,70 +9131,52 @@ exports[`Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-18"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-18"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -10484,7 +9817,6 @@ exports[`Cell header table 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -16675,7 +16007,6 @@ exports[`Collapsible nested table 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -18826,7 +18157,6 @@ exports[`Collapsible nested table 1`] = `
                               >
                                 <AngleDownIcon
                                   color="currentColor"
-                                  noVerticalAlign={false}
                                   size="sm"
                                   title={null}
                                 >
@@ -19374,7 +18704,6 @@ exports[`Collapsible nested table 1`] = `
                               >
                                 <AngleDownIcon
                                   color="currentColor"
-                                  noVerticalAlign={false}
                                   size="sm"
                                   title={null}
                                 >
@@ -20388,7 +19717,6 @@ exports[`Collapsible nested table 1`] = `
                               >
                                 <AngleDownIcon
                                   color="currentColor"
-                                  noVerticalAlign={false}
                                   size="sm"
                                   title={null}
                                 >
@@ -23729,7 +23057,6 @@ exports[`Collapsible table 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -25872,7 +25199,6 @@ exports[`Collapsible table 1`] = `
                               >
                                 <AngleDownIcon
                                   color="currentColor"
-                                  noVerticalAlign={false}
                                   size="sm"
                                   title={null}
                                 >
@@ -27400,7 +26726,6 @@ exports[`Collapsible table 1`] = `
                               >
                                 <AngleDownIcon
                                   color="currentColor"
-                                  noVerticalAlign={false}
                                   size="sm"
                                   title={null}
                                 >
@@ -38782,7 +38107,6 @@ exports[`Selectable table 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -45945,7 +45269,6 @@ exports[`Simple Actions table 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -48698,83 +48021,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-0"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -48785,70 +48052,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-0"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-0"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -49651,83 +48900,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-1"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -49738,70 +48931,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-1"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-1"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -50604,83 +49779,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-2"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -50691,70 +49810,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-2"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-2"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -51557,83 +50658,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-3"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -51644,70 +50689,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-3"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-3"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -52510,83 +51537,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-4"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -52597,70 +51568,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-4"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-4"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -53463,83 +52416,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-5"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -53550,70 +52447,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-5"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-5"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -54416,83 +53295,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-6"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -54503,70 +53326,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-6"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-6"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -55369,83 +54174,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-7"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -55456,70 +54205,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-7"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-7"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -56322,83 +55053,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={false}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-8"
+                                  isActive={false}
+                                  isDisabled={false}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -56409,70 +55084,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain"
+                                      disabled={false}
                                       id="pf-toggle-id-8"
-                                      isActive={false}
-                                      isDisabled={false}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain"
-                                        disabled={false}
-                                        id="pf-toggle-id-8"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -57278,83 +55935,27 @@ exports[`Simple Actions table 1`] = `
                                 />
                               }
                             >
-                              <DropdownWithContext
-                                className=""
-                                direction="down"
-                                dropdownItems={
-                                  Array [
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={0}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Some action
-                                    </Item>,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={1}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      <div>
-                                        Another action
-                                      </div>
-                                    </Item>,
-                                    <Separator
-                                      className=""
-                                      component="a"
-                                      data-key={2}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                    />,
-                                    <Item
-                                      className=""
-                                      component="a"
-                                      data-key={3}
-                                      href="#"
-                                      isDisabled={false}
-                                      isHovered={false}
-                                      onClick={[Function]}
-                                    >
-                                      Third action
-                                    </Item>,
-                                  ]
-                                }
-                                isGrouped={false}
-                                isOpen={false}
-                                isPlain={true}
-                                onSelect={[Function]}
+                              <div
+                                className="pf-c-dropdown"
                                 onToggle={[Function]}
-                                position="right"
-                                toggle={
-                                  <Kebab
-                                    aria-label="Actions"
-                                    className=""
-                                    id=""
-                                    isActive={false}
-                                    isDisabled={true}
-                                    isFocused={false}
-                                    isHovered={false}
-                                    isOpen={false}
-                                    isPlain={false}
-                                    onToggle={[Function]}
-                                    parentRef={null}
-                                  />
-                                }
                               >
-                                <div
-                                  className="pf-c-dropdown"
+                                <Kebab
+                                  aria-label="Actions"
+                                  ariaHasPopup={true}
+                                  className=""
+                                  id="pf-toggle-id-9"
+                                  isActive={false}
+                                  isDisabled={true}
+                                  isFocused={false}
+                                  isHovered={false}
+                                  isOpen={false}
+                                  isPlain={true}
+                                  key=".0"
+                                  onEnter={[Function]}
                                   onToggle={[Function]}
+                                  parentRef={null}
                                 >
-                                  <Kebab
+                                  <Toggle
                                     aria-label="Actions"
                                     ariaHasPopup={true}
                                     className=""
@@ -57365,70 +55966,52 @@ exports[`Simple Actions table 1`] = `
                                     isHovered={false}
                                     isOpen={false}
                                     isPlain={true}
-                                    key=".0"
+                                    isSplitButton={false}
                                     onEnter={[Function]}
                                     onToggle={[Function]}
                                     parentRef={null}
+                                    type={null}
                                   >
-                                    <Toggle
+                                    <button
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Actions"
-                                      ariaHasPopup={true}
-                                      className=""
+                                      className="pf-c-dropdown__toggle pf-m-plain pf-m-disabled"
+                                      disabled={true}
                                       id="pf-toggle-id-9"
-                                      isActive={false}
-                                      isDisabled={true}
-                                      isFocused={false}
-                                      isHovered={false}
-                                      isOpen={false}
-                                      isPlain={true}
-                                      isSplitButton={false}
-                                      onEnter={[Function]}
-                                      onToggle={[Function]}
-                                      parentRef={null}
-                                      type={null}
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      type="button"
                                     >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        aria-label="Actions"
-                                        className="pf-c-dropdown__toggle pf-m-plain pf-m-disabled"
-                                        disabled={true}
-                                        id="pf-toggle-id-9"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        type="button"
+                                      <EllipsisVIcon
+                                        color="currentColor"
+                                        size="sm"
+                                        title={null}
                                       >
-                                        <EllipsisVIcon
-                                          color="currentColor"
-                                          noVerticalAlign={false}
-                                          size="sm"
-                                          title={null}
-                                        >
-                                          <svg
-                                            aria-hidden={true}
-                                            aria-labelledby={null}
-                                            fill="currentColor"
-                                            height="1em"
-                                            role="img"
-                                            style={
-                                              Object {
-                                                "verticalAlign": "-0.125em",
-                                              }
+                                        <svg
+                                          aria-hidden={true}
+                                          aria-labelledby={null}
+                                          fill="currentColor"
+                                          height="1em"
+                                          role="img"
+                                          style={
+                                            Object {
+                                              "verticalAlign": "-0.125em",
                                             }
-                                            viewBox="0 0 192 512"
-                                            width="1em"
-                                          >
-                                            <path
-                                              d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
-                                              transform=""
-                                            />
-                                          </svg>
-                                        </EllipsisVIcon>
-                                      </button>
-                                    </Toggle>
-                                  </Kebab>
-                                </div>
-                              </DropdownWithContext>
+                                          }
+                                          viewBox="0 0 192 512"
+                                          width="1em"
+                                        >
+                                          <path
+                                            d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z"
+                                            transform=""
+                                          />
+                                        </svg>
+                                      </EllipsisVIcon>
+                                    </button>
+                                  </Toggle>
+                                </Kebab>
+                              </div>
                             </Dropdown>
                           </ActionsColumn>
                         </td>
@@ -76054,7 +74637,6 @@ exports[`Sortable table 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -82108,7 +80690,6 @@ exports[`Table variants Breakpoint - grid 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -88162,7 +86743,6 @@ exports[`Table variants Breakpoint - grid-2xl 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -94216,7 +92796,6 @@ exports[`Table variants Breakpoint - grid-lg 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -100270,7 +98849,6 @@ exports[`Table variants Breakpoint - grid-md 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -106324,7 +104902,6 @@ exports[`Table variants Breakpoint - grid-xl 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -112378,7 +110955,6 @@ exports[`Table variants Breakpoint - null 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
@@ -118432,7 +117008,6 @@ exports[`Table variants Size - compact 1`] = `
                           >
                             <ArrowsAltVIcon
                               color="currentColor"
-                              noVerticalAlign={false}
                               size="sm"
                               title={null}
                             >
diff --git a/packages/patternfly-4/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap b/packages/patternfly-4/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
index 25642771550..30a1c6948a4 100644
--- a/packages/patternfly-4/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
+++ b/packages/patternfly-4/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
@@ -70,7 +70,6 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
         "hidden": false,
         "icon": <SearchMinusIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />,
@@ -84,7 +83,6 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
         "hidden": true,
         "icon": <ExpandArrowsAltIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />,
@@ -98,7 +96,6 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
         "hidden": false,
         "icon": <ExpandIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />,
@@ -350,7 +347,6 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
                     >
                       <SearchMinusIcon
                         color="currentColor"
-                        noVerticalAlign={false}
                         size="sm"
                         title={null}
                       >
@@ -513,7 +509,6 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
                     >
                       <ExpandIcon
                         color="currentColor"
-                        noVerticalAlign={false}
                         size="sm"
                         title={null}
                       >
@@ -673,7 +668,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
         "hidden": false,
         "icon": <SearchPlusIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />,
@@ -687,7 +681,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
         "hidden": false,
         "icon": <SearchMinusIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />,
@@ -701,7 +694,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
         "hidden": false,
         "icon": <ExpandArrowsAltIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />,
@@ -715,7 +707,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
         "hidden": false,
         "icon": <ExpandIcon
           color="currentColor"
-          noVerticalAlign={false}
           size="sm"
           title={null}
         />,
@@ -837,7 +828,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                     >
                       <SearchPlusIcon
                         color="currentColor"
-                        noVerticalAlign={false}
                         size="sm"
                         title={null}
                       >
@@ -1000,7 +990,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                     >
                       <SearchMinusIcon
                         color="currentColor"
-                        noVerticalAlign={false}
                         size="sm"
                         title={null}
                       >
@@ -1163,7 +1152,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                     >
                       <ExpandArrowsAltIcon
                         color="currentColor"
-                        noVerticalAlign={false}
                         size="sm"
                         title={null}
                       >
@@ -1326,7 +1314,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                     >
                       <ExpandIcon
                         color="currentColor"
-                        noVerticalAlign={false}
                         size="sm"
                         title={null}
                       >