diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/settings-welcome-dashboard.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/settings-welcome-dashboard.element.ts
index 93b7206850..3e117b0fa2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/settings-welcome-dashboard.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/settings-welcome-dashboard.element.ts
@@ -7,8 +7,7 @@ export class UmbSettingsWelcomeDashboardElement extends UmbLitElement {
 	override render() {
 		return html`
 			<section id="settings-dashboard" class="uui-text">
-				<uui-box>
-					<h1 class="uui-h3"><umb-localize key="settingsDashboard_documentationHeader">Documentation</umb-localize></h1>
+				<uui-box headline=${this.localize.term('settingsDashboard_documentationHeader')}>
 					<p>
 						<umb-localize key="settingsDashboard_documentationDescription">
 							Read more about working with the items in Settings in our Documentation.
@@ -16,39 +15,32 @@ export class UmbSettingsWelcomeDashboardElement extends UmbLitElement {
 					</p>
 					<uui-button
 						look="primary"
-						href="https://docs.umbraco.com/umbraco-cms/umbraco-cms"
+						href="https://docs.umbraco.com/umbraco-cms"
 						label=${this.localize.term('settingsDashboard_getHelp')}
-						target="_blank"
-						rel="noopener"></uui-button>
+						target="_blank"></uui-button>
 				</uui-box>
 
-				<uui-box>
-					<h1 class="uui-h3"><umb-localize key="settingsDashboard_communityHeader">Community</umb-localize></h1>
+				<uui-box headline=${this.localize.term('settingsDashboard_communityHeader')}>
 					<p>
 						<umb-localize key="settingsDashboard_communityDescription">
 							Ask a question in the community forum or our Discord community
 						</umb-localize>
 					</p>
-
 					<div class="button-group">
 						<uui-button
 							look="primary"
-							href="https://our.umbraco.com/forum"
+							href="https://our.umbraco.com/forum/"
 							label=${this.localize.term('settingsDashboard_goForum')}
-							target="_blank"
-							rel="noopener"></uui-button>
+							target="_blank"></uui-button>
 						<uui-button
 							look="primary"
 							href="https://discord.umbraco.com"
 							label=${this.localize.term('settingsDashboard_chatWithCommunity')}
-							target="_blank"
-							rel="noopener"></uui-button>
+							target="_blank"></uui-button>
 					</div>
 				</uui-box>
 
-				<uui-box class="training">
-					<h1 class="uui-h3"><umb-localize key="settingsDashboard_trainingHeader">Training</umb-localize></h1>
-
+				<uui-box headline=${this.localize.term('settingsDashboard_trainingHeader')}>
 					<p>
 						<umb-localize key="settingsDashboard_trainingDescription">
 							Find out about real-life training and certification opportunities
@@ -58,13 +50,10 @@ export class UmbSettingsWelcomeDashboardElement extends UmbLitElement {
 						look="primary"
 						href="https://umbraco.com/training/"
 						label=${this.localize.term('settingsDashboard_getCertified')}
-						target="_blank"
-						rel="noopener"></uui-button>
+						target="_blank"></uui-button>
 				</uui-box>
 
-				<uui-box>
-					<h1 class="uui-h3"><umb-localize key="settingsDashboard_supportHeader">Support</umb-localize></h1>
-
+				<uui-box headline=${this.localize.term('settingsDashboard_supportHeader')}>
 					<p>
 						<umb-localize key="settingsDashboard_supportDescription">
 							Extend your team with a highly skilled and passionate bunch of Umbraco know-it-alls
@@ -74,12 +63,10 @@ export class UmbSettingsWelcomeDashboardElement extends UmbLitElement {
 						look="primary"
 						href="https://umbraco.com/support/"
 						label=${this.localize.term('settingsDashboard_getHelp')}
-						target="_blank"
-						rel="noopener"></uui-button>
+						target="_blank"></uui-button>
 				</uui-box>
 
-				<uui-box>
-					<h1 class="uui-h3"><umb-localize key="settingsDashboard_videosHeader">Videos</umb-localize></h1>
+				<uui-box headline=${this.localize.term('settingsDashboard_videosHeader')}>
 					<p>
 						<umb-localize key="settingsDashboard_videosDescription">
 							Watch our free tutorial videos on the Umbraco Learning Base YouTube channel, to get upto speed quickly
@@ -90,8 +77,7 @@ export class UmbSettingsWelcomeDashboardElement extends UmbLitElement {
 						look="primary"
 						href="https://www.youtube.com/c/UmbracoLearningBase"
 						label=${this.localize.term('settingsDashboard_watchVideos')}
-						target="_blank"
-						rel="noopener"></uui-button>
+						target="_blank"></uui-button>
 				</uui-box>
 			</section>
 		`;
@@ -107,6 +93,12 @@ export class UmbSettingsWelcomeDashboardElement extends UmbLitElement {
 				padding: var(--uui-size-layout-1);
 			}
 
+			uui-box {
+				p:first-child {
+					margin-top: 0;
+				}
+			}
+
 			@media (max-width: 1200px) {
 				#settings-dashboard {
 					grid-template-columns: repeat(2, 1fr);