diff --git a/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3/ObjectPageHeaderContent.less b/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3/ObjectPageHeaderContent.less
index 2a0078d1322e..b18ee9d7212c 100644
--- a/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3/ObjectPageHeaderContent.less
+++ b/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3/ObjectPageHeaderContent.less
@@ -21,7 +21,7 @@
 	padding: 0;
 }
 
-html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
+html .sapUxAPObjectPageLayout-Std-Desktop-XL, html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
 	.sapUxAPObjectPageHeaderContent .sapUxAPObjectPageHeaderObjectImage-Circle .sapUxAPObjectPageHeaderObjectImage {
 		margin-right: 2rem;
 		margin-bottom: 1rem;
@@ -40,7 +40,8 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 }
 
 .sapUxAPObjectPageLayout-Std-Tablet,
-.sapUxAPObjectPageLayout-Std-Desktop {
+.sapUxAPObjectPageLayout-Std-Desktop,
+.sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPObjectPageHeaderContentCellRight {
 		padding-right: 2rem;
 	}
@@ -74,6 +75,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 	}
 
 	&:empty {
+		.sapUxAPObjectPageLayout-Std-Desktop-XL &,
 		.sapUxAPObjectPageLayout-Std-Desktop &,
 		.sapUxAPObjectPageLayout-Std-Tablet &,
 		.sapUxAPObjectPageLayout-Std-Phone &
diff --git a/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_dark/ObjectPageHeaderContent.less b/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_dark/ObjectPageHeaderContent.less
index 682529352e42..aa9ea1458b06 100644
--- a/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_dark/ObjectPageHeaderContent.less
+++ b/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_dark/ObjectPageHeaderContent.less
@@ -5,6 +5,7 @@
 
 @sapUiFiori3AnchorBarBottomShadow: inset 0 -0.0625rem @sapUiObjectHeaderBorderColor;
 @sapUiFiori3AnchorBarTopShadow: inset 0 0.0625rem @sapUiObjectHeaderBorderColor;
+@sapUiFiori3AnchorBarShadow: @sapUiFiori3AnchorBarBottomShadow, 0 0.125rem 0.25rem 0 fade(@sapUiContentShadowColor, 7.5);
 
 .sapUxAPObjectPageHeaderContent .sapMObjStatus, .sapUxAPObjectPageContainer .sapMObjStatus {
 	font-size: @sapMFontMediumSize;
@@ -20,7 +21,7 @@
 	padding: 0;
 }
 
-html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
+html .sapUxAPObjectPageLayout-Std-Desktop-XL, html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
 	.sapUxAPObjectPageHeaderContent .sapUxAPObjectPageHeaderObjectImage-Circle .sapUxAPObjectPageHeaderObjectImage {
 		margin-right: 2rem;
 		margin-bottom: 1rem;
@@ -39,7 +40,8 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 }
 
 .sapUxAPObjectPageLayout-Std-Tablet,
-.sapUxAPObjectPageLayout-Std-Desktop {
+.sapUxAPObjectPageLayout-Std-Desktop,
+.sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPObjectPageHeaderContentCellRight {
 		padding-right: 2rem;
 	}
@@ -69,6 +71,6 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 	> .sapUiSimpleForm {
 		.sapMText, .sapMLabel, .sapMLnk {
 			font-size: @sapMFontMediumSize;
+			}
 		}
-	}
-}
\ No newline at end of file
+	}
\ No newline at end of file
diff --git a/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_hcb/ObjectPageHeaderContent.less b/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_hcb/ObjectPageHeaderContent.less
index afed365644e1..7824f032b332 100644
--- a/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_hcb/ObjectPageHeaderContent.less
+++ b/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_hcb/ObjectPageHeaderContent.less
@@ -21,7 +21,7 @@
 	padding: 0;
 }
 
-html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
+html .sapUxAPObjectPageLayout-Std-Desktop-XL, html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
 	.sapUxAPObjectPageHeaderContent .sapUxAPObjectPageHeaderObjectImage-Circle .sapUxAPObjectPageHeaderObjectImage {
 		margin-right: 2rem;
 		margin-bottom: 1rem;
@@ -40,7 +40,8 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 }
 
 .sapUxAPObjectPageLayout-Std-Tablet,
-.sapUxAPObjectPageLayout-Std-Desktop {
+.sapUxAPObjectPageLayout-Std-Desktop,
+.sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPObjectPageHeaderContentCellRight {
 		padding-right: 2rem;
 	}
diff --git a/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_hcw/ObjectPageHeaderContent.less b/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_hcw/ObjectPageHeaderContent.less
index 336a7cc17f17..673ded329755 100644
--- a/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_hcw/ObjectPageHeaderContent.less
+++ b/src/themelib_sap_fiori_3/src/sap/uxap/themes/sap_fiori_3_hcw/ObjectPageHeaderContent.less
@@ -21,7 +21,7 @@
 	padding: 0;
 }
 
-html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
+html .sapUxAPObjectPageLayout-Std-Desktop-XL, html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
 	.sapUxAPObjectPageHeaderContent .sapUxAPObjectPageHeaderObjectImage-Circle .sapUxAPObjectPageHeaderObjectImage {
 		margin-right: 2rem;
 		margin-bottom: 1rem;
@@ -40,7 +40,8 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 }
 
 .sapUxAPObjectPageLayout-Std-Tablet,
-.sapUxAPObjectPageLayout-Std-Desktop {
+.sapUxAPObjectPageLayout-Std-Desktop,
+.sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPObjectPageHeaderContentCellRight {
 		padding-right: 2rem;
 	}
diff --git a/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon/ObjectPageHeaderContent.less b/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon/ObjectPageHeaderContent.less
index d4e630a8bae8..f049271fdcbc 100644
--- a/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon/ObjectPageHeaderContent.less
+++ b/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon/ObjectPageHeaderContent.less
@@ -21,7 +21,7 @@
 	padding: 0;
 }
 
-html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
+html .sapUxAPObjectPageLayout-Std-Desktop-XL, html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
 	.sapUxAPObjectPageHeaderContent .sapUxAPObjectPageHeaderObjectImage-Circle .sapUxAPObjectPageHeaderObjectImage {
 		margin-right: 2rem;
 		margin-bottom: 1rem;
@@ -40,7 +40,8 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 }
 
 .sapUxAPObjectPageLayout-Std-Tablet,
-.sapUxAPObjectPageLayout-Std-Desktop {
+.sapUxAPObjectPageLayout-Std-Desktop,
+.sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPObjectPageHeaderContentCellRight {
 		padding-right: 2rem;
 	}
@@ -71,6 +72,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 	}
 
 	&:empty {
+		.sapUxAPObjectPageLayout-Std-Desktop-XL &,
 		.sapUxAPObjectPageLayout-Std-Desktop &,
 		.sapUxAPObjectPageLayout-Std-Tablet &,
 		.sapUxAPObjectPageLayout-Std-Phone &
diff --git a/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_dark/ObjectPageHeaderContent.less b/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_dark/ObjectPageHeaderContent.less
index efbd14eeda77..cb0768fa89c2 100644
--- a/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_dark/ObjectPageHeaderContent.less
+++ b/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_dark/ObjectPageHeaderContent.less
@@ -21,7 +21,7 @@
 	padding: 0;
 }
 
-html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
+html .sapUxAPObjectPageLayout-Std-Desktop-XL, html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
 	.sapUxAPObjectPageHeaderContent .sapUxAPObjectPageHeaderObjectImage-Circle .sapUxAPObjectPageHeaderObjectImage {
 		margin-right: 2rem;
 		margin-bottom: 1rem;
@@ -40,7 +40,8 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 }
 
 .sapUxAPObjectPageLayout-Std-Tablet,
-.sapUxAPObjectPageLayout-Std-Desktop {
+.sapUxAPObjectPageLayout-Std-Desktop,
+.sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPObjectPageHeaderContentCellRight {
 		padding-right: 2rem;
 	}
@@ -71,6 +72,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 	}
 
 	&:empty {
+		.sapUxAPObjectPageLayout-Std-Desktop-XL &,
 		.sapUxAPObjectPageLayout-Std-Desktop &,
 		.sapUxAPObjectPageLayout-Std-Tablet &,
 		.sapUxAPObjectPageLayout-Std-Phone &
diff --git a/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_hcb/ObjectPageHeaderContent.less b/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_hcb/ObjectPageHeaderContent.less
index b7ffb7f7c963..1b942e65bdaf 100644
--- a/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_hcb/ObjectPageHeaderContent.less
+++ b/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_hcb/ObjectPageHeaderContent.less
@@ -21,7 +21,7 @@
 	padding: 0;
 }
 
-html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
+html .sapUxAPObjectPageLayout-Std-Desktop-XL, html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
 	.sapUxAPObjectPageHeaderContent .sapUxAPObjectPageHeaderObjectImage-Circle .sapUxAPObjectPageHeaderObjectImage {
 		margin-right: 2rem;
 		margin-bottom: 1rem;
@@ -40,7 +40,8 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 }
 
 .sapUxAPObjectPageLayout-Std-Tablet,
-.sapUxAPObjectPageLayout-Std-Desktop {
+.sapUxAPObjectPageLayout-Std-Desktop,
+.sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPObjectPageHeaderContentCellRight {
 		padding-right: 2rem;
 	}
diff --git a/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_hcw/ObjectPageHeaderContent.less b/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_hcw/ObjectPageHeaderContent.less
index e5794bfbf189..aff4c7c6dad9 100644
--- a/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_hcw/ObjectPageHeaderContent.less
+++ b/src/themelib_sap_horizon/src/sap/uxap/themes/sap_horizon_hcw/ObjectPageHeaderContent.less
@@ -21,7 +21,7 @@
 	padding: 0;
 }
 
-html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
+html .sapUxAPObjectPageLayout-Std-Desktop-XL, html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tablet {
 	.sapUxAPObjectPageHeaderContent .sapUxAPObjectPageHeaderObjectImage-Circle .sapUxAPObjectPageHeaderObjectImage {
 		margin-right: 2rem;
 		margin-bottom: 1rem;
@@ -40,7 +40,8 @@ html .sapUxAPObjectPageLayout-Std-Desktop, html .sapUxAPObjectPageLayout-Std-Tab
 }
 
 .sapUxAPObjectPageLayout-Std-Tablet,
-.sapUxAPObjectPageLayout-Std-Desktop {
+.sapUxAPObjectPageLayout-Std-Desktop,
+.sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPObjectPageHeaderContentCellRight {
 		padding-right: 2rem;
 	}