From 4d259c24d61b3faddaab435df0248360b3a19541 Mon Sep 17 00:00:00 2001
From: Charles de Dreuille <charles.dedreuille@gmail.com>
Date: Sat, 21 Mar 2026 18:09:22 +0000
Subject: [PATCH] Updates

Signed-off-by: Charles de Dreuille <charles.dedreuille@gmail.com>
---
 .changeset/plugin-header-remove-toolbar-wrapper.md       | 6 +++---
 packages/ui/src/components/PluginHeader/PluginHeader.tsx | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.changeset/plugin-header-remove-toolbar-wrapper.md b/.changeset/plugin-header-remove-toolbar-wrapper.md
index 084eab9b61..a68bb1dfdd 100644
--- a/.changeset/plugin-header-remove-toolbar-wrapper.md
+++ b/.changeset/plugin-header-remove-toolbar-wrapper.md
@@ -2,8 +2,8 @@
 '@backstage/ui': minor
 ---
 
-**BREAKING**: Removed the `toolbarWrapper` element from `PluginHeader` and dropped `toolbarWrapper` from `PluginHeaderDefinition.classNames`. Toolbar layout styles now live on `toolbar` (`.bui-PluginHeaderToolbar`). Update custom CSS that targeted `.bui-PluginHeaderToolbarWrapper` to use `.bui-PluginHeaderToolbar` instead.
+**BREAKING**: Removed the `toolbarWrapper` element from `PluginHeader` and dropped `toolbarWrapper` from `PluginHeaderDefinition.classNames`. Toolbar layout styles now live on `toolbar` (`.bui-PluginHeaderToolbar`).
+
+**Migration:** Update custom CSS that targeted `.bui-PluginHeaderToolbarWrapper` to use `.bui-PluginHeaderToolbar` instead.
 
 **Affected components:** PluginHeader
-
-`PluginHeader` now establishes a neutral background provider (same rules as `Box` with `bg="neutral"`) so controls in the toolbar and tabs resolve `data-on-bg` correctly.
diff --git a/packages/ui/src/components/PluginHeader/PluginHeader.tsx b/packages/ui/src/components/PluginHeader/PluginHeader.tsx
index 9cc3161ef7..a7228503f1 100644
--- a/packages/ui/src/components/PluginHeader/PluginHeader.tsx
+++ b/packages/ui/src/components/PluginHeader/PluginHeader.tsx
@@ -129,7 +129,9 @@ export const PluginHeader = (props: PluginHeaderProps) => {
     <>
       <div className={classes.toolbar} data-has-tabs={hasTabs}>
         <div className={classes.toolbarContent}>
-          <div className={classes.toolbarIcon}>{icon || <RiShapesLine />}</div>
+          <div className={classes.toolbarIcon} aria-hidden="true">
+            {icon || <RiShapesLine />}
+          </div>
           <h1 className={classes.toolbarName}>
             {titleLink ? (
               <Link href={titleLink} standalone variant="body-medium">