diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
index 96d7b1aa3d..553abc418c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
@@ -38,11 +38,8 @@ export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
 
 	render() {
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.Dictionary">
+			<umb-workspace-editor alias="Umb.Workspace.Dictionary" back-path="section/dictionary/dashboard">
 				<div id="header" slot="header">
-					<uui-button href="section/dictionary/dashboard" label=${this.localize.term('general_backToOverview')} compact>
-						<uui-icon name="icon-arrow-left"></uui-icon>
-					</uui-button>
 					<uui-input
 						placeholder=${this.localize.term('placeholders_entername')}
 						.value=${this._name ?? ''}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
index fa5bc5f053..4d2c558e03 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
@@ -45,11 +45,10 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	render() {
-		return html`<umb-workspace-editor alias="Umb.Workspace.Language">
+		return html`<umb-workspace-editor
+			alias="Umb.Workspace.Language"
+			back-path="section/settings/workspace/language-root">
 			<div id="header" slot="header">
-				<uui-button label="Navigate back" href="section/settings/workspace/language-root" compact>
-					<uui-icon name="icon-arrow-left"></uui-icon>
-				</uui-button>
 				${this._isNew
 					? html`<strong>Add language</strong>`
 					: html`<uui-input
@@ -66,7 +65,6 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 		css`
 			#header {
 				display: flex;
-				padding: 0 var(--uui-size-space-6);
 				gap: var(--uui-size-space-4);
 				width: 100%;
 			}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
index 02ccdc6fe0..b388e2e0ae 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
@@ -125,10 +125,8 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 	render() {
 		if (!this.workspaceAlias) return nothing;
 		return html`
-			<umb-workspace-editor alias=${this.workspaceAlias}>
-				${this.#renderHeader()}
-				${this.#renderEditors()}
-				${this.#renderActions()}
+			<umb-workspace-editor alias=${this.workspaceAlias} back-path="section/packages/view/created">
+				${this.#renderHeader()} ${this.#renderEditors()} ${this.#renderActions()}
 			</umb-workspace-editor>
 		`;
 	}
@@ -137,9 +135,6 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 		if (!this._package) return nothing;
 		return html`
 			<div id="header" slot="header">
-				<uui-button href="section/packages/view/created" label=${this.localize.term('general_backToOverview')} compact>
-					<uui-icon name="icon-arrow-left"></uui-icon>
-				</uui-button>
 				<uui-input
 					id="package-name-input"
 					required
@@ -178,17 +173,10 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 	#renderEditors() {
 		return html`
 			<uui-box headline="Package Content">
-				${this.#renderDocumentSection()}
-				${this.#renderMediaSection()}
-				${this.#renderDocumentTypeSection()}
-				${this.#renderMediaTypeSection()}
-				${this.#renderLanguageSection()}
-				${this.#renderDictionarySection()}
-				${this.#renderDataTypeSection()}
-				${this.#renderTemplateSection()}
-				${this.#renderStylesheetsSection()}
-				${this.#renderScriptsSection()}
-				${this.#renderPartialViewSection()}
+				${this.#renderDocumentSection()} ${this.#renderMediaSection()} ${this.#renderDocumentTypeSection()}
+				${this.#renderMediaTypeSection()} ${this.#renderLanguageSection()} ${this.#renderDictionarySection()}
+				${this.#renderDataTypeSection()} ${this.#renderTemplateSection()} ${this.#renderStylesheetsSection()}
+				${this.#renderScriptsSection()} ${this.#renderPartialViewSection()}
 			</uui-box>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type/relation-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type/relation-type-workspace-editor.element.ts
index 888a0908e0..039044aa3b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type/relation-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type/relation-type-workspace-editor.element.ts
@@ -36,7 +36,9 @@ export class UmbRelationTypeWorkspaceEditorElement extends UmbLitElement {
 
 	render() {
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.RelationType">
+			<umb-workspace-editor
+				alias="Umb.Workspace.RelationType"
+				back-path="section/settings/workspace/relation-type-root">
 				<div id="header" slot="header">
 					<uui-input id="name" .value=${this._name} readonly>
 						<div id="alias" slot="append">${this._alias}</div>