diff --git a/packages/react-core/src/components/HelperText/HelperTextItem.tsx b/packages/react-core/src/components/HelperText/HelperTextItem.tsx
index 66839693e24..5f89e6acd1e 100644
--- a/packages/react-core/src/components/HelperText/HelperTextItem.tsx
+++ b/packages/react-core/src/components/HelperText/HelperTextItem.tsx
@@ -1,6 +1,6 @@
import styles from '@patternfly/react-styles/css/components/HelperText/helper-text';
import { css } from '@patternfly/react-styles';
-import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
+import RhUiMinusIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-minus-icon';
import RhUiWarningFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon';
import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
@@ -37,7 +37,7 @@ export interface HelperTextItemProps extends React.HTMLProps,
+ indeterminate: ,
warning: ,
success: ,
error:
diff --git a/packages/react-core/src/components/NumberInput/NumberInput.tsx b/packages/react-core/src/components/NumberInput/NumberInput.tsx
index 41e074db844..e1beb582377 100644
--- a/packages/react-core/src/components/NumberInput/NumberInput.tsx
+++ b/packages/react-core/src/components/NumberInput/NumberInput.tsx
@@ -1,6 +1,6 @@
import styles from '@patternfly/react-styles/css/components/NumberInput/number-input';
import { css } from '@patternfly/react-styles';
-import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
+import RhUiMinusIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-minus-icon';
import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
import { InputGroup, InputGroupItem } from '../InputGroup';
import { Button, ButtonProps } from '../Button';
@@ -125,7 +125,7 @@ export const NumberInput: React.FunctionComponent = ({
onClick={(evt) => onMinus(evt, inputName)}
icon={
-
+
}
{...minusBtnProps}
diff --git a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
index b9d8eeaa62b..e6152a01300 100644
--- a/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
+++ b/packages/react-core/src/components/NumberInput/__tests__/__snapshots__/NumberInput.test.tsx.snap
@@ -32,24 +32,12 @@ exports[`numberInput disables lower threshold 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -155,24 +143,12 @@ exports[`numberInput disables upper threshold 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -280,24 +256,12 @@ exports[`numberInput passes button props successfully 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -404,24 +368,12 @@ exports[`numberInput passes input props successfully 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -528,24 +480,12 @@ exports[`numberInput renders custom width 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -652,24 +592,12 @@ exports[`numberInput renders defaults & extra props 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -776,24 +704,12 @@ exports[`numberInput renders disabled 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -901,24 +817,12 @@ exports[`numberInput renders error validated 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -1045,24 +949,12 @@ exports[`numberInput renders success validated 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -1194,24 +1086,12 @@ exports[`numberInput renders unit & position 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -1317,24 +1197,12 @@ exports[`numberInput renders unit 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -1445,24 +1313,12 @@ exports[`numberInput renders value 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
@@ -1568,24 +1424,12 @@ exports[`numberInput renders warning validated 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 32 32"
width="1em"
>
-
-
+
diff --git a/packages/react-core/src/components/Slider/examples/Slider.md b/packages/react-core/src/components/Slider/examples/Slider.md
index 8c74eea7be0..73d5c0ac450 100644
--- a/packages/react-core/src/components/Slider/examples/Slider.md
+++ b/packages/react-core/src/components/Slider/examples/Slider.md
@@ -7,7 +7,7 @@ propComponents: ['Slider', 'SliderStepObject']
import { useState } from 'react';
import { Slider, Button, Content, ContentVariants } from '@patternfly/react-core';
-import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
+import RhUiMinusIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-minus-icon';
import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
import LockIcon from '@patternfly/react-icons/dist/esm/icons/lock-icon';
import LockOpenIcon from '@patternfly/react-icons/dist/esm/icons/lock-open-icon';
diff --git a/packages/react-core/src/components/Slider/examples/SliderActions.tsx b/packages/react-core/src/components/Slider/examples/SliderActions.tsx
index 1b4051008cb..b7ddd16ad28 100644
--- a/packages/react-core/src/components/Slider/examples/SliderActions.tsx
+++ b/packages/react-core/src/components/Slider/examples/SliderActions.tsx
@@ -1,6 +1,6 @@
import { useState } from 'react';
import { Slider, SliderOnChangeEvent, Button, Content } from '@patternfly/react-core';
-import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
+import RhUiMinusIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-minus-icon';
import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
import LockIcon from '@patternfly/react-icons/dist/esm/icons/lock-icon';
import LockOpenIcon from '@patternfly/react-icons/dist/esm/icons/lock-open-icon';
@@ -68,7 +68,7 @@ export const SliderActions: React.FunctionComponent = () => {
} />}
+ startActions={} />}
endActions={} />}
/>
diff --git a/packages/react-core/src/demos/HelperText.md b/packages/react-core/src/demos/HelperText.md
index 60d2beb04fe..b421f61ea53 100644
--- a/packages/react-core/src/demos/HelperText.md
+++ b/packages/react-core/src/demos/HelperText.md
@@ -4,7 +4,6 @@ section: components
---
import { useEffect, useState } from 'react';
-import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
import RhUiWarningFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon';
import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';