diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconRecommendations.js b/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconRecommendations.js
index e2b9871ff7..ed9c3ca996 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconRecommendations.js
+++ b/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconRecommendations.js
@@ -6,8 +6,6 @@ import {
   ToolbarContent,
   ToolbarItem,
   EmptyState,
-  EmptyStateHeader,
-  EmptyStateIcon,
   EmptyStateBody,
   Spinner
 } from '@patternfly/react-core';
@@ -194,8 +192,7 @@ export const IconRecommendations = () => {
         </Tbody>
       </Table>
       {filteredRows.length === 0 && (
-        <EmptyState>
-          <EmptyStateHeader titleText={`No results found for "${ searchValue }"`} headingLevel="h5" icon={<EmptyStateIcon icon={SearchIcon} />} />
+        <EmptyState titleText={`No results found for "${ searchValue }"`} headingLevel="h5" icon={SearchIcon}>
           <EmptyStateBody>
             We couldn't find any icons that matched your search. Try entering a new search term to find what you're looking for.
           </EmptyStateBody>
diff --git a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconsTable.js b/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconsTable.js
index ed6a84b14e..9ca740a30b 100644
--- a/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconsTable.js
+++ b/packages/documentation-site/patternfly-docs/content/design-guidelines/styles/icons/IconsTable.js
@@ -7,8 +7,6 @@ import {
   ToolbarContent,
   ToolbarItem,
   EmptyState,
-  EmptyStateHeader,
-  EmptyStateIcon,
   EmptyStateBody,
   Tooltip,
   TooltipPosition
@@ -190,8 +188,7 @@ export const IconsTable = () => {
       </Table>
 
       {filteredRows.length === 0 && (
-        <EmptyState>
-          <EmptyStateHeader titleText={`No results found for "${ searchValue }"`} headingLevel="h4" icon={<EmptyStateIcon icon={SearchIcon} />} />
+        <EmptyState titleText={`No results found for "${ searchValue }"`} headingLevel="h4" icon={SearchIcon}>
           <EmptyStateBody>We couldn't find any icons that matched your search. If none of the icons listed fit
             your use case, you may use any additional 'fa' icons within <a href="https://fontawesome.com/icons?d=gallery&amp;m=free">Font Awesome's free set</a>.
           </EmptyStateBody>
diff --git a/packages/documentation-site/patternfly-docs/content/get-started/release-notes-table.js b/packages/documentation-site/patternfly-docs/content/get-started/release-notes-table.js
index 73ecd4648f..c4d8cf6e8a 100644
--- a/packages/documentation-site/patternfly-docs/content/get-started/release-notes-table.js
+++ b/packages/documentation-site/patternfly-docs/content/get-started/release-notes-table.js
@@ -16,11 +16,9 @@ import {
   TextListItem,
   Bullseye,
   EmptyState,
-  EmptyStateHeader,
   EmptyStateFooter,
   EmptyStateBody,
   EmptyStateActions,
-  EmptyStateIcon,
   Button,
 } from "@patternfly/react-core";
 import {
@@ -345,12 +343,8 @@ export const ReleaseNotesTable = () => {
                 <Tr>
                   <Td colSpan={6}>
                     <Bullseye>
-                      <EmptyState variant="sm">
-                        <EmptyStateHeader
-                          icon={<EmptyStateIcon icon={SearchIcon} />}
-                          titleText="No results found"
-                          headingLevel="h2"
-                        />
+                      <EmptyState variant="sm" titleText="No results found"
+                          headingLevel="h2" icon={SearchIcon}>
                         <EmptyStateBody>
                           Clear search input and filters and try again.
                         </EmptyStateBody>