@openui5/themelib_sap_horizon 1.114.9 → 1.114.11

package/src/sap/m/themes/sap_horizon/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,55 +35,172 @@
 	}
 }
 
+.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 {
 	background: @sapUiButtonHoverBackground;
 	border-radius: 0.5rem;
-	box-shadow: 0 0 0.125rem 0 fade(@sapContent_ShadowColor, 72);
-	border-color: transparent;
+	border-color: @sapUiButtonHoverBorderColor;
 }
 
 html.sap-desktop .sapMSegBBtnFocusable.sapMSegBBtnSel:hover .sapMSegBBtnInner {
-	border-color: inherit;
+	border-color: @sapUiButtonSelectedBorderColor;
 }
 
 html.sap-desktop .sapMSegBBtnFocusable.sapMBtnActive:hover .sapMSegBBtnInner {
-	box-shadow: 0 0 0.125rem 0 fade(@sapInformativeColor, 72);
+	border-color: @sapUiButtonHoverBorderColor;
 }
 
 /* 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;
+		}
 	}
 }
 
@@ -128,7 +249,7 @@ html.sap-desktop {
 
 .sapMSegBBtn.sapMSegBBtnSel:hover {
 	.sapMSegBBtnInner {
-		border-color: @sapUiButtonSelectedHoverBorderColor;
+		border-color: @sapUiButtonSelectedBorderColor;
 	}
 }
 
@@ -207,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/Select.less

@@ -164,18 +164,20 @@ div.sapMSltPicker .sapMSltPickerValueState {
 .sapMSltArrow {
     width: 2.25rem;
     height: 2.25rem;
+
+	&:hover {
+		box-shadow: @sapUiFieldHoverShadow;
+	}
 }
 
 .sapUiSizeCompact .sapMSltArrow {
     width: 2rem;
     height: 1.625rem;
-
 }
 
 .sapMSltPressed >.sapMSltArrow,
 .sapMSlt:hover > .sapMSltArrow {
     background-color: @sapUiButtonActiveBackground;
-    box-shadow: @sapUiFieldHoverShadow;
     overflow: none;
     border-radius: 0.125rem;
 }

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

@@ -12,10 +12,6 @@
 	height: 1.5rem;
 	margin-left: -1rem;
 	top: -0.625rem;
-
-	&:not(:focus) {
-		box-shadow: @sapUiContentSelectedShadow;
-	}
 }
 
 .sapMSlider {
@@ -23,7 +19,7 @@
 	align-items: center;
 }
 
-.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
+.sapMSliderInner .sapMSliderHandle:not(:focus):not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
 	font-family: SAP-icons;
 	content: "\e29c";
 	position: absolute;
@@ -48,15 +44,13 @@
 	&:not(:focus) {
 		border-color: @sapUiSliderHoverHandleBorderColor;
 		background: @sapUiSliderHoverHandleBackground;
-		box-shadow: @sapUiContentSelectedShadow;
 	}
 }
 
 .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus {
-	background: @sapUiSliderActiveHandleBackground;
-	border: 0.125rem solid #0070F2;
+	background: @sapUiSliderActiveRangeHandleBackground;
+	border: @sapUiContentFocusWidth solid @sapUiContentFocusColor;
 	outline: none;
-	box-shadow: none;
 	top: -0.625rem;
 }
 
@@ -128,6 +122,7 @@
 }
 
 .sapMSliderTick {
+	border-color: @sapUiContentMeasureIndicatorColor;
 	margin: 0;
 	height: .5rem;
 }

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/BusyIndicator.less

@@ -5,11 +5,11 @@
 
 /* Background animation element */
 .sapUiLocalBusyIndicatorAnimation > div::before {
-	background: @sapUiBrand;
+	background: @sapUiContentBusyColor;
 	animation-duration: 0ms;
 }
 
 /* Shadow animation element */
 .sapUiLocalBusyIndicatorAnimation > div::after {
-	box-shadow: inset 0px 0px 0px 0px @sapUiBrand;
+	box-shadow: inset 0px 0px 0px 0px @sapUiContentBusyColor;
 }

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

@@ -35,7 +35,7 @@ span.sapMBtnInner.sapMBtnEmphasized {
 /* --------------------- */
 .sapMBtnInner {
 	font-size: @sapMFontMediumSize;
-	height: 2.25rem;
+	height: @sapUiElementHeight;
 	min-width: 2.25rem;
 	margin: 0;
 	padding: 0;
@@ -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;
 }
 
@@ -184,6 +196,10 @@ html.sap-desktop .sapMBtn:focus > .sapMBtnNeutral.sapMFocusable:not(.sapMBadgeIn
 	border-color: @sapUiButtonLiteBorderColor;
 }
 
+.sapMBtn .sapMBtnNeutral.sapMBtnInner {
+	text-shadow: @sapUiContentTextShadow;
+}
+
 /* ---------------------------------------------------------------------*/
 /* Disabled, hover and active states:                                   */
 /* ---------------------------------------------------------------------*/
@@ -279,31 +295,6 @@ html.sap-desktop .sapMFooter-CTX .sapMBtnInner.sapMBtnReject {
 	color: @sapUiButtonLiteTextColor;
 }
 
-// box shadow on hover
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive) {
-	box-shadow: @sapContent_Interaction_Shadow;
-}
-
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive).sapMBtnEmphasized,
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive).sapMBtnSuccess,
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive).sapMBtnNegative,
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive).sapMBtnNeutral,
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive).sapMBtnCritical {
-	box-shadow: none;
-}
-
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive).sapMBtnAccept {
-	box-shadow: @sapContent_Positive_Shadow;
-}
-
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive).sapMBtnReject {
-	box-shadow: @sapContent_Negative_Shadow;
-}
-
-.sapMBtn:not(.sapMBtnDisabled):hover .sapMBtnInner:not(.sapMBtnActive).sapMBtnAttention {
-	box-shadow: @sapContent_Critical_Shadow;
-}
-
 /* ----------------------*/
 /* Badges                */
 /* ----------------------*/
@@ -314,4 +305,12 @@ html.sap-desktop .sapMFooter-CTX .sapMBtnInner.sapMBtnReject {
 	color: @sapContent_BadgeTextColor;
 	font-size: @sapFontSmallSize;
 	text-align: center;
+}
+
+.sapMBtn:hover > .sapMBtnTransparent.sapMBtnHoverable:not(.sapMBtnActive):not(.sapMToggleBtnPressed),
+.sapMIBar-CTX .sapMBtn:hover > .sapMBtnTransparent.sapMBtnHoverable:not(.sapMBtnActive):not(.sapMToggleBtnPressed) {
+
+	bdi {
+		color: @sapUiButtonLiteHoverTextColor;
+	}
 }

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

@@ -227,7 +227,7 @@
 			border: 1px solid @sapButton_BorderColor;
 
 			.sapMITHShowSubItemsIcon {
-				color: @sapButton_TextColor;
+				color: @sapUiBaseText;
 			}
 		}
 	}
@@ -235,8 +235,8 @@
 	.sapMITHEndOverflow:hover,
 	.sapMITHStartOverflow:hover {
 		.sapMITBItem {
-			background: @sapButton_Background;
-			border: 1px solid @_sap_m_IconTabBar_ShellOverflowHoverBorderColor;
+			background: @sapButton_Hover_Background;
+			border: 1px solid @_sap_m_IconTabBar_Overflow_BorderColorHover;
 		}
 	}
 
@@ -249,7 +249,7 @@
 
 	//Arrow button
 	.sapMITBFilterWithItems .sapMITBFilterExpandBtn .sapMBtnIcon  {
-		color: @sapButton_TextColor;
+		color: @sapUiBaseText;
 	}
 }
 
@@ -386,7 +386,7 @@
 			border-color: @sapContent_Selected_ForegroundColor;
 		}
 		.sapMBtnIcon {
-			color: @_sap_m_IconTabBar_SelectedTextColor;
+			color: @_sap_m_IconTabBar_SelectedTextColor !important;
 		}
 	}
 
@@ -466,6 +466,28 @@
 .sapMITBFilterDefault {
 	border-color: @sapUiContentSelectedForegroundColor;
 	color: @sapUiContentSelectedForegroundColor;
+
+	.sapMITBFilterExpandBtnSeparator {
+		border-color: @sapUiBaseText;
+	}
+
+	.sapMBtnIcon {
+		color: @sapUiBaseText !important;
+	}
+}
+
+.sapMITBFilterDefault {
+	.sapMITBFilterWrapper:hover {
+		.sapMITBText {
+			color: @sapUiContentSelectedForegroundColor;
+		}
+	}
+
+	.sapMITBFilterExpandBtn:hover {
+		.sapMBtnIcon {
+			color: @sapUiBaseText;
+		}
+	}
 }
 
 .sapMITBFilterNeutral {
@@ -732,10 +754,11 @@ html.sap-desktop {
 			.sapMITBItem {
 				&:active{
 					background-color: @_sap_m_IconTabBar_Overflow_BackgroundColorPressed;
+					border: 1px solid @_sap_m_IconTabBar_Overflow_BorderColorPressed;
 				}
 				&:active::after {
-					// when overflow is pressed, make the focus white
-					border-color: @_sap_m_IconTabBar_Overflow_TextColorPressed;
+					// when overflow is pressed, hide the focus
+					border-color: transparent;
 				}
 			}
 		}

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

@@ -75,10 +75,14 @@
 	opacity: @sapUiContentDisabledOpacity;
 }
 
-.sapMFocus.sapMInputBase .sapMInputBaseContentWrapper {
+.sapMFocus.sapMInputBase .sapMInputBaseContentWrapper:not(.sapMInputBaseDisabledWrapper) {
 	background-color: @sapField_Focus_Background;
 	outline: none;
 
+	&::before {
+		border-color: @sapUiFieldActiveBorderColor;
+	}
+
 	&.sapMInputBaseReadonlyWrapper {
 		background: @sapField_ReadOnly_Background;
 	}

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;
 }