@openui5/themelib_sap_horizon 1.114.10 → 1.114.12

package/src/sap/m/themes/sap_horizon/SplitButton.less

@@ -8,13 +8,11 @@
 	border-color: @sapUiContentContrastFocusColor;
 }
 
-.sapMSB .sapMSBArrow:not(.sapMBtnDisabled) .sapMBtnTransparent:not(.sapMToggleBtnPressed),
 .sapContrast.sapMIBar-CTX .sapMSB .sapMSBArrow:not(.sapMBtnDisabled) .sapMBtnTransparent:not(.sapMToggleBtnPressed),
 .sapContrast .sapMIBar-CTX .sapMSB .sapMSBArrow:not(.sapMBtnDisabled) .sapMBtnTransparent:not(.sapMToggleBtnPressed) {
 	border-left-color: @sapUiButtonBorderColor;
 }
 
-.sapMSB .sapMSBArrow:not(.sapMBtnDisabled) .sapMBtnActive.sapMBtnTransparent:not(.sapMToggleBtnPressed),
 .sapContrast.sapMIBar-CTX .sapMSB .sapMSBArrow:not(.sapMBtnDisabled) .sapMBtnActive.sapMBtnTransparent:not(.sapMToggleBtnPressed),
 .sapContrast .sapMIBar-CTX .sapMSB .sapMSBArrow:not(.sapMBtnDisabled) .sapMBtnActive.sapMBtnTransparent:not(.sapMToggleBtnPressed) {
 	border-left-color: @sapUiButtonLiteActiveBorderColor;
@@ -45,7 +43,7 @@
 }
 
 .sapMSB .sapMSBInner .sapMSBText:not(.sapMSBTextIE) .sapMBtnInner {
-	margin-right: 2.3125rem;
+	margin-right: 2.25rem;
 }
 
 .sapMSB .sapMSBInner {
@@ -61,10 +59,10 @@
 
 .sapUiSizeCompact {
 	.sapMSB .sapMSBInner {
-		padding: 0.15rem 0;
+		padding: 0.1875rem 0;
 	}
 	.sapMSB .sapMSBText {
-		height: 1.75rem;
+		height: 1.625rem;
 	}
 }
 
@@ -100,8 +98,13 @@
 	background-color: @sapUiButtonAttentionBackground;
 }
 
-.sapMSB .sapMBtnInner {
-	border: none;
+.sapMMenuBtnSplit {
+	.sapMBtnInner,
+	span.sapMBtnInner.sapMBtnAccept,
+	span.sapMBtnInner.sapMBtnAttention,
+	span.sapMBtnInner.sapMBtnReject {
+		border-color: transparent;
+	}
 }
 
 .sapMSB .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
@@ -117,12 +120,18 @@
 	border-radius: 0.35rem;
 }
 
-.sapMSB.sapMSBEmphasized .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before,
-.sapMSB.sapMSBNeutral .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before,
+.sapMSB.sapMSBEmphasized .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
+	background-color: @sapUiButtonEmphasizedTextColor;
+}
+
+.sapMSB.sapMSBNeutral .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
+	background-color: @sapUiButtonInformationTextColor;
+}
+
 .sapMSB.sapMSBSuccess .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before,
 .sapMSB.sapMSBCritical .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before,
 .sapMSB.sapMSBNegative .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
-	background-color: @sapUiButtonEmphasizedTextColor;
+	background-color: @sapUiButtonSuccessTextColor;
 }
 
 .sapMSB.sapMSBAccept .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
@@ -158,7 +167,10 @@
 	border-radius: 0.375rem;
 }
 
-.sapMSB.sapMSBEmphasized:focus .sapMSBInner:not(.sapMSBInnerDisabled)::after {
+.sapMSB.sapMSBEmphasized:focus .sapMSBInner:not(.sapMSBInnerDisabled)::after,
+.sapMSB.sapMSBCritical:focus .sapMSBInner:not(.sapMSBInnerDisabled)::after,
+.sapMSB.sapMSBNegative:focus .sapMSBInner:not(.sapMSBInnerDisabled)::after,
+.sapMSB.sapMSBSuccess:focus .sapMSBInner:not(.sapMSBInnerDisabled)::after {
 	border-color: @sapUiContentContrastFocusColor;
 }
 
@@ -167,7 +179,7 @@
 }
 
 .sapMSB :not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnEmphasized.sapMBtnActive {
-	border: 0.125rem solid @sapUiContentFocusColor;
+	border: 0.0625rem solid @sapUiContentFocusColor;
 	min-width: 2.3125rem;
 
 	&.sapMBtnText > .sapUiIcon {
@@ -176,16 +188,10 @@
 
 	.sapUiIcon {
 		position: absolute;
-		top: -0.0625rem;
-		left: -0.0625rem;
-		padding-left: 0.0625rem;
+		left: 0.0625rem;
 		padding-right: 0.0625rem;
 	}
 
-	.sapMBtnContent {
-		padding-left: 0.0625rem;
-	}
-
 	.sapUiIcon + .sapMBtnContent {
 		padding-left: 1.4375rem;
 	}
@@ -198,8 +204,8 @@
 
 	:not(.sapMBtnDisabled) > span.sapMBtnInner {
 		&.sapMBtnInner.sapMBtnText {
-			padding-left: 0.4375rem;
-			padding-right: 0.5rem;
+			padding-right: 0.3125rem;
+			padding-left: 0.3125rem;
 		}
 		&.sapMBtnEmphasized.sapMBtnActive {
 			min-width: 2rem;
@@ -211,8 +217,18 @@
 	}
 }
 
-.sapMSB .sapMSBArrow:not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnEmphasized.sapMBtnActive .sapUiIcon {
-	left: -0.0625rem;
+.sapUiSizeCompact {
+	.sapMSB :not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnEmphasized.sapMBtnActive {
+		.sapUiIcon {
+			position: absolute;
+			left: 0;
+			padding-right: 0;
+		}
+	
+		.sapMBtnContent {
+			top: 0;
+		}
+	}
 }
 
 .sapMMenuBtn .sapMBtnDisabled {
@@ -237,6 +253,13 @@ html.sap-desktop .sapMMenuBtnSplit .sapMBtn:focus > .sapMFocusable:after {
 	right: 0.125rem;
 }
 
+.sapUiSizeCompact {
+	.sapMSB:focus .sapMSBInner:not(.sapMSBInnerDisabled)::after {
+		left: 0.0625rem;
+		right: 0.0625rem;
+	}
+}
+
 html.sap-desktop .sapMSB .sapMBtn:focus > .sapMFocusable:not(.sapMBadgeIndicator):before {
 	width: auto;
 	height: auto;

package/src/sap/m/themes/sap_horizon_dark/Button.less

@@ -159,6 +159,19 @@ html.sap-desktop .sapMBtn:focus > .sapMBtnEmphasized.sapMBtnActive.sapMFocusable
 	border-color:    @sapUiContentFocusColor;
 }
 
+// Value State Message buttons
+:not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnCritical.sapMBtnActive {
+	border-color: @sapUiButtonCriticalBorderColor;
+}
+
+:not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnNegative.sapMBtnActive {
+	border-color: @sapUiButtonNegativeBorderColor;
+}
+
+:not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnSuccess.sapMBtnActive {
+	border-color: @sapButton_Success_BorderColor;
+}
+
 html.sap-desktop .sapMBtn:focus > .sapMFocusable:not(.sapMBadgeIndicator):before {
 	content: "";
 	position: absolute;
@@ -173,10 +186,9 @@ html.sap-desktop .sapMBtn:focus > .sapMFocusable:not(.sapMBadgeIndicator):before
 }
 
 html.sap-desktop .sapMBtn:focus > .sapMBtnEmphasized.sapMFocusable:not(.sapMBtnActive):not(.sapMToggleBtnPressed):not(.sapMBadgeIndicator):before,
-html.sap-desktop .sapMBtn:focus > .sapMBtnCritical.sapMFocusable:not(.sapMBadgeIndicator):before,
-html.sap-desktop .sapMBtn:focus > .sapMBtnNegative.sapMFocusable:not(.sapMBadgeIndicator):before,
-html.sap-desktop .sapMBtn:focus > .sapMBtnSuccess.sapMFocusable:not(.sapMBadgeIndicator):before,
-html.sap-desktop .sapMBtn:focus > .sapMBtnNeutral.sapMFocusable:not(.sapMBadgeIndicator):before {
+html.sap-desktop .sapMBtn:focus > .sapMBtnCritical.sapMFocusable:not(.sapMBtnActive):not(.sapMBadgeIndicator):before,
+html.sap-desktop .sapMBtn:focus > .sapMBtnNegative.sapMFocusable:not(.sapMBtnActive):not(.sapMBadgeIndicator):before,
+html.sap-desktop .sapMBtn:focus > .sapMBtnSuccess.sapMFocusable:not(.sapMBtnActive):not(.sapMBadgeIndicator):before {
 	border: 0.125rem solid @sapUiContentContrastFocusColor;
 }
 

package/src/sap/m/themes/sap_horizon_dark/MenuButton.less

@@ -60,9 +60,6 @@
 }
 
 .sapMMenuBtnSplit .sapMSB:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnEmphasized.sapMBtnActive {
-	padding-right: 0.4375rem;
-	padding-left: 0.4375rem;
-
 	.sapMBtnContent {
 		position: relative;
 		left: 0;
@@ -74,4 +71,22 @@
 		padding-right: 0.3125rem;
 		padding-left: 0.3125rem;
 	}
+	.sapMMenuBtn .sapMBtn:not(.sapMSBArrow) .sapMBtnInner .sapMBtnIcon,
+	.sapMMenuBtn .sapMBtn:not(.sapMSBArrow) .sapMBtnInner .sapMBtnContent {
+		position: relative;
+		top: 0;
+		left: 0;
+	}
+}
+
+.sapMMenuBtn.sapMMenuBtnRegular .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnNegative.sapMBtnActive::after {
+	color: @sapUiButtonNegativeActiveTextColor;
+}
+
+.sapMMenuBtn.sapMMenuBtnRegular .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnCritical.sapMBtnActive::after {
+	color: @sapUiButtonCriticalActiveTextColor;
+}
+
+.sapMMenuBtn.sapMMenuBtnRegular .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnSuccess.sapMBtnActive::after {
+	color: @sapUiButtonSuccessActiveTextColor;
 }

package/src/sap/m/themes/sap_horizon_dark/ObjectNumber.less

@@ -3,17 +3,21 @@
 /* Evening Horizon theme               */
 /* =================================== */
 
-.sapMObjectNumberInverted .sapMObjectNumberText,
-.sapMObjectNumberInverted .sapMObjectNumberUnit {
-	text-shadow: @sapUiContentContrastTextShadow;
-}
-
 .sapMObjectNumberInverted {
-	.sapMObjectNumberInner {
-		border-radius: 0.25rem;
+	box-sizing: border-box;
+	&:not(.sapMObjectNumberLarge) .sapMObjectNumberInner {
+		min-height: 1rem;
+		height: auto;
 	}
 }
 
+.sapMObjectNumberInverted .sapMObjectNumberInner {
+	border: 0.0625rem solid;
+	border-radius: @sapUiButtonBorderCornerRadius;
+	padding: 0.1875rem 0.25rem;
+	vertical-align: middle;
+}
+
 html.sap-desktop .sapMObjectNumberActive:focus {
 	.sapMObjectNumberInner::after {
 		left: -0.0625rem;
@@ -33,7 +37,7 @@ html.sap-desktop .sapMObjectNumberActive:focus {
 		bottom: -0.0625rem;
 		height: auto;
 		outline: none;
-		border-radius: 0.25rem;
+		border-radius: @sapUiButtonBorderCornerRadius;
 		border: 0.125rem solid @sapUiContentFocusColor;
 	}
 
@@ -52,29 +56,115 @@ html.sap-desktop .sapMObjectNumberActive:focus {
 			bottom: -0.0625rem;
 			height: auto;
 			outline: none;
-			border-radius: 0.25rem;
+			border-radius: @sapUiButtonBorderCornerRadius;
 			border: 0.125rem solid @sapUiContentFocusColor;
 		}
 	}
 }
 
-.objectNumberStatusMixIn(@class, @innerBackgroundColor, @innerColor, @activeInnerBackgroundColor, @activeInnerColor, @pressedInnerBackgroundColor) {
+.objectNumberStatusMixIn(@class, @regularBackgroundColor, @regularTextColor, 
+				@hoverBackgroundColor, @hoverTextColor, 
+				@activeBackgroundColor, @activeTextColor,
+				@regularTextShadow, @activeTextShadow, 
+				@regularBorderColor, @hoverBorderColor, @activeBorderColor) {
 	.sapMObjectNumberInverted.@{class} {
+		.sapMObjectNumberText,
+		.sapMObjectNumberUnit {
+			text-shadow: @regularTextShadow;
+		}
 		.sapMObjectNumberInner {
-			background-color: @innerBackgroundColor;
-			color: @innerColor;
+			border-color: @regularBorderColor;
+			background-color: @regularBackgroundColor;
+			color: @regularTextColor;
 		}
 
 		&.sapMObjectNumberActive {
 			.sapMObjectNumberInner:hover {
-				background-color: @activeInnerBackgroundColor;
-				color: @activeInnerColor;
+				border-color: @hoverBorderColor;
+				background-color: @hoverBackgroundColor;
+				color: @hoverTextColor;
 			}
 			.sapMObjectNumberInner:active,
 			&.sapMObjectNumberPressed .sapMObjectNumberInner {
-				background-color: @pressedInnerBackgroundColor;
-				color: @innerColor;
+				border-color: @activeBorderColor;
+				background-color: @activeBackgroundColor;
+				color: @activeTextColor;
+
+				.sapMObjectNumberText,
+				.sapMObjectNumberUnit {
+					text-shadow: @activeTextShadow;
+				}
 			}
 		}
 	}
-}
+}
+
+.objectNumberStatusMixIn(sapMObjectNumberStatusNone, 
+	@sapNeutralBackground, 
+	@sapTextColor, 
+	@sapUiButtonNeutralHoverBackground, 
+	@sapUiButtonNeutralHoverTextColor, 
+	@sapUiButtonNeutralActiveBackground, 
+	@sapUiButtonActiveTextColor, 
+	@sapUiContentTextShadow, 
+	@sapUiContentTextShadow, 
+	@sapNeutralBorderColor, 
+	@sapUiButtonNeutralHoverBorderColor, 
+	@sapUiButtonNeutralActiveBorderColor
+);
+
+.objectNumberStatusMixIn(sapMObjectNumberStatusInformation, 
+	@sapUiButtonInformationBackground, 
+	@sapUiButtonInformationTextColor, 
+	@sapUiButtonInformationHoverBackground, 
+	@sapUiButtonInformationHoverTextColor, 
+	@sapUiButtonInformationActiveBackground, 
+	@sapUiButtonSelectedTextColor,  
+	@sapUiContentTextShadow,
+	@sapUiContentTextShadow,  
+	@sapUiButtonInformationBorderColor, 
+	@sapUiButtonInformationHoverBorderColor, 
+	@sapUiButtonInformationActiveBorderColor
+);
+
+.objectNumberStatusMixIn(sapMObjectNumberStatusError, 
+	@sapUiButtonNegativeBackground, 
+	@sapUiButtonNegativeTextColor, 
+	@sapUiButtonNegativeHoverBackground, 
+	@sapUiButtonNegativeHoverTextColor, 
+	@sapUiButtonNegativeActiveBackground, 
+	@sapUiButtonRejectSelectedTextColor, 
+	@sapUiContentContrastTextShadow, 
+	@sapUiContentTextShadow, 
+	@sapUiButtonNegativeBorderColor, 
+	@sapUiButtonNegativeHoverBorderColor, 
+	@sapUiButtonNegativeActiveBorderColor
+);
+
+.objectNumberStatusMixIn(sapMObjectNumberStatusWarning, 
+	@sapUiButtonCriticalBackground, 
+	@sapUiButtonCriticalTextColor, 
+	@sapUiButtonCriticalHoverBackground, 
+	@sapUiButtonCriticalHoverTextColor, 
+	@sapUiButtonCriticalActiveBackground, 
+	@sapUiButtonAttentionSelectedTextColor, 
+	@sapUiContentContrastTextShadow, 
+	@sapUiContentTextShadow, 
+	@sapUiButtonCriticalBorderColor, 
+	@sapUiButtonCriticalHoverBorderColor, 
+	@sapUiButtonCriticalActiveBorderColor
+);
+
+.objectNumberStatusMixIn(sapMObjectNumberStatusSuccess, 
+	@sapUiButtonSuccessBackground, 
+	@sapUiButtonSuccessTextColor, 
+	@sapUiButtonSuccessHoverBackground, 
+	@sapUiButtonSuccessHoverTextColor, 
+	@sapUiButtonSuccessActiveBackground, 
+	@sapUiButtonAcceptSelectedTextColor, 
+	@sapUiContentContrastTextShadow, 
+	@sapUiContentTextShadow, 
+	@sapUiButtonSuccessBorderColor, 
+	@sapUiButtonSuccessHoverBorderColor, 
+	@sapUiButtonSuccessActiveBorderColor
+);

package/src/sap/m/themes/sap_horizon_dark/ProgressIndicator.less

@@ -29,6 +29,10 @@
 	}
 }
 
+.sapMPIValueMax .sapMPIBarRemaining {
+	display: flex;
+}
+
 .sapMPIBarRemaining {
 	position: absolute;
     width: ~'calc(100% - 1.25rem)';

package/src/sap/m/themes/sap_horizon_dark/SegmentedButton.less

@@ -19,10 +19,14 @@
 			text-shadow: none;
 			color: @sapUiButtonTextColor;
 			border-top: 1px solid @sapUiButtonBorderColor;
-			border-left: 1px solid @sapUiButtonBorderColor;
+			border-left: 1px solid transparent;
 			border-bottom: 1px solid @sapUiButtonBorderColor;
 			border-right: 1px solid transparent;
-			background-color: @sapUiButtonBackground;
+			background-color: transparent;
+			margin-left: 1px;
+			margin-right: 1px;
+			margin-top: -1px;
+			margin-bottom: -1px;
 		}
 		&:not(.sapMSegBBtnMixed) .sapMImg {
 			padding-left: 0.5625rem;
@@ -31,20 +35,39 @@
 	}
 }
 
+.sapMSegB .sapMSegBBtn .sapMSegBBtnInnerWrapper {
+	border-top: 1px solid @sapUiButtonBorderColor;
+	border-bottom: 1px solid @sapUiButtonBorderColor;
+	background-color: @sapUiButtonBackground;
+}
+
 .sapMSegB .sapMSegBBtn {
 	position: relative;
 }
 
-.sapMSegBBtn:first-child .sapMSegBBtnInner,
+.sapMSegBBtn:first-child .sapMSegBBtnInner {
+	border-top-left-radius: @sapUiButtonBorderCornerRadius;
+	border-bottom-left-radius: @sapUiButtonBorderCornerRadius;
+	border-left: 1px solid @sapUiButtonBorderColor;
+	margin-left: -1px;
+}
+
 .sapMSegBBtn:first-child .sapMSegBBtnInnerWrapper {
 	border-top-left-radius: @sapUiButtonBorderCornerRadius;
 	border-bottom-left-radius: @sapUiButtonBorderCornerRadius;
 }
 
-.sapMSegBBtn:last-child .sapMSegBBtnInner,
-.sapMSegBBtn:last-child .sapMSegBBtnInnerWrapper {
+.sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInnerWrapper {
+	border-top-right-radius: @sapUiButtonBorderCornerRadius;
+	border-bottom-right-radius: @sapUiButtonBorderCornerRadius;
+	border-right: 1px solid @sapUiButtonBorderColor;
+}
+
+.sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner{
 	border-top-right-radius: @sapUiButtonBorderCornerRadius;
 	border-bottom-right-radius: @sapUiButtonBorderCornerRadius;
+	border-right: 1px solid @sapUiButtonBorderColor;
+	margin-right: -1px;
 }
 
 html.sap-desktop .sapMSegBBtnFocusable:hover .sapMSegBBtnInner {
@@ -54,7 +77,7 @@ html.sap-desktop .sapMSegBBtnFocusable:hover .sapMSegBBtnInner {
 }
 
 html.sap-desktop .sapMSegBBtnFocusable.sapMSegBBtnSel:hover .sapMSegBBtnInner {
-	border-color: inherit;
+	border-color: @sapUiButtonSelectedBorderColor;
 }
 
 html.sap-desktop .sapMSegBBtnFocusable.sapMBtnActive:hover .sapMSegBBtnInner {
@@ -63,22 +86,121 @@ html.sap-desktop .sapMSegBBtnFocusable.sapMBtnActive:hover .sapMSegBBtnInner {
 
 /* Custom focus outline: */
 html.sap-desktop {
-	.sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
+	.sapMSegBBtn:first-child.sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
 		content: "";
 		position: absolute;
 		box-sizing: border-box;
 		left: 0.125rem;
 		top: 0.375rem;
+		right: 0.2rem;
+		bottom: 0.375rem;
+		pointer-events: none;
+		border: 0.125rem solid @sapUiContentFocusColor;
+		border-radius: 0.375rem;
+	}
+	.sapUiSizeCompact .sapMSegBBtn:first-child.sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after,
+	&.sapUiSizeCompact .sapMSegBBtn:first-child.sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
+		top: 0.3rem;
+		bottom: 0.3rem;
+	}
+}
+
+/* Custom focus outline: */
+html.sap-desktop {
+	.sapMSegBBtn.sapMSegBtnLastVisibleButton.sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
+		content: "";
+		position: absolute;
+		box-sizing: border-box;
+		left: 0.2rem;
+		top: 0.375rem;
 		right: 0.125rem;
 		bottom: 0.375rem;
 		pointer-events: none;
 		border: 0.125rem solid @sapUiContentFocusColor;
 		border-radius: 0.375rem;
 	}
+	.sapUiSizeCompact .sapMSegBBtn.sapMSegBtnLastVisibleButton.sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after,
+	&.sapUiSizeCompact .sapMSegBBtn.sapMSegBtnLastVisibleButton.sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
+		top: 0.3rem;
+		bottom: 0.3rem;
+	}
+}
+
+html.sap-desktop {
+	.sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
+		content: "";
+		position: absolute;
+		box-sizing: border-box;
+		left: 0.2rem;
+		top: 0.375rem;
+		right: 0.2rem;
+		bottom: 0.375rem;
+		pointer-events: none;
+		border: 0.125rem solid @sapUiContentFocusColor;
+		border-radius: 0.375rem;
+	}
 	.sapUiSizeCompact .sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after,
 	&.sapUiSizeCompact .sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
-		top: 0.325rem;
-		bottom: 0.325rem;
+		top: 0.3rem;
+		bottom: 0.3rem;
+	}
+}
+
+.sapMSegB.sapMSegBIcons {
+	.sapMSegBBtn.sapMSegBtnLastVisibleButton:not(.sapMSegBBtnMixed) .sapMSegBBtnInner {
+		margin-right: -1px;
+	}
+}
+
+.sapMSegB.sapMSegBIcons {
+	.sapMSegBBtn.sapMSegBtnLastVisibleButton:not(.sapMSegBBtnMixed) .sapMSegBBtnInner {
+		margin-right: -1px;
+	}
+}
+
+/* Custom focus outline: */
+html.sap-desktop {
+	.sapMSegB.sapMSegBIcons {
+		.sapMSegBBtn.sapMSegBBtnFocusable:not(.sapMSegBtnLastVisibleButton):not(.sapMSegBBtnMixed):focus .sapMSegBBtnInner:after {
+			content: "";
+			position: absolute;
+			box-sizing: border-box;
+			left: 0.2rem;
+			top: 0.375rem;
+			right: 0.15rem;
+			bottom: 0.375rem;
+			pointer-events: none;
+			border: 0.125rem solid @sapUiContentFocusColor;
+			border-radius: 0.375rem;
+		}
+	}
+	.sapUiSizeCompact .sapMSegB.sapMSegBIcons .sapMSegBBtn.sapMSegBBtnFocusable:not(.sapMSegBBtnMixed):not(.sapMSegBtnLastVisibleButton):focus .sapMSegBBtnInner:after,
+	&.sapUiSizeCompact .sapMSegB.sapMSegBIcons .sapMSegBBtn.sapMSegBBtnFocusable:not(.sapMSegBBtnMixed):not(.sapMSegBtnLastVisibleButton):focus .sapMSegBBtnInner:after {
+		top: 0.3rem;
+		bottom: 0.3rem;
+	}
+}
+
+/* Custom focus outline: */
+html.sap-desktop {
+	.sapMSegB.sapMSegBIcons {
+		.sapMSegBBtn.sapMSegBBtnFocusable:not(.sapMSegBBtnMixed):first-child:focus .sapMSegBBtnInner:after {
+			content: "";
+			position: absolute;
+			box-sizing: border-box;
+			left: 0.15rem;
+			top: 0.375rem;
+			right: 0.15rem;
+			bottom: 0.375rem;
+			pointer-events: none;
+			border: 0.125rem solid @sapUiContentFocusColor;
+			border-radius: 0.375rem;
+		}
+		.sapUiSizeCompact .sapMSegBBtn.sapMSegBBtnFocusable:not(.sapMSegBBtnMixed):first-child:focus .sapMSegBBtnInner:after,
+		&.sapUiSizeCompact .sapMSegBBtn.sapMSegBBtnFocusable:not(.sapMSegBBtnMixed):first-child:focus .sapMSegBBtnInner:after {
+			top: 0.3rem;
+			bottom: 0.3rem;
+		}
 	}
 }
 
@@ -127,7 +249,7 @@ html.sap-desktop {
 
 .sapMSegBBtn.sapMSegBBtnSel:hover {
 	.sapMSegBBtnInner {
-		border-color: @sapUiButtonSelectedHoverBorderColor;
+		border-color: @sapUiButtonSelectedBorderColor;
 	}
 }
 
@@ -206,7 +328,7 @@ html.sap-desktop .sapMSegBBtnFocusable.sapMBtnActive:hover .sapMSegBBtnInner {
 		border-bottom-left-radius: 0.5rem;
 	}
 
-	.sapMSegBBtn:last-child .sapMSegBBtnInner {
+	.sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner {
 		border-top-right-radius: 0.5rem;
 		border-bottom-right-radius: 0.5rem;
 	}

package/src/sap/m/themes/sap_horizon_dark/Select.less

@@ -118,8 +118,10 @@ html.sap-desktop .sapMSltIconOnly.focus:not(.sapMSltExpanded):not(.sapMSltDisabl
 }
 
 .sapMSlt.sapMSltReadonly {
-    background: @sapUiFieldReadOnlyBackground;
-    border-bottom: dashed @sapUiElementBorderWidth @sapUiFieldReadOnlyBorderColor;
+    border-color: @sapUiFieldReadOnlyBorderColor;
+    background:@sapUiFieldReadOnlyBackgroundStyle;
+    background-color: @sapUiFieldReadOnlyBackground;
+    box-shadow: none;
 }
 
 div.sapMSltPicker .sapMSltPickerValueState {