diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts
index 88c9cddbc8..28e918ee79 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts
@@ -21,13 +21,8 @@ export class UmbLanguageRootWorkspaceElement extends UmbLitElement implements Um
 				height: 100%;
 			}
 
-			umb-table {
-				padding: 0;
-				margin: var(--uui-size-space-3) var(--uui-size-space-6);
-			}
-			#add-language {
-				margin-left: var(--uui-size-space-6);
-				text-decoration: none;
+			#main {
+				margin: var(--uui-size-space-6);
 			}
 		`,
 	];
@@ -135,11 +130,17 @@ export class UmbLanguageRootWorkspaceElement extends UmbLitElement implements Um
 
 	render() {
 		return html`
-			<umb-body-layout no-header-background>
-				<a id="add-language" slot="header" href="section/settings/language/create/root">
-					<uui-button label="Add language" look="outline" color="default"></uui-button>
-				</a>
-				<umb-table .config=${this._tableConfig} .columns=${this._tableColumns} .items=${this._tableItems}></umb-table>
+			<umb-body-layout headline="Languages">
+				<div id="main">
+					<div>
+						<uui-button
+							label="Add language"
+							look="outline"
+							color="default"
+							href="section/settings/language/create/root"></uui-button>
+					</div>
+					<umb-table .config=${this._tableConfig} .columns=${this._tableColumns} .items=${this._tableItems}></umb-table>
+				</div>
 			</umb-body-layout>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/body-layout/body-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/body-layout/body-layout.element.ts
index 92f2b23cfc..4169f930de 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/body-layout/body-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/body-layout/body-layout.element.ts
@@ -21,12 +21,9 @@ export class UmbBodyLayout extends LitElement {
 				justify-content: space-between;
 				width: 100%;
 				min-height: 60px;
-
-				box-sizing: border-box;
-			}
-			:host(:not([no-header-background])) #header {
 				background-color: var(--uui-color-surface);
 				border-bottom: 1px solid var(--uui-color-border);
+				box-sizing: border-box;
 			}
 
 			#headline {