diff --git a/packages/eui-theme-borealis/changelogs/upcoming/9049.md b/packages/eui-theme-borealis/changelogs/upcoming/9049.md
deleted file mode 100644
index b09d56d59ec..00000000000
--- a/packages/eui-theme-borealis/changelogs/upcoming/9049.md
+++ /dev/null
@@ -1 +0,0 @@
-- Added `tabsSize` theme override to size `m` for `EuiPageHeader`
\ No newline at end of file
diff --git a/packages/eui-theme-borealis/changelogs/upcoming/9057.md b/packages/eui-theme-borealis/changelogs/upcoming/9057.md
deleted file mode 100644
index 06e95677559..00000000000
--- a/packages/eui-theme-borealis/changelogs/upcoming/9057.md
+++ /dev/null
@@ -1 +0,0 @@
-- Added component tokens for `emptyPrompt` spacing configuration: `titleBodySpacing`, `bodyActionsSpacing` and `paddingSize`
\ No newline at end of file
diff --git a/packages/eui-theme-borealis/src/variables/_components.ts b/packages/eui-theme-borealis/src/variables/_components.ts
index c7b242fbae9..c9891724df3 100644
--- a/packages/eui-theme-borealis/src/variables/_components.ts
+++ b/packages/eui-theme-borealis/src/variables/_components.ts
@@ -20,8 +20,6 @@ import {
 import { border_colors } from './colors/_colors_light';
 import { buttons } from './_buttons';
 import { forms } from './_forms';
-import { emptyPrompt } from './_empty_prompt';
-import { pageHeader } from './_page_header';
 
 const component_colors: _EuiThemeComponentColors = {
   badgeBackground: computed(
@@ -372,8 +370,6 @@ const component_colors: _EuiThemeComponentColors = {
 export const components: _EuiThemeComponents = {
   buttons,
   forms,
-  emptyPrompt,
-  pageHeader,
   LIGHT: component_colors,
   DARK: {
     ...component_colors,
diff --git a/packages/eui-theme-borealis/src/variables/_empty_prompt.ts b/packages/eui-theme-borealis/src/variables/_empty_prompt.ts
deleted file mode 100644
index 7ca9d71a6d6..00000000000
--- a/packages/eui-theme-borealis/src/variables/_empty_prompt.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server Side Public License, v 1.
- */
-
-import { _EuiThemeEmptyPrompt } from '@elastic/eui-theme-common';
-
-export const emptyPrompt: _EuiThemeEmptyPrompt = {
-  titleBodySpacing: 's',
-  bodyActionsSpacing: 'm',
-  paddingSize: 'm',
-};
diff --git a/packages/eui-theme-borealis/src/variables/_page_header.ts b/packages/eui-theme-borealis/src/variables/_page_header.ts
deleted file mode 100644
index be5d8e0a7a3..00000000000
--- a/packages/eui-theme-borealis/src/variables/_page_header.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { _EuiThemePageHeader } from '@elastic/eui-theme-common';
-
-export const pageHeader: _EuiThemePageHeader = {
-  tabsSize: 'm', // Reduced from default 'l'
-};
diff --git a/packages/eui-theme-common/changelogs/upcoming/9049.md b/packages/eui-theme-common/changelogs/upcoming/9049.md
deleted file mode 100644
index 5e286d5ec2c..00000000000
--- a/packages/eui-theme-common/changelogs/upcoming/9049.md
+++ /dev/null
@@ -1 +0,0 @@
-- Added `_EuiThemePageHeader` type and `pageHeader` component token
\ No newline at end of file
diff --git a/packages/eui-theme-common/changelogs/upcoming/9057.md b/packages/eui-theme-common/changelogs/upcoming/9057.md
deleted file mode 100644
index 1368b9d7ca4..00000000000
--- a/packages/eui-theme-common/changelogs/upcoming/9057.md
+++ /dev/null
@@ -1 +0,0 @@
-- Added `_EuiThemeEmptyPrompt` type and `emptyPrompt` component token
diff --git a/packages/eui-theme-common/src/global_styling/variables/components.ts b/packages/eui-theme-common/src/global_styling/variables/components.ts
index b748680dc91..cf8ef16ec52 100644
--- a/packages/eui-theme-common/src/global_styling/variables/components.ts
+++ b/packages/eui-theme-common/src/global_styling/variables/components.ts
@@ -12,8 +12,6 @@ import {
 } from '../../services/theme/types';
 import { _EuiThemeButton } from './buttons';
 import { _EuiThemeForm, _EuiThemeFormColors } from './forms';
-import { _EuiThemeEmptyPrompt } from './empty_prompt';
-import { _EuiThemePageHeader } from './page_header';
 
 export type _EuiThemeComponentColors = {
   badgeBackground: ColorModeSwitch;
@@ -159,8 +157,6 @@ export type _EuiThemeComponentColors = {
 export type _EuiThemeComponents = {
   buttons: _EuiThemeButton;
   forms: _EuiThemeForm & StrictColorModeSwitch<_EuiThemeFormColors>;
-  emptyPrompt: _EuiThemeEmptyPrompt;
-  pageHeader: _EuiThemePageHeader;
   /**
    * internal-only key that holds temporary tokens used while migrating themes
    */
diff --git a/packages/eui-theme-common/src/global_styling/variables/empty_prompt.ts b/packages/eui-theme-common/src/global_styling/variables/empty_prompt.ts
deleted file mode 100644
index e580be3bceb..00000000000
--- a/packages/eui-theme-common/src/global_styling/variables/empty_prompt.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server Side Public License, v 1.
- */
-
-export type _EuiThemeEmptyPrompt = {
-  titleBodySpacing: string;
-  bodyActionsSpacing: string;
-  paddingSize: string;
-};
diff --git a/packages/eui-theme-common/src/global_styling/variables/index.ts b/packages/eui-theme-common/src/global_styling/variables/index.ts
index e0f9a922dcc..18b3e15971e 100644
--- a/packages/eui-theme-common/src/global_styling/variables/index.ts
+++ b/packages/eui-theme-common/src/global_styling/variables/index.ts
@@ -19,8 +19,6 @@ export * from './states';
 export * from './typography';
 export * from './buttons';
 export * from './forms';
-export * from './empty_prompt';
-export * from './page_header';
 export * from './components';
 export * from './flags';
 export * from './overrides';
diff --git a/packages/eui-theme-common/src/global_styling/variables/page_header.ts b/packages/eui-theme-common/src/global_styling/variables/page_header.ts
deleted file mode 100644
index 7deded98e56..00000000000
--- a/packages/eui-theme-common/src/global_styling/variables/page_header.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export type _EuiThemePageHeader = {
-  tabsSize: string;
-};
diff --git a/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_High_Contrast.png b/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_High_Contrast.png
index ac02d3d6feb..981ea42e9e3 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_High_Contrast.png and b/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_High_Contrast.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_High_Contrast_Transparent.png b/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_High_Contrast_Transparent.png
index f1bf60a4197..019430f53f9 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_High_Contrast_Transparent.png and b/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_High_Contrast_Transparent.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_Page_Template.png b/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_Page_Template.png
index df0a855dd34..f72fcb20e10 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_Page_Template.png and b/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_Page_Template.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_Playground.png b/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_Playground.png
index 9d06bc7f43d..e72be7d8fcd 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_Playground.png and b/packages/eui/.loki/reference/chrome_desktop_Display_EuiEmptyPrompt_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Display_EuiIconTip_Playground.png b/packages/eui/.loki/reference/chrome_desktop_Display_EuiIconTip_Playground.png
index f916fc4bf80..63c7b136574 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Display_EuiIconTip_Playground.png and b/packages/eui/.loki/reference/chrome_desktop_Display_EuiIconTip_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiSuperDatePicker_EuiSuperDatePicker_Quick_Select_Only.png b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiSuperDatePicker_EuiSuperDatePicker_Quick_Select_Only.png
index d903952bf8e..2aa2ade8801 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiSuperDatePicker_EuiSuperDatePicker_Quick_Select_Only.png and b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiSuperDatePicker_EuiSuperDatePicker_Quick_Select_Only.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Playground.png b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Playground.png
index d3ca6b3f514..1b508df5f80 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Playground.png and b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_False.png b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_False.png
index 363d2d41862..0bd42a4326b 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_False.png and b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_False.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_Reverse.png b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_Reverse.png
index 363d2d41862..0bd42a4326b 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_Reverse.png and b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_Reverse.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Wrapping_Content.png b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Wrapping_Content.png
index 5fc8cd11491..fb1d5e5808d 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Wrapping_Content.png and b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Wrapping_Content.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeader_Playground.png b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeader_Playground.png
index e2e041d64b1..b882bbd27f8 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeader_Playground.png and b/packages/eui/.loki/reference/chrome_desktop_Layout_EuiPage_EuiPageHeader_EuiPageHeader_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Navigation_EuiCollapsibleNav_EuiCollapsibleNav_Full_Header_Pattern.png b/packages/eui/.loki/reference/chrome_desktop_Navigation_EuiCollapsibleNav_EuiCollapsibleNav_Full_Header_Pattern.png
index 8a5e9a6be26..9b06f24394d 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Navigation_EuiCollapsibleNav_EuiCollapsibleNav_Full_Header_Pattern.png and b/packages/eui/.loki/reference/chrome_desktop_Navigation_EuiCollapsibleNav_EuiCollapsibleNav_Full_Header_Pattern.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Tabular_Content_EuiDataGrid_toolbarVisibility_prop_Keyboard_Shortcuts.png b/packages/eui/.loki/reference/chrome_desktop_Tabular_Content_EuiDataGrid_toolbarVisibility_prop_Keyboard_Shortcuts.png
index 5ba9429238a..55ab7b775db 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Tabular_Content_EuiDataGrid_toolbarVisibility_prop_Keyboard_Shortcuts.png and b/packages/eui/.loki/reference/chrome_desktop_Tabular_Content_EuiDataGrid_toolbarVisibility_prop_Keyboard_Shortcuts.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Templates_EuiPageTemplate_Playground.png b/packages/eui/.loki/reference/chrome_desktop_Templates_EuiPageTemplate_Playground.png
index 33bdb14c508..e1b36fa9577 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Templates_EuiPageTemplate_Playground.png and b/packages/eui/.loki/reference/chrome_desktop_Templates_EuiPageTemplate_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_High_Contrast.png b/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_High_Contrast.png
index 1c51eae03d7..340bba65cfa 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_High_Contrast.png and b/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_High_Contrast.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_High_Contrast_Transparent.png b/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_High_Contrast_Transparent.png
index 043d7d230df..fbdf879bdca 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_High_Contrast_Transparent.png and b/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_High_Contrast_Transparent.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_Page_Template.png b/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_Page_Template.png
index 865ae106c91..e1b4ead216a 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_Page_Template.png and b/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_Page_Template.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_Playground.png b/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_Playground.png
index aa4fffb7f40..5531291ec85 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_Playground.png and b/packages/eui/.loki/reference/chrome_mobile_Display_EuiEmptyPrompt_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Display_EuiIconTip_Playground.png b/packages/eui/.loki/reference/chrome_mobile_Display_EuiIconTip_Playground.png
index 751ceb41f21..6018e8fc170 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Display_EuiIconTip_Playground.png and b/packages/eui/.loki/reference/chrome_mobile_Display_EuiIconTip_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiSuperDatePicker_EuiSuperDatePicker_Quick_Select_Only.png b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiSuperDatePicker_EuiSuperDatePicker_Quick_Select_Only.png
index af85c6e6553..ccb13b6fae1 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiSuperDatePicker_EuiSuperDatePicker_Quick_Select_Only.png and b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiSuperDatePicker_EuiSuperDatePicker_Quick_Select_Only.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Playground.png b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Playground.png
index e375b1dc663..a466c63ff0e 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Playground.png and b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_False.png b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_False.png
index 4ff04be7f52..7cc0e460b34 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_False.png and b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_False.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_Reverse.png b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_Reverse.png
index 3ef1763465d..99bd2a4ad15 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_Reverse.png and b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Responsive_Reverse.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Wrapping_Content.png b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Wrapping_Content.png
index 74ac9457ec4..b8cffbcd5ba 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Wrapping_Content.png and b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeaderContent_Wrapping_Content.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeader_Playground.png b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeader_Playground.png
index 7621357d70f..93f68d095ca 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeader_Playground.png and b/packages/eui/.loki/reference/chrome_mobile_Layout_EuiPage_EuiPageHeader_EuiPageHeader_Playground.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Templates_EuiPageTemplate_Playground.png b/packages/eui/.loki/reference/chrome_mobile_Templates_EuiPageTemplate_Playground.png
index a27d70136e0..c9b88d77c87 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Templates_EuiPageTemplate_Playground.png and b/packages/eui/.loki/reference/chrome_mobile_Templates_EuiPageTemplate_Playground.png differ
diff --git a/packages/eui/changelogs/upcoming/9049.md b/packages/eui/changelogs/upcoming/9049.md
deleted file mode 100644
index 9ef0e63bf03..00000000000
--- a/packages/eui/changelogs/upcoming/9049.md
+++ /dev/null
@@ -1 +0,0 @@
-- Changed `EuiPageHeader` tabs to `m` size for Borealis theme
\ No newline at end of file
diff --git a/packages/eui/changelogs/upcoming/9057.md b/packages/eui/changelogs/upcoming/9057.md
deleted file mode 100644
index e759401f88b..00000000000
--- a/packages/eui/changelogs/upcoming/9057.md
+++ /dev/null
@@ -1 +0,0 @@
-- Added component tokens for `EuiEmptyPrompt` spacing configuration
\ No newline at end of file
diff --git a/packages/eui/src/components/empty_prompt/__snapshots__/empty_prompt.test.tsx.snap b/packages/eui/src/components/empty_prompt/__snapshots__/empty_prompt.test.tsx.snap
index 234a61ad663..847de3a3ef2 100644
--- a/packages/eui/src/components/empty_prompt/__snapshots__/empty_prompt.test.tsx.snap
+++ b/packages/eui/src/components/empty_prompt/__snapshots__/empty_prompt.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`EuiEmptyPrompt is rendered 1`] = `
   data-test-subj="test subject string"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__icon emotion-euiEmptyPrompt__icon-vertical"
@@ -26,7 +26,7 @@ exports[`EuiEmptyPrompt is rendered 1`] = `
         Title
       </h2>
       <div
-        class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
+        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
         class="euiText emotion-euiText-m-euiTextColor-subdued"
@@ -36,7 +36,7 @@ exports[`EuiEmptyPrompt is rendered 1`] = `
         </p>
       </div>
       <div
-        class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
+        class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
       />
       <div>
         Actions
@@ -51,7 +51,7 @@ exports[`EuiEmptyPrompt props actions renders alone 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -67,7 +67,7 @@ exports[`EuiEmptyPrompt props actions renders an array 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -96,7 +96,7 @@ exports[`EuiEmptyPrompt props body renders alone 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -116,7 +116,7 @@ exports[`EuiEmptyPrompt props color accent is rendered 1`] = `
   class="euiPanel euiPanel--accent euiEmptyPrompt emotion-euiPanel-m-accent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -130,7 +130,7 @@ exports[`EuiEmptyPrompt props color accentSecondary is rendered 1`] = `
   class="euiPanel euiPanel--accentSecondary euiEmptyPrompt emotion-euiPanel-m-accentSecondary-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -144,7 +144,7 @@ exports[`EuiEmptyPrompt props color danger is rendered 1`] = `
   class="euiPanel euiPanel--danger euiEmptyPrompt emotion-euiPanel-m-danger-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -158,7 +158,7 @@ exports[`EuiEmptyPrompt props color highlighted is rendered 1`] = `
   class="euiPanel euiPanel--highlighted euiEmptyPrompt emotion-euiPanel-m-highlighted-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -172,7 +172,7 @@ exports[`EuiEmptyPrompt props color neutral is rendered 1`] = `
   class="euiPanel euiPanel--neutral euiEmptyPrompt emotion-euiPanel-m-neutral-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -186,7 +186,7 @@ exports[`EuiEmptyPrompt props color plain is rendered 1`] = `
   class="euiPanel euiPanel--plain euiEmptyPrompt emotion-euiPanel-m-plain-hasShadow-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -200,7 +200,7 @@ exports[`EuiEmptyPrompt props color primary is rendered 1`] = `
   class="euiPanel euiPanel--primary euiEmptyPrompt emotion-euiPanel-m-primary-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -214,7 +214,7 @@ exports[`EuiEmptyPrompt props color risk is rendered 1`] = `
   class="euiPanel euiPanel--risk euiEmptyPrompt emotion-euiPanel-m-risk-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -228,7 +228,7 @@ exports[`EuiEmptyPrompt props color subdued is rendered 1`] = `
   class="euiPanel euiPanel--subdued euiEmptyPrompt emotion-euiPanel-m-subdued-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -242,7 +242,7 @@ exports[`EuiEmptyPrompt props color success is rendered 1`] = `
   class="euiPanel euiPanel--success euiEmptyPrompt emotion-euiPanel-m-success-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -256,7 +256,7 @@ exports[`EuiEmptyPrompt props color transparent is rendered 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -270,7 +270,7 @@ exports[`EuiEmptyPrompt props color warning is rendered 1`] = `
   class="euiPanel euiPanel--warning euiEmptyPrompt emotion-euiPanel-m-warning-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -284,14 +284,14 @@ exports[`EuiEmptyPrompt props footer renders alone 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
     />
   </div>
   <div
-    class="euiEmptyPrompt__footer emotion-euiEmptyPrompt__footer-m-transparent-roundedBorders"
+    class="euiEmptyPrompt__footer emotion-euiEmptyPrompt__footer-l-transparent-roundedBorders"
   >
     footer
   </div>
@@ -303,7 +303,7 @@ exports[`EuiEmptyPrompt props icon renders alone 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__icon emotion-euiEmptyPrompt__icon-vertical"
@@ -324,7 +324,7 @@ exports[`EuiEmptyPrompt props iconType renders alone 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__icon emotion-euiEmptyPrompt__icon-vertical"
@@ -346,7 +346,7 @@ exports[`EuiEmptyPrompt props iconType renders with iconColor 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__icon emotion-euiEmptyPrompt__icon-vertical"
@@ -368,7 +368,7 @@ exports[`EuiEmptyPrompt props layout renders alone 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-horizontal"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-horizontal-m-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-horizontal-l-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-horizontal"
@@ -439,7 +439,7 @@ exports[`EuiEmptyPrompt props styles are rendered 1`] = `
   style="background: yellow; min-width: 200px; max-width: 600px;"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
@@ -453,7 +453,7 @@ exports[`EuiEmptyPrompt props title renders alone 1`] = `
   class="euiPanel euiPanel--transparent euiEmptyPrompt emotion-euiPanel-m-transparent-euiEmptyPrompt-vertical"
 >
   <div
-    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-m"
+    class="euiEmptyPrompt__main emotion-euiEmptyPrompt__main-vertical-l"
   >
     <div
       class="euiEmptyPrompt__content emotion-euiEmptyPrompt__content-vertical"
diff --git a/packages/eui/src/components/empty_prompt/empty_prompt.styles.ts b/packages/eui/src/components/empty_prompt/empty_prompt.styles.ts
index 9c920f9d0a4..1fbde163f71 100644
--- a/packages/eui/src/components/empty_prompt/empty_prompt.styles.ts
+++ b/packages/eui/src/components/empty_prompt/empty_prompt.styles.ts
@@ -88,7 +88,8 @@ export const euiEmptyPromptStyles = (euiThemeContext: UseEuiTheme) => {
       `,
       horizontal: css`
         ${euiMinBreakpoint(euiThemeContext, 'l')} {
-          padding: ${euiTheme.size.l};
+          padding-block: ${euiTheme.size.l};
+          padding-inline: 0;
         }
       `,
     },
diff --git a/packages/eui/src/components/empty_prompt/empty_prompt.tsx b/packages/eui/src/components/empty_prompt/empty_prompt.tsx
index 9b2854d0d99..d16fe9539fc 100644
--- a/packages/eui/src/components/empty_prompt/empty_prompt.tsx
+++ b/packages/eui/src/components/empty_prompt/empty_prompt.tsx
@@ -14,11 +14,11 @@ import React, {
 } from 'react';
 import classNames from 'classnames';
 
-import { useEuiMemoizedStyles, useEuiTheme } from '../../services';
+import { useEuiMemoizedStyles } from '../../services';
 import { CommonProps } from '../common';
 import { EuiTitle, EuiTitleSize } from '../title';
 import { EuiFlexGroup, EuiFlexItem } from '../flex';
-import { EuiSpacer, SpacerSize } from '../spacer';
+import { EuiSpacer } from '../spacer';
 import { EuiIcon, IconColor, IconType } from '../icon';
 import { isNamedColor } from '../icon/named_colors';
 import { EuiText } from '../text';
@@ -86,7 +86,7 @@ export const EuiEmptyPrompt: FunctionComponent<EuiEmptyPromptProps> = ({
   iconColor: _iconColor,
   title,
   titleSize = 'm',
-  paddingSize,
+  paddingSize = 'l',
   body,
   actions,
   className,
@@ -98,22 +98,12 @@ export const EuiEmptyPrompt: FunctionComponent<EuiEmptyPromptProps> = ({
 }) => {
   const classes = classNames('euiEmptyPrompt', className);
   const styles = useEuiMemoizedStyles(euiEmptyPromptStyles);
-  const euiTheme = useEuiTheme();
-
-  // Get spacing values from theme, fallback to defaults for Amsterdam theme
-  const titleBodySpacing = (euiTheme.euiTheme.components.emptyPrompt
-    ?.titleBodySpacing ?? 'm') as SpacerSize;
-  const bodyActionsSpacing = (euiTheme.euiTheme.components.emptyPrompt
-    ?.bodyActionsSpacing ?? 'l') as SpacerSize;
-  const themePaddingSize =
-    euiTheme.euiTheme.components.emptyPrompt?.paddingSize ?? 'l';
   const cssStyles = [styles.euiEmptyPrompt, styles[layout]];
-  const finalPaddingSize = (paddingSize ?? themePaddingSize) as PaddingSize;
   const mainStyles = [
     styles.main.euiEmptyPrompt__main,
     styles.main[layout],
-    styles.main[finalPaddingSize],
-    layout === 'horizontal' && styles.main.horizontalPadding[finalPaddingSize],
+    styles.main[paddingSize],
+    layout === 'horizontal' && styles.main.horizontalPadding[paddingSize],
   ];
   const contentStyles = [
     styles.content.euiEmptyPrompt__content,
@@ -171,7 +161,7 @@ export const EuiEmptyPrompt: FunctionComponent<EuiEmptyPromptProps> = ({
     if (!footer) return null;
     const footerStyles = [
       styles.footer.euiEmptyPrompt__footer,
-      styles.footer[finalPaddingSize],
+      styles.footer[paddingSize],
       styles.footer[color],
       color === 'transparent' && !hasBorder && styles.footer.roundedBorders,
     ];
@@ -180,7 +170,7 @@ export const EuiEmptyPrompt: FunctionComponent<EuiEmptyPromptProps> = ({
         {footer}
       </div>
     );
-  }, [footer, finalPaddingSize, color, hasBorder, styles.footer]);
+  }, [footer, paddingSize, color, hasBorder, styles.footer]);
 
   return (
     <EuiPanel
@@ -196,11 +186,9 @@ export const EuiEmptyPrompt: FunctionComponent<EuiEmptyPromptProps> = ({
         {iconNode}
         <div className="euiEmptyPrompt__content" css={contentStyles}>
           {title && <EuiTitle size={titleSize}>{title}</EuiTitle>}
-          {title && body && <EuiSpacer size={titleBodySpacing} />}
+          {title && body && <EuiSpacer size="m" />}
           {body && <EuiText color="subdued">{body}</EuiText>}
-          {actionsNode && (body || title) && (
-            <EuiSpacer size={bodyActionsSpacing} />
-          )}
+          {actionsNode && (body || title) && <EuiSpacer size="l" />}
           {actionsNode}
         </div>
       </div>
diff --git a/packages/eui/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap b/packages/eui/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap
index 949c18fb9a8..b65e738e5f3 100644
--- a/packages/eui/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap
+++ b/packages/eui/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap
@@ -334,7 +334,7 @@ exports[`EuiPageHeader props page content props are passed down is rendered 1`]
       />
       <div
         aria-label="aria-label"
-        class="euiTabs testClass1 testClass2 emotion-euiTabs-m-euiTestCss"
+        class="euiTabs testClass1 testClass2 emotion-euiTabs-l-euiTestCss"
         data-test-subj="test subject string"
         role="tablist"
       >
@@ -346,7 +346,7 @@ exports[`EuiPageHeader props page content props are passed down is rendered 1`]
           type="button"
         >
           <span
-            class="euiTab__content eui-textTruncate emotion-euiTab__content-m"
+            class="euiTab__content eui-textTruncate emotion-euiTab__content-l"
           >
             Tab 1
           </span>
@@ -359,7 +359,7 @@ exports[`EuiPageHeader props page content props are passed down is rendered 1`]
           type="button"
         >
           <span
-            class="euiTab__content eui-textTruncate emotion-euiTab__content-m"
+            class="euiTab__content eui-textTruncate emotion-euiTab__content-l"
           >
             Tab 2
           </span>
diff --git a/packages/eui/src/components/page/page_header/__snapshots__/page_header_content.test.tsx.snap b/packages/eui/src/components/page/page_header/__snapshots__/page_header_content.test.tsx.snap
index 367b21460e4..bb303c77089 100644
--- a/packages/eui/src/components/page/page_header/__snapshots__/page_header_content.test.tsx.snap
+++ b/packages/eui/src/components/page/page_header/__snapshots__/page_header_content.test.tsx.snap
@@ -293,7 +293,7 @@ exports[`EuiPageHeaderContent props children is rendered even if content props a
       class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
     />
     <div
-      class="euiTabs emotion-euiTabs-m"
+      class="euiTabs emotion-euiTabs-l"
       role="tablist"
     >
       <button
@@ -304,7 +304,7 @@ exports[`EuiPageHeaderContent props children is rendered even if content props a
         type="button"
       >
         <span
-          class="euiTab__content eui-textTruncate emotion-euiTab__content-m"
+          class="euiTab__content eui-textTruncate emotion-euiTab__content-l"
         >
           Tab 1
         </span>
@@ -317,7 +317,7 @@ exports[`EuiPageHeaderContent props children is rendered even if content props a
         type="button"
       >
         <span
-          class="euiTab__content eui-textTruncate emotion-euiTab__content-m"
+          class="euiTab__content eui-textTruncate emotion-euiTab__content-l"
         >
           Tab 2
         </span>
@@ -552,7 +552,7 @@ exports[`EuiPageHeaderContent props tabs is rendered 1`] = `
         Tab 1
       </h1>
       <div
-        class="euiTabs emotion-euiTabs-m"
+        class="euiTabs emotion-euiTabs-l"
         role="tablist"
       >
         <button
@@ -563,7 +563,7 @@ exports[`EuiPageHeaderContent props tabs is rendered 1`] = `
           type="button"
         >
           <span
-            class="euiTab__content eui-textTruncate emotion-euiTab__content-m"
+            class="euiTab__content eui-textTruncate emotion-euiTab__content-l"
           >
             Tab 1
           </span>
@@ -576,7 +576,7 @@ exports[`EuiPageHeaderContent props tabs is rendered 1`] = `
           type="button"
         >
           <span
-            class="euiTab__content eui-textTruncate emotion-euiTab__content-m"
+            class="euiTab__content eui-textTruncate emotion-euiTab__content-l"
           >
             Tab 2
           </span>
@@ -604,7 +604,7 @@ exports[`EuiPageHeaderContent props tabs is rendered with tabsProps 1`] = `
       </h1>
       <div
         aria-label="aria-label"
-        class="euiTabs testClass1 testClass2 emotion-euiTabs-m-euiTestCss"
+        class="euiTabs testClass1 testClass2 emotion-euiTabs-l-euiTestCss"
         data-test-subj="test subject string"
         role="tablist"
       >
@@ -616,7 +616,7 @@ exports[`EuiPageHeaderContent props tabs is rendered with tabsProps 1`] = `
           type="button"
         >
           <span
-            class="euiTab__content eui-textTruncate emotion-euiTab__content-m"
+            class="euiTab__content eui-textTruncate emotion-euiTab__content-l"
           >
             Tab 1
           </span>
@@ -629,7 +629,7 @@ exports[`EuiPageHeaderContent props tabs is rendered with tabsProps 1`] = `
           type="button"
         >
           <span
-            class="euiTab__content eui-textTruncate emotion-euiTab__content-m"
+            class="euiTab__content eui-textTruncate emotion-euiTab__content-l"
           >
             Tab 2
           </span>
diff --git a/packages/eui/src/components/page/page_header/page_header_content.tsx b/packages/eui/src/components/page/page_header/page_header_content.tsx
index c36f22f2953..d15464e18fd 100644
--- a/packages/eui/src/components/page/page_header/page_header_content.tsx
+++ b/packages/eui/src/components/page/page_header/page_header_content.tsx
@@ -10,7 +10,7 @@ import React, { FunctionComponent, ReactNode, HTMLAttributes } from 'react';
 import classNames from 'classnames';
 import { CommonProps } from '../../common';
 import { EuiIcon, EuiIconProps, IconType } from '../../icon';
-import { EuiTab, EuiTabs, EuiTabsProps, EuiTabsSizes } from '../../tabs';
+import { EuiTab, EuiTabs, EuiTabsProps } from '../../tabs';
 import { Props as EuiTabProps } from '../../tabs/tab';
 import { EuiFlexGroup, EuiFlexItem, EuiFlexGroupProps } from '../../flex';
 import { EuiSpacer } from '../../spacer';
@@ -19,7 +19,6 @@ import { EuiText } from '../../text';
 import {
   useIsWithinBreakpoints,
   useEuiMemoizedStyles,
-  useEuiTheme,
 } from '../../../services';
 import { EuiScreenReaderOnly } from '../../accessibility';
 import { EuiBreadcrumbs, EuiBreadcrumbsProps } from '../../breadcrumbs';
@@ -175,17 +174,11 @@ export const EuiPageHeaderContent: FunctionComponent<
     !!responsive
   );
 
-  const { euiTheme } = useEuiTheme();
-
   const classes = classNames('euiPageHeaderContent', className);
   const pageHeaderStyles = useEuiMemoizedStyles(euiPageHeaderStyles);
   const contentStyles = useEuiMemoizedStyles(euiPageHeaderContentStyles);
   const styles = setStyleForRestrictedPageWidth(restrictWidth, style);
 
-  // Get tabs size from theme, fallback to 'l' for other themes
-  const themeTabsSize = (euiTheme.components.pageHeader?.tabsSize ??
-    'l') as EuiTabsSizes;
-
   let paddingSides: LogicalSides = 'vertical';
   let paddingSize = _paddingSize;
   let bottomBorder = _bottom_border;
@@ -307,7 +300,7 @@ export const EuiPageHeaderContent: FunctionComponent<
       <>
         {pageTitleNode && <EuiSpacer />}
         {screenReaderPageTitle}
-        <EuiTabs {...tabsProps} bottomBorder={false} size={themeTabsSize}>
+        <EuiTabs {...tabsProps} bottomBorder={false} size="l">
           {renderTabs()}
         </EuiTabs>
       </>
diff --git a/packages/eui/src/components/spacer/index.ts b/packages/eui/src/components/spacer/index.ts
index 5a5dc0a5cb7..a07955f5c31 100644
--- a/packages/eui/src/components/spacer/index.ts
+++ b/packages/eui/src/components/spacer/index.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { EuiSpacerProps, SpacerSize } from './spacer';
+export type { EuiSpacerProps } from './spacer';
 export { EuiSpacer } from './spacer';
diff --git a/packages/eui/src/components/tabs/index.ts b/packages/eui/src/components/tabs/index.ts
index 9abae4551d1..182f7bc8d70 100644
--- a/packages/eui/src/components/tabs/index.ts
+++ b/packages/eui/src/components/tabs/index.ts
@@ -8,7 +8,7 @@
 
 export type { EuiTabProps } from './tab';
 export { EuiTab } from './tab';
-export type { EuiTabsProps, EuiTabsSizes } from './tabs';
+export type { EuiTabsProps } from './tabs';
 export { EuiTabs } from './tabs';
 export type {
   EuiTabbedContentTab,
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_components.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_components.ts
index 55cfaa225f2..d4ac080a3bd 100644
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_components.ts
+++ b/packages/eui/src/themes/amsterdam/global_styling/variables/_components.ts
@@ -9,7 +9,6 @@
 import {
   _EuiThemeComponentColors,
   _EuiThemeComponents,
-  _EuiThemePageHeader,
 } from '@elastic/eui-theme-common';
 
 import { computed } from '../../../../services/theme/utils';
@@ -24,13 +23,6 @@ import { buttons } from './_buttons';
 import { forms } from './_forms';
 import { colorVisLight as colorVis } from './_colors_vis_light';
 
-// Amsterdam theme uses default spacing values for emptyPrompt
-const emptyPrompt = {
-  titleBodySpacing: 'm',
-  bodyActionsSpacing: 'l',
-  paddingSize: 'l',
-};
-
 const component_colors: _EuiThemeComponentColors = {
   badgeBackground: computed(
     ([lightShade]) => lightShade,
@@ -476,16 +468,9 @@ const component_colors: _EuiThemeComponentColors = {
   ),
 };
 
-// Amsterdam theme uses default tab size for pageHeader
-const pageHeader: _EuiThemePageHeader = {
-  tabsSize: 'l',
-};
-
 export const components: _EuiThemeComponents = {
   buttons,
   forms,
-  emptyPrompt,
-  pageHeader,
   LIGHT: component_colors,
   DARK: {
     ...component_colors,
diff --git a/packages/eui/src/themes/json/eui_theme_borealis_dark.json b/packages/eui/src/themes/json/eui_theme_borealis_dark.json
index 13aded72f3c..ed01cd7edb3 100644
--- a/packages/eui/src/themes/json/eui_theme_borealis_dark.json
+++ b/packages/eui/src/themes/json/eui_theme_borealis_dark.json
@@ -423,10 +423,5 @@
   "euiColorBorderStrongWarning": "#FACB3D",
   "euiColorBorderStrongRisk": "#FC8544",
   "euiColorBorderStrongDanger": "#F6726A",
-  "euiColorBorderStrongText": "#8E9FBC",
-  "page": {
-    "pageHeader": {
-      "tabsSize": "m"
-    }
-  }
+  "euiColorBorderStrongText": "#8E9FBC"
 }
diff --git a/packages/eui/src/themes/json/eui_theme_borealis_light.json b/packages/eui/src/themes/json/eui_theme_borealis_light.json
index 3bed21e7bf8..941b63776a6 100644
--- a/packages/eui/src/themes/json/eui_theme_borealis_light.json
+++ b/packages/eui/src/themes/json/eui_theme_borealis_light.json
@@ -423,10 +423,5 @@
   "euiColorBorderStrongWarning": "#966B03",
   "euiColorBorderStrongRisk": "#C24411",
   "euiColorBorderStrongDanger": "#C61E25",
-  "euiColorBorderStrongText": "#5A6D8C",
-  "page": {
-    "pageHeader": {
-      "tabsSize": "m"
-    }
-  }
+  "euiColorBorderStrongText": "#5A6D8C"
 }
diff --git a/packages/website/docs/components/layout/page-header.mdx b/packages/website/docs/components/layout/page-header.mdx
index 2e6429beb1f..ddabb6795eb 100644
--- a/packages/website/docs/components/layout/page-header.mdx
+++ b/packages/website/docs/components/layout/page-header.mdx
@@ -34,67 +34,49 @@ export default () => (
 A set of `tabs` can be displayed inside the page header by passing an array of [EuiTab](../containers/tabs/index.mdx) objects using the `label` key for the tab content. When displaying tabs, the `bottomBorder` prop will be enforced to create separation of the header and content. You'll still need to manage the page content and selected tab in your own instance.
 
 ```tsx interactive
-import React, { useState } from 'react';
+import React from 'react';
 import { EuiPageHeader, EuiButton } from '@elastic/eui';
 
-export default () => {
-  const [selectedTabId, setSelectedTabId] = useState('tab1');
-
-  const tabs = [
-    {
-      label: 'Tab 1',
-      isSelected: selectedTabId === 'tab1',
-      onClick: () => setSelectedTabId('tab1'),
-    },
-    {
-      label: 'Tab 2',
-      isSelected: selectedTabId === 'tab2',
-      onClick: () => setSelectedTabId('tab2'),
-    },
-  ];
-
-  return (
-    <EuiPageHeader
-      pageTitle="Page title"
-      tabs={tabs}
-      rightSideItems={[
-        <EuiButton fill>Add something</EuiButton>,
-        <EuiButton>Do something</EuiButton>,
-      ]}
-    />
-  );
-};
+export default () => (
+  <EuiPageHeader
+    pageTitle="Page title"
+    tabs={[
+      {
+        label: 'Tab 1',
+        isSelected: true,
+      },
+      {
+        label: 'Tab 2',
+      },
+    ]}
+    rightSideItems={[
+      <EuiButton fill>Add something</EuiButton>,
+      <EuiButton>Do something</EuiButton>,
+    ]}
+  />
+);
 ```
 
 When supplying `tabs` without a `pageTitle`, **EuiPageHeader** will promote those tabs as if they are the page title. This means that any `description` or `children` will sit **below** the tabs and should used to describe the currently selected tab.
 
 ```tsx interactive
-import React, { useState } from 'react';
+import React from 'react';
 import { EuiPageHeader } from '@elastic/eui';
 
-export default () => {
-  const [selectedTabId, setSelectedTabId] = useState('tab1');
-
-  const tabs = [
-    {
-      label: 'Tab 1',
-      isSelected: selectedTabId === 'tab1',
-      onClick: () => setSelectedTabId('tab1'),
-    },
-    {
-      label: 'Tab 2',
-      isSelected: selectedTabId === 'tab2',
-      onClick: () => setSelectedTabId('tab2'),
-    },
-  ];
-
-  return (
-    <EuiPageHeader
-      tabs={tabs}
-      description="This description should be describing the current page as depicted by the current tab. It has grow set to false to ensure a readable line-length."
-    />
-  );
-};
+export default () => (
+  <EuiPageHeader
+    tabs={[
+      {
+        label: 'Tab 1',
+        isSelected: true,
+      },
+      {
+        label: 'Tab 2',
+      },
+    ]}
+    description="This description should be describing the current page as depicted by the current tab. It has grow set to false to ensure a readable line-length."
+  />
+);
 ```
 
 ## Breadcrumbs in the page header
diff --git a/packages/website/docs/components/templates/page-template/index.mdx b/packages/website/docs/components/templates/page-template/index.mdx
index 4a474a22673..9f00acdfb57 100644
--- a/packages/website/docs/components/templates/page-template/index.mdx
+++ b/packages/website/docs/components/templates/page-template/index.mdx
@@ -28,7 +28,7 @@ import centerSvg from '!url-loader!./content_center.svg';
 
 <Demo scope={{ contentSvg }}>
   ```tsx
-  import React, { useState } from 'react';
+  import React from 'react';
   import {
     EuiText,
     EuiButton,
@@ -42,21 +42,6 @@ import centerSvg from '!url-loader!./content_center.svg';
   const bottomBorder: EuiPageTemplateProps['bottomBorder'] = "extended";
 
   export default () => {
-    const [selectedTabId, setSelectedTabId] = useState('tab1');
-
-    const tabs = [
-      {
-        label: "Tab 1",
-        isSelected: selectedTabId === 'tab1',
-        onClick: () => setSelectedTabId('tab1'),
-      },
-      {
-        label: "Tab 2",
-        isSelected: selectedTabId === 'tab2',
-        onClick: () => setSelectedTabId('tab2'),
-      }
-    ];
-
     return (
       <EuiPageTemplate
         panelled={panelled}
@@ -77,7 +62,7 @@ import centerSvg from '!url-loader!./content_center.svg';
           pageTitle="Page title"
           rightSideItems={[<EuiButton>Right side item</EuiButton>]}
           description="Header description."
-          tabs={tabs}
+          tabs={[{ label: "Tab 1", isSelected: true }, { label: "Tab 2" }]}
         />
         <EuiPageTemplate.Section>
           <EuiImage size={"fullWidth"} alt="Fake paragraph" url={contentSvg} />