diff --git a/packages/core-components/src/layout/Page/PageWithHeader.tsx b/packages/core-components/src/layout/Page/PageWithHeader.tsx
index 3d04e1d221..9a4dab6699 100644
--- a/packages/core-components/src/layout/Page/PageWithHeader.tsx
+++ b/packages/core-components/src/layout/Page/PageWithHeader.tsx
@@ -21,14 +21,13 @@ import { Page } from './Page';
 
 type PageWithHeaderProps = ComponentProps<typeof Header> & {
   themeId: string;
-  noHeader?: boolean;
 };
 
 export function PageWithHeader(props: PropsWithChildren<PageWithHeaderProps>) {
-  const { themeId, children, noHeader, ...restProps } = props;
+  const { themeId, children, ...restProps } = props;
   return (
     <Page themeId={themeId}>
-      {noHeader ? <div /> : <Header {...restProps} />}
+      <Header {...restProps} />
       {children}
     </Page>
   );
diff --git a/packages/frontend-plugin-api/src/apis/definitions/PluginHeaderActionsApi.ts b/packages/frontend-plugin-api/src/apis/definitions/PluginHeaderActionsApi.ts
index 4f8f5e2053..78d0e2623f 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/PluginHeaderActionsApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/PluginHeaderActionsApi.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Backstage Authors
+ * Copyright 2026 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/packages/frontend-plugin-api/src/blueprints/PageBlueprint.tsx b/packages/frontend-plugin-api/src/blueprints/PageBlueprint.tsx
index b41a7ddb77..e439d177e2 100644
--- a/packages/frontend-plugin-api/src/blueprints/PageBlueprint.tsx
+++ b/packages/frontend-plugin-api/src/blueprints/PageBlueprint.tsx
@@ -89,8 +89,8 @@ export const PageBlueprint = createExtensionBlueprint({
 
         return (
           <PageLayout
-            title={title}
-            icon={icon}
+            title={title ?? node.spec.plugin.title ?? node.spec.plugin.pluginId}
+            icon={icon ?? node.spec.plugin.icon}
             noHeader={noHeader}
             headerActions={headerActions}
           >
diff --git a/packages/frontend-plugin-api/src/blueprints/SubPageBlueprint.tsx b/packages/frontend-plugin-api/src/blueprints/SubPageBlueprint.tsx
index c97d279839..1d2cd47984 100644
--- a/packages/frontend-plugin-api/src/blueprints/SubPageBlueprint.tsx
+++ b/packages/frontend-plugin-api/src/blueprints/SubPageBlueprint.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2026 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/app/src/apis/PluginHeaderActionsApi/DefaultPluginHeaderActionsApi.tsx b/plugins/app/src/apis/PluginHeaderActionsApi/DefaultPluginHeaderActionsApi.tsx
index 869ddf503e..ae114e4e24 100644
--- a/plugins/app/src/apis/PluginHeaderActionsApi/DefaultPluginHeaderActionsApi.tsx
+++ b/plugins/app/src/apis/PluginHeaderActionsApi/DefaultPluginHeaderActionsApi.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Backstage Authors
+ * Copyright 2026 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.