From 2bbe8cf429d7880d9b053ccc2f49705fa62819cb Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Wed, 8 Jan 2025 06:05:44 -0800
Subject: [PATCH 1/7] [EuiIcon] Add `section` glyph (#8261)

Co-authored-by: Lene Gadewoll <lene.gadewoll@elastic.co>
---
 packages/eui/changelogs/upcoming/8261.md      |  2 ++
 packages/eui/src-docs/src/views/icon/icons.js |  1 +
 .../icon/__snapshots__/icon.test.tsx.snap     | 20 +++++++++--
 .../icon/assets/ml_create_geo_job.tsx         |  2 --
 .../src/components/icon/assets/section.tsx    | 34 +++++++++++++++++++
 packages/eui/src/components/icon/icon_map.ts  |  1 +
 .../eui/src/components/icon/svgs/section.svg  |  1 +
 .../components/display/icons/icon_types.ts    |  1 +
 8 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 packages/eui/changelogs/upcoming/8261.md
 create mode 100644 packages/eui/src/components/icon/assets/section.tsx
 create mode 100644 packages/eui/src/components/icon/svgs/section.svg

diff --git a/packages/eui/changelogs/upcoming/8261.md b/packages/eui/changelogs/upcoming/8261.md
new file mode 100644
index 00000000000..fb88798c310
--- /dev/null
+++ b/packages/eui/changelogs/upcoming/8261.md
@@ -0,0 +1,2 @@
+- Added new icon `section`
+
diff --git a/packages/eui/src-docs/src/views/icon/icons.js b/packages/eui/src-docs/src/views/icon/icons.js
index 5191843d857..e897ae29468 100644
--- a/packages/eui/src-docs/src/views/icon/icons.js
+++ b/packages/eui/src-docs/src/views/icon/icons.js
@@ -234,6 +234,7 @@ export const iconTypes = [
   'save',
   'scale',
   'search',
+  'section',
   'securitySignal',
   'securitySignalDetected',
   'securitySignalResolved',
diff --git a/packages/eui/src/components/icon/__snapshots__/icon.test.tsx.snap b/packages/eui/src/components/icon/__snapshots__/icon.test.tsx.snap
index f02e59d1616..695bd82c6f4 100644
--- a/packages/eui/src/components/icon/__snapshots__/icon.test.tsx.snap
+++ b/packages/eui/src/components/icon/__snapshots__/icon.test.tsx.snap
@@ -1961,9 +1961,7 @@ exports[`EuiIcon props type createGeoJob is rendered 1`] = `
   />
   <path
     class="euiIcon__fillSecondary"
-    clip-rule="evenodd"
     d="M23 15h-6V9h-2v6H9v2h6v6h2v-6h6v-2Zm-1 9.196C22 27.329 25.427 32 27 32s5-4.67 5-7.804V24a5 5 0 1 0-10 .096v.1ZM27 26a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"
-    fill-rule="evenodd"
   />
 </svg>
 `;
@@ -9048,6 +9046,24 @@ exports[`EuiIcon props type searchProfilerApp is rendered 1`] = `
 </svg>
 `;
 
+exports[`EuiIcon props type section is rendered 1`] = `
+<svg
+  aria-hidden="true"
+  class="euiIcon emotion-euiIcon-m-isLoaded"
+  data-icon-type="section"
+  data-is-loaded="true"
+  height="16"
+  role="img"
+  viewBox="0 0 16 16"
+  width="16"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M1.5 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1Zm1.5.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5ZM1.5 4a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5H7a.5.5 0 0 0 .5-.5v-4A.5.5 0 0 0 7 4H1.5Zm7 .5A.5.5 0 0 1 9 4h5.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H9a.5.5 0 0 1-.5-.5v-4Zm-7 5.5a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 0-.5-.5h-13Z"
+  />
+</svg>
+`;
+
 exports[`EuiIcon props type securityAnalyticsApp is rendered 1`] = `
 <svg
   aria-hidden="true"
diff --git a/packages/eui/src/components/icon/assets/ml_create_geo_job.tsx b/packages/eui/src/components/icon/assets/ml_create_geo_job.tsx
index 0ff896c1655..4414783b66a 100644
--- a/packages/eui/src/components/icon/assets/ml_create_geo_job.tsx
+++ b/packages/eui/src/components/icon/assets/ml_create_geo_job.tsx
@@ -30,8 +30,6 @@ const EuiIconMlCreateGeoJob = ({
     {title ? <title id={titleId}>{title}</title> : null}
     <path d="M16 32C7.163 32 0 24.837 0 16S7.163 0 16 0s16 7.163 16 16h-2c0-7.732-6.268-14-14-14S2 8.268 2 16s6.268 14 14 14v2Z" />
     <path
-      clipRule="evenodd"
-      fillRule="evenodd"
       d="M23 15h-6V9h-2v6H9v2h6v6h2v-6h6v-2Zm-1 9.196C22 27.329 25.427 32 27 32s5-4.67 5-7.804V24a5 5 0 1 0-10 .096v.1ZM27 26a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"
       className="euiIcon__fillSecondary"
     />
diff --git a/packages/eui/src/components/icon/assets/section.tsx b/packages/eui/src/components/icon/assets/section.tsx
new file mode 100644
index 00000000000..b6e8561d63b
--- /dev/null
+++ b/packages/eui/src/components/icon/assets/section.tsx
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+// THIS IS A GENERATED FILE. DO NOT MODIFY MANUALLY. @see scripts/compile-icons.js
+
+import * as React from 'react';
+import type { SVGProps } from 'react';
+interface SVGRProps {
+  title?: string;
+  titleId?: string;
+}
+const EuiIconSection = ({
+  title,
+  titleId,
+  ...props
+}: SVGProps<SVGSVGElement> & SVGRProps) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={16}
+    height={16}
+    viewBox="0 0 16 16"
+    aria-labelledby={titleId}
+    {...props}
+  >
+    {title ? <title id={titleId}>{title}</title> : null}
+    <path d="M1.5 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1Zm1.5.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5ZM1.5 4a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5H7a.5.5 0 0 0 .5-.5v-4A.5.5 0 0 0 7 4H1.5Zm7 .5A.5.5 0 0 1 9 4h5.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H9a.5.5 0 0 1-.5-.5v-4Zm-7 5.5a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 0-.5-.5h-13Z" />
+  </svg>
+);
+export const icon = EuiIconSection;
diff --git a/packages/eui/src/components/icon/icon_map.ts b/packages/eui/src/components/icon/icon_map.ts
index d93aabd9d95..0ab00a84ddb 100644
--- a/packages/eui/src/components/icon/icon_map.ts
+++ b/packages/eui/src/components/icon/icon_map.ts
@@ -365,6 +365,7 @@ export const typeToPathMap = {
   scale: 'scale',
   search: 'search',
   searchProfilerApp: 'app_search_profiler',
+  section: 'section',
   securityAnalyticsApp: 'app_security_analytics',
   securityApp: 'app_security',
   securitySignal: 'securitySignal',
diff --git a/packages/eui/src/components/icon/svgs/section.svg b/packages/eui/src/components/icon/svgs/section.svg
new file mode 100644
index 00000000000..52d5c6b146e
--- /dev/null
+++ b/packages/eui/src/components/icon/svgs/section.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M1.5 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1Zm1.5.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5ZM1.5 4a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5H7a.5.5 0 0 0 .5-.5v-4A.5.5 0 0 0 7 4H1.5Zm7 .5A.5.5 0 0 1 9 4h5.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H9a.5.5 0 0 1-.5-.5v-4Zm-7 5.5a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 0-.5-.5h-13Z"/></svg>
\ No newline at end of file
diff --git a/packages/website/docs/components/display/icons/icon_types.ts b/packages/website/docs/components/display/icons/icon_types.ts
index 8a2ff52c110..3ee4a499530 100644
--- a/packages/website/docs/components/display/icons/icon_types.ts
+++ b/packages/website/docs/components/display/icons/icon_types.ts
@@ -224,6 +224,7 @@ export const iconTypes: Array<IconType> = [
   'save',
   'scale',
   'search',
+  'section',
   'securitySignal',
   'securitySignalDetected',
   'securitySignalResolved',

From 8b2864dfdc2fe2715496636fa5da1c1b9461e086 Mon Sep 17 00:00:00 2001
From: Tomasz Kajtoch <tomasz.kajtoch@elastic.co>
Date: Wed, 8 Jan 2025 15:52:21 +0100
Subject: [PATCH 2/7] update i18ntokens

---
 packages/eui/i18ntokens.json | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/eui/i18ntokens.json b/packages/eui/i18ntokens.json
index 4facbe725d1..cb17546e45e 100644
--- a/packages/eui/i18ntokens.json
+++ b/packages/eui/i18ntokens.json
@@ -5808,7 +5808,7 @@
       "end": {
         "line": 165,
         "column": 12,
-        "index": 4729
+        "index": 4762
       }
     },
     "filepath": "src/components/pagination/pagination.tsx"
@@ -5821,12 +5821,12 @@
       "start": {
         "line": 210,
         "column": 12,
-        "index": 5723
+        "index": 5756
       },
       "end": {
         "line": 215,
         "column": 13,
-        "index": 5947
+        "index": 5980
       }
     },
     "filepath": "src/components/pagination/pagination.tsx"
@@ -5839,12 +5839,12 @@
       "start": {
         "line": 251,
         "column": 12,
-        "index": 6982
+        "index": 7015
       },
       "end": {
         "line": 259,
         "column": 13,
-        "index": 7289
+        "index": 7322
       }
     },
     "filepath": "src/components/pagination/pagination.tsx"
@@ -5857,12 +5857,12 @@
       "start": {
         "line": 306,
         "column": 20,
-        "index": 8472
+        "index": 8505
       },
       "end": {
         "line": 306,
         "column": 60,
-        "index": 8512
+        "index": 8545
       }
     },
     "filepath": "src/components/pagination/pagination.tsx"
@@ -5875,12 +5875,12 @@
       "start": {
         "line": 307,
         "column": 20,
-        "index": 8534
+        "index": 8567
       },
       "end": {
         "line": 307,
         "column": 60,
-        "index": 8574
+        "index": 8607
       }
     },
     "filepath": "src/components/pagination/pagination.tsx"
@@ -5893,12 +5893,12 @@
       "start": {
         "line": 308,
         "column": 18,
-        "index": 8594
+        "index": 8627
       },
       "end": {
         "line": 308,
         "column": 54,
-        "index": 8630
+        "index": 8663
       }
     },
     "filepath": "src/components/pagination/pagination.tsx"
@@ -5911,12 +5911,12 @@
       "start": {
         "line": 309,
         "column": 26,
-        "index": 8658
+        "index": 8691
       },
       "end": {
         "line": 309,
         "column": 78,
-        "index": 8710
+        "index": 8743
       }
     },
     "filepath": "src/components/pagination/pagination.tsx"
@@ -5929,12 +5929,12 @@
       "start": {
         "line": 310,
         "column": 23,
-        "index": 8735
+        "index": 8768
       },
       "end": {
         "line": 310,
         "column": 75,
-        "index": 8787
+        "index": 8820
       }
     },
     "filepath": "src/components/pagination/pagination.tsx"
@@ -5945,14 +5945,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 700,
+        "line": 692,
         "column": 16,
-        "index": 20852
+        "index": 20560
       },
       "end": {
-        "line": 703,
+        "line": 695,
         "column": 18,
-        "index": 21046
+        "index": 20754
       }
     },
     "filepath": "src/components/popover/popover.tsx"

From 57cc06013ff1cd181d75f13d4787a3c433bee847 Mon Sep 17 00:00:00 2001
From: Tomasz Kajtoch <tomasz.kajtoch@elastic.co>
Date: Wed, 8 Jan 2025 15:52:22 +0100
Subject: [PATCH 3/7] Updated changelog

---
 packages/eui/changelogs/CHANGELOG_2025.md           | 13 +++++++++++++
 packages/eui/changelogs/upcoming/8243.md            |  3 ---
 packages/eui/changelogs/upcoming/8248.md            |  2 --
 packages/eui/changelogs/upcoming/8256.md            |  3 ---
 packages/eui/changelogs/upcoming/8261.md            |  2 --
 .../src/components/guide_page/versions.json         |  1 +
 .../src-docs/src/views/package/changelog_years.json |  1 +
 packages/website/static/versions.json               |  1 +
 8 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 packages/eui/changelogs/CHANGELOG_2025.md
 delete mode 100644 packages/eui/changelogs/upcoming/8243.md
 delete mode 100644 packages/eui/changelogs/upcoming/8248.md
 delete mode 100644 packages/eui/changelogs/upcoming/8256.md
 delete mode 100644 packages/eui/changelogs/upcoming/8261.md

diff --git a/packages/eui/changelogs/CHANGELOG_2025.md b/packages/eui/changelogs/CHANGELOG_2025.md
new file mode 100644
index 00000000000..ae54be4ebe5
--- /dev/null
+++ b/packages/eui/changelogs/CHANGELOG_2025.md
@@ -0,0 +1,13 @@
+## [`v99.0.0`](https://github.com/elastic/eui/releases/v99.0.0)
+
+- Added two new icons: `createGenericJob` and `createGeoJob` ([#8248](https://github.com/elastic/eui/pull/8248))
+- Added new icon `section` ([#8261](https://github.com/elastic/eui/pull/8261))
+
+**Bug fixes**
+
+- Ensures that the `values` of `EuiI18n` used in `EuiPagination` use `key` attributes to prevent potential ["unique key" warnings](https://react.dev/learn/rendering-lists#keeping-list-items-in-order-with-key). ([#8243](https://github.com/elastic/eui/pull/8243))
+
+**Breaking changes**
+
+- Removed `EuiPopover`'s deprecated `hasDragDrop` prop. Use `usePortal` on any child `EuiDraggable` instead ([#8256](https://github.com/elastic/eui/pull/8256))
+
diff --git a/packages/eui/changelogs/upcoming/8243.md b/packages/eui/changelogs/upcoming/8243.md
deleted file mode 100644
index 8ad6028dde5..00000000000
--- a/packages/eui/changelogs/upcoming/8243.md
+++ /dev/null
@@ -1,3 +0,0 @@
-**Bug fixes**
-
-- Ensures that the `values` of `EuiI18n` used in `EuiPagination` use `key` attributes to prevent potential ["unique key" warnings](https://react.dev/learn/rendering-lists#keeping-list-items-in-order-with-key).
diff --git a/packages/eui/changelogs/upcoming/8248.md b/packages/eui/changelogs/upcoming/8248.md
deleted file mode 100644
index ef1a0b8cb8c..00000000000
--- a/packages/eui/changelogs/upcoming/8248.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Added two new icons: `createGenericJob` and `createGeoJob`
-
diff --git a/packages/eui/changelogs/upcoming/8256.md b/packages/eui/changelogs/upcoming/8256.md
deleted file mode 100644
index c78a2268775..00000000000
--- a/packages/eui/changelogs/upcoming/8256.md
+++ /dev/null
@@ -1,3 +0,0 @@
-**Breaking changes**
-
-- Removed `EuiPopover`'s deprecated `hasDragDrop` prop. Use `usePortal` on any child `EuiDraggable` instead
diff --git a/packages/eui/changelogs/upcoming/8261.md b/packages/eui/changelogs/upcoming/8261.md
deleted file mode 100644
index fb88798c310..00000000000
--- a/packages/eui/changelogs/upcoming/8261.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Added new icon `section`
-
diff --git a/packages/eui/src-docs/src/components/guide_page/versions.json b/packages/eui/src-docs/src/components/guide_page/versions.json
index aabf864044e..71f2e24c4a8 100644
--- a/packages/eui/src-docs/src/components/guide_page/versions.json
+++ b/packages/eui/src-docs/src/components/guide_page/versions.json
@@ -1,5 +1,6 @@
 {
   "euiVersions": [
+    "99.0.0",
     "98.2.1",
     "98.2.0",
     "98.1.0",
diff --git a/packages/eui/src-docs/src/views/package/changelog_years.json b/packages/eui/src-docs/src/views/package/changelog_years.json
index 66ca7acf290..6c709bc6dca 100644
--- a/packages/eui/src-docs/src/views/package/changelog_years.json
+++ b/packages/eui/src-docs/src/views/package/changelog_years.json
@@ -1,5 +1,6 @@
 {
   "years": [
+    2025,
     2024,
     2023,
     2022,
diff --git a/packages/website/static/versions.json b/packages/website/static/versions.json
index aabf864044e..71f2e24c4a8 100644
--- a/packages/website/static/versions.json
+++ b/packages/website/static/versions.json
@@ -1,5 +1,6 @@
 {
   "euiVersions": [
+    "99.0.0",
     "98.2.1",
     "98.2.0",
     "98.1.0",

From 97e70585799c0acd9dd587a7c9e22e42f2578ff8 Mon Sep 17 00:00:00 2001
From: Tomasz Kajtoch <tomasz.kajtoch@elastic.co>
Date: Wed, 8 Jan 2025 15:52:25 +0100
Subject: [PATCH 4/7] 99.0.0

---
 packages/eui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/eui/package.json b/packages/eui/package.json
index 0bd97e3668d..579665d976c 100644
--- a/packages/eui/package.json
+++ b/packages/eui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@elastic/eui",
   "description": "Elastic UI Component Library",
-  "version": "98.2.1",
+  "version": "99.0.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "lib",
   "module": "es",

From 69113b9fc0a91c6f3bcd13b340041ada961419d0 Mon Sep 17 00:00:00 2001
From: Jason Stoltzfus <jastoltz24@gmail.com>
Date: Wed, 8 Jan 2025 15:04:38 -0500
Subject: [PATCH 5/7] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 40b393d203f..ab505259eda 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,6 +3,7 @@ name: 🐛 Bug report
 about: Create a report to help us improve
 title: ''
 labels: bug, ⚠️ needs validation
+type: 'bug'
 assignees: ''
 
 ---

From d4ddf2b57970a066480b373caec8c9c395cb393c Mon Sep 17 00:00:00 2001
From: Jason Stoltzfus <jastoltz24@gmail.com>
Date: Wed, 8 Jan 2025 15:09:16 -0500
Subject: [PATCH 6/7] Update feature_request.md

---
 .github/ISSUE_TEMPLATE/feature_request.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index f98b09051f2..3d441fd88b6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,9 @@
 ---
 name: ✨ Feature request
-about: Suggest an idea for this project
+about: A request, idea, or new functionality
 title: ''
 labels: feature request
+type: 'Enhancement'
 assignees: ''
 
 ---

From 9959b18759fb4fa6666757a8450508374c3afd4f Mon Sep 17 00:00:00 2001
From: Kate Sosedova <36230123+ek-so@users.noreply.github.com>
Date: Thu, 9 Jan 2025 14:02:46 +0100
Subject: [PATCH 7/7] Beta badge inner visual alignment (#8255)

Co-authored-by: Lene Gadewoll <lene.gadewoll@elastic.co>
---
 packages/eui/changelogs/upcoming/8255.md      |  2 ++
 .../badge/beta_badge/beta_badge.styles.ts     | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 packages/eui/changelogs/upcoming/8255.md

diff --git a/packages/eui/changelogs/upcoming/8255.md b/packages/eui/changelogs/upcoming/8255.md
new file mode 100644
index 00000000000..f2df8d8351b
--- /dev/null
+++ b/packages/eui/changelogs/upcoming/8255.md
@@ -0,0 +1,2 @@
+- Updated font-weight and font-size of `EuiBetaBadge`s to improve legibility
+
diff --git a/packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts b/packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts
index 625e21d99a5..32c1f4a5026 100644
--- a/packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts
+++ b/packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts
@@ -20,6 +20,10 @@ import { euiBadgeColors } from '../color_utils';
 export const euiBetaBadgeStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme, colorMode } = euiThemeContext;
   const badgeColors = euiBadgeColors(euiThemeContext);
+  const badgeSizes = {
+    m: euiTheme.size.l,
+    s: mathWithUnits(euiTheme.size.base, (x) => x * 1.25),
+  };
 
   return {
     euiBetaBadge: css`
@@ -27,7 +31,7 @@ export const euiBetaBadgeStyles = (euiThemeContext: UseEuiTheme) => {
       border-radius: ${euiTheme.size.l};
       cursor: default;
 
-      font-weight: ${euiTheme.font.weight.bold};
+      font-weight: ${euiTheme.font.weight.semiBold};
       text-transform: uppercase;
       letter-spacing: 0.05em;
       text-align: center;
@@ -53,19 +57,23 @@ export const euiBetaBadgeStyles = (euiThemeContext: UseEuiTheme) => {
     // Font sizes
     m: css`
       font-size: ${euiFontSizeFromScale('xs', euiTheme)};
-      line-height: ${euiTheme.size.l};
+      line-height: ${badgeSizes.m};
     `,
     s: css`
-      font-size: 0.625rem;
-      line-height: ${mathWithUnits(euiTheme.size.xs, (x) => x + euiTheme.base)};
+      font-size: 0.7rem;
+      line-height: ${badgeSizes.s};
     `,
     // Padding/width sizes
     badgeSizes: {
       default: {
         m: `
-        ${logicalCSS('padding-horizontal', euiTheme.size.base)}`,
+        ${logicalCSS('height', badgeSizes.m)}
+        ${logicalCSS('padding-horizontal', euiTheme.size.base)}
+        `,
         s: `
-        ${logicalCSS('padding-horizontal', euiTheme.size.m)}`,
+        ${logicalCSS('height', badgeSizes.s)}
+        ${logicalCSS('padding-horizontal', euiTheme.size.m)}
+        `,
       },
       // When it's just an icon or a single letter, make the badge a circle
       circle: {