@openui5/themelib_sap_horizon 1.101.0 → 1.102.2

package/src/sap/m/themes/sap_horizon_hcw/RangeSlider.less

@@ -3,6 +3,11 @@
 /* Horizon High Contrast White theme  */
 /* ================================== */
 
+@_sap_m_RangeSlider_Handle_Height: 1.5rem;
+@_sap_m_RangeSlider_Handle_Width: 2rem;
+@_sap_m_RangeSlider_Handle_Height_Compact: 1.25rem;
+@_sap_m_RangeSlider_Handle_Width_Compact: 1.5rem;
+
 /* overlap */
 .sapMSliderHandle.sapMSliderHandleOverlap {
 	border: 0.125rem solid darken(@sapUiFieldActiveBorderColor, 5);
@@ -19,28 +24,95 @@
 		}
 	}
 	.sapMSliderInner .sapMSliderHandle {
-		background: fade(@sapUiButtonBackground, 25);
+		background: @sapUiSliderRangeHandleBackground;
+		box-shadow: @sapUiContentSelectedShadow;
+		top: -0.625rem;
 	}
 
 	.sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle {
 		&:hover {
-			background-color: fade(@sapUiButtonHoverBackground, 25);
-			border-color: @sapUiButtonHoverBorderColor;
+			background-color: @sapUiSliderHoverHandleBackground;
+			border-color: @sapUiSliderHoverHandleBorderColor;
+			box-shadow: @sapUiContentSelectedShadow;
 		}
 
-		&:active {
-			background: fade(@sapUiButtonActiveBackground, 25);
-			border-color: @sapUiButtonActiveBorderColor;
+		&.sapMSliderHandlePressed {
+			&:not(:focus) {
+				background: transparent;
+				border: 0.125rem solid @sapUiSliderActiveHandleBorderColor;
+				outline: none;
+				box-shadow: none;
+				top: -0.625rem;
+			}
 		}
 
-		&.sapMSliderHandlePressed {
-			background: fade(@sapUiButtonActiveBackground, 25);
-			border-color: @sapUiButtonActiveBorderColor;
+		&:focus {
+			background: @sapUiSliderActiveRangeHandleBackground;
+			border: 0.125rem solid @sapUiSliderActiveHandleBorderColor;
+			outline: none;
+			box-shadow: none;
+			top: -0.625rem;
+		}
+	}
+
+	.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
+		top: 4px;
+	}
+}
+
+.sapMRangeSlider .sapMSliderInner::before {
+	border: 0.0625rem solid @sapUiContentMeasureIndicatorColor;
+	background-color: @sapUiContentMeasureIndicatorColor;
+}
+
+.sapUiSizeCompact {
+	.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle.sapMSliderHandlePressed {
+		&:not(:focus) {
+			background: transparent;
+			border: 0.125rem solid @sapUiSliderActiveHandleBorderColor;
+			outline: none;
+			box-shadow: none;
+			top: -0.5rem;
 		}
 	}
 
-	.sapMSliderInner:not(.sapMSliderInnerDisabled):hover > .sapMSliderHandle {
-		background-color: fade(@sapUiButtonHoverBackground, 25);
-		border-color: @sapUiButtonHoverBorderColor;
+	.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus {
+		background: @sapUiSliderActiveRangeHandleBackground;
+		border: 0.125rem solid @sapUiSliderActiveHandleBorderColor;
+		outline: none;
+		box-shadow: none;
+		top: -0.5rem;
 	}
+
+	.sapMRangeSlider.sapMSlider .sapMSliderInner .sapMSliderHandle {
+		top: -0.5rem;
+	}
+
+	.sapMRangeSlider.sapMSlider .sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
+		top: 2px;
+		right: 0.25rem;
+	}
+
+	.sapMSliderLabels {
+		margin: 0.625rem -0.875rem 0 -0.875rem;
+	}
+}
+
+html.sap-desktop .sapMSliderProgress:focus:before {
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+	border-radius: 0.5rem;
+	content: "";
+	display: block;
+	position: absolute;
+	height: ~"calc(@{_sap_m_RangeSlider_Handle_Height} + 0.375rem)";
+	width: ~"calc(100% + ((@{_sap_m_RangeSlider_Handle_Width}) + 0.375rem))";
+	top: ~"calc(-1 * ((@{_sap_m_RangeSlider_Handle_Height} / 2) + 0.1875rem))";
+	left: ~"calc(-1 * ((@{_sap_m_RangeSlider_Handle_Width} / 2) + 0.3125rem))";
+}
+
+html.sap-desktop .sapUiSizeCompact .sapMSliderProgress:focus:before {
+	height: ~"calc(@{_sap_m_RangeSlider_Handle_Height_Compact} + 0.375rem)";
+	width: ~"calc(100% + ((@{_sap_m_RangeSlider_Handle_Width_Compact}) + 0.375rem))";
+	top: ~"calc(-1 * ((@{_sap_m_RangeSlider_Handle_Height_Compact} / 2) + 0.1875rem))";
+	left: ~"calc(-1 * ((@{_sap_m_RangeSlider_Handle_Width_Compact} / 2) + 0.3125rem))";
 }

package/src/sap/m/themes/sap_horizon_hcw/RatingIndicator.less

@@ -4,6 +4,10 @@
 /* ====================================== */
 
 .sapMRI {
+	&:not(.sapMRIDisabled):not(.sapMRIDisplayOnly):not(.sapMRIReadOnly):hover {
+		opacity: 0.9;
+	}
+
 	.sapMRISel, .sapMRIHov {
 		color: @sapUiContentRatedColor;
 	}
@@ -35,4 +39,8 @@ html.sap-desktop .sapMRI:focus:not(.sapMRIDisabled):not(.sapMRIDisplayOnly) {
 
 .sapMRIIconSel, .sapMRIIconUnsel, .sapMRIIconHov, .sapMRIIconReadOnly {
 	font-size: 1.5rem;
+}
+
+.sapMRIIconSel, .sapMRIIconUnsel {
+	text-shadow: @sapContent_TextShadow;
 }

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

@@ -33,7 +33,6 @@
 .sapMSegBBtn:first-child .sapMSegBBtnInner {
 	border-top-left-radius: 0.375rem;
 	border-bottom-left-radius: 0.375rem;
-	
 }
 
 .sapMSegBBtn:last-child .sapMSegBBtnInner {

package/src/sap/m/themes/sap_horizon_hcw/SinglePlanningCalendarGrid.less

@@ -17,7 +17,6 @@
 
 .sapMSinglePC .sapUiCalendarAppCont{
 	border-left: 0.0625rem solid darken(@sapUiListBorderColor, 15);
-	border-radius: 0 0.125rem 0.125rem 0.125rem;
 }
 
 html.sap-desktop {
@@ -37,8 +36,7 @@ html.sap-desktop {
 	}
 
 	.sapMSinglePCColumnHeader .sapUiCalItem.sapUiCalItemNow {
-		border-color: @sapUiLegendCurrentDateTime;
-		border-radius: 0.25rem;
+		border: none;
 	}
 
 	.sapMSinglePCNowMarker {
@@ -59,6 +57,9 @@ html.sap-desktop {
 	.sapMSinglePCAppointmentWrap.sapUiCalendarRowApps {
 		.sapUiCalendarAppSel{
 			border: 0.0625rem solid @sapUiListSelectionBorderColor;
+			.sapUiCalendarAppCont {
+				border: none;
+			}
 		}
 		&:focus {
 			.sapUiCalendarAppCont:after {
@@ -76,10 +77,6 @@ html.sap-desktop {
 
 	.sapMSinglePCColumnHeader {
 		.sapUiCalItem.sapUiCalItemNow {
-			.sapUiCalItemText {
-				border: 0.0625rem solid white;
-			}
-
 			.sapUiCalSpecialDate {
 				position: absolute;
 				left: 0;
@@ -91,9 +88,12 @@ html.sap-desktop {
 		.sapUiCalItem .sapUiCalSpecialDate {
 			height: 0.25rem;
 		}
+	}
 
-		.sapUiCalItem.sapUiCalItemNow.sapUiCalItemSel .sapUiCalItemText {
-			border: 0.0625rem solid black;
+	.sapMSinglePCAppointmentWrap.sapUiCalendarRowApps {
+		.sapUiCalendarApp {
+			border-top-left-radius: 0;
+			border-bottom-left-radius: 0;
 		}
 	}
 }
@@ -111,10 +111,8 @@ html.sap-desktop {
 			outline: 0.0625rem solid white;
 			box-shadow: inset white;
 			&.sapUiCalItemSel {
-				background-color: @sapUiContentSelectedBackground;
 				outline: 0.0625rem solid black;
 				box-shadow: inset black;
-				border: 0.125rem solid @sapUiLegendCurrentDateTime;
 			}
 			&.sapUiCalItemSel:hover {
 				background-color: @sapUiActive;
@@ -159,4 +157,9 @@ html.sap-desktop {
 			}
 		}
 	}
+}
+
+.sapMSinglePCBlockers > .sapUiCalendarRowApps > .sapUiCalendarApp > .sapUiCalendarAppCont,
+.sapMSinglePCAppointments > .sapUiCalendarRowApps > .sapUiCalendarApp > .sapUiCalendarAppCont {
+	background-color: @sapUiListHoverBackground;
 }

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

@@ -4,45 +4,95 @@
 /* ================================== */
 
 .sapMSliderInner {
-	background: @sapUiFieldBorderColor;
-	height: 0.375rem;
-	min-width: 4rem;
-	border-radius: 0.375rem;
+	background: @sapUiSliderBackground;
+	border: 0.0625rem solid @sapUiSliderBorderColor;
 }
 
 .sapMSliderProgress {
-	background: @sapUiSelected;
-	height: 0.25rem;
-	border: solid 0.0625rem @sapUiFieldBorderColor;
-	border-radius: 0.375rem;
+	background: @sapUiSliderSelectedBackground;
+	border-color: @sapUiSliderSelectedBorderColor;
+	&:before {
+		content: none;
+		transform: none;
+	}
 }
 
 .sapMSliderInner:not(.sapMSliderInnerDisabled):hover > .sapMSliderHandle {
-	background: @sapUiButtonHoverBackground;
-	border-color: @sapUiButtonHoverBorderColor;
+	background: @sapUiSliderHoverHandleBackground;
+	border-color: @sapUiSliderHoverHandleBorderColor;
+	box-shadow: @sapUiContentSelectedShadow;
 }
 
 /* slider handle */
 .sapMSliderInner .sapMSliderHandle {
-	background: @sapUiButtonBackground;
-	border: solid 0.125rem @sapUiFieldBorderColor;
-	width: 1.625rem;
-	height: 1.625rem;
-	top: -0.75rem;
+	background: @sapUiSliderHandleBackground;
+	border: 1px solid @sapUiSliderHandleBorderColor;
+	border-radius: 0.5rem;
+	width: 2rem;
+	height: 1.5rem;
+	margin-left: -1rem;
+	top: -0.625rem;
+
+	&:not(:focus) {
+		box-shadow: @sapUiContentSelectedShadow;
+	}
+
+	&:focus:before {
+		content: '';
+		position: absolute;
+		border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+		border-radius: 0.75rem;
+		pointer-events: none;
+		top: -5px;
+		bottom: -5px;
+		left: -5px;
+		right: -5px;
+	}
+}
+
+.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
+	font-family: SAP-icons;
+	content: "\e244";
+	position: absolute;
+	top: 4px;
+	right: 0.5rem;
+	overflow: hidden;
+	vertical-align: middle;
+	font-size: 14px;
+	color: @sapContent_Selected_ForegroundColor;
+}
+
+.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled):hover>.sapMSliderHandle):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):focus:active {
+	&:after {
+		top: 3px;
+		right: 0.4375rem;
+	}
 }
 
 .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle {
 	&:hover {
-		background: @sapUiButtonHoverBackground;
-		border-color: @sapUiButtonHoverBorderColor;
+		background: @sapUiSliderHoverHandleBackground;
+		border-color: @sapUiSliderHoverHandleBorderColor;
+		box-shadow: @sapUiContentSelectedShadow;
 	}
 
-	&:active {
-		background: @sapUiButtonActiveBackground;
-		border-color: @sapUiButtonActiveBorderColor;
+	&:focus:active {
+		background: @sapUiSliderActiveHandleBackground;
+		border: 0.125rem solid @sapUiSliderActiveHandleBorderColor;
+		box-shadow: none;
+		&:before {
+			content: none;
+		}
 	}
 }
 
+.sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus {
+	background: @sapUiSliderHandleBackground;
+	outline: none;
+	box-shadow: none;
+	top: -0.625rem;
+}
+
 .sapMSliderTickLabel .sapMSliderLabel {
 	padding-top: 0.4375rem;
 	height: 1rem;
@@ -72,7 +122,33 @@
 
 /* disabled */
 .sapMSliderDisabled {
-	opacity: 0.5;
+	opacity: 0.4;
+}
+
+.sapMSliderInner::before {
+	content: "";
+	position: absolute;
+	box-sizing: border-box;
+	border: 0.0625rem solid @sapUiContentSelectedMeasureIndicatorColor;
+	background-color: @sapUiSliderSelectedBackground;
+	border-radius: 50%;
+	width: 0.5rem;
+	height: 0.5rem;
+	left: -14px;
+	top: -2px;
+}
+
+.sapMSlider::after {
+	content: "";
+	position: absolute;
+	background-color: @sapUiContentMeasureIndicatorColor;
+	box-sizing: border-box;
+	border: 0.0625rem solid @sapUiContentMeasureIndicatorColor;
+	border-radius: 50%;
+	width: 0.5rem;
+	height: 0.5rem;
+	right: 2px;
+	top: 21px;
 }
 
 /* pressed */
@@ -83,13 +159,39 @@
 }
 
 .sapUiSizeCompact {
+	.sapMSlider::after {
+		top: 14px;
+		right: 6px;
+	}
+
+	.sapMSliderInner::before {
+		left: -12px;
+	}
+
+	.sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus {
+		top: -0.5rem;
+	}
+
 	.sapMSliderHandle {
-		width: 1.25rem;
+		width: 1.5rem;
 		height: 1.25rem;
-		top: -0.625rem;
+		margin-left: -0.75rem;
+		top: -0.5rem;
 	}
 
 	.sapMSliderTickLabel .sapMSliderLabel {
 		padding-top: 0.375rem;
 	}
+
+	.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled):hover>.sapMSliderHandle):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
+		top: 2px;
+		right: 0.25rem;
+	}
+
+	.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled):hover>.sapMSliderHandle):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):focus:active {
+		&:after {
+			top: 1px;
+			right: 0.1875rem;
+		}
+	}
 }

package/src/sap/m/themes/sap_horizon_hcw/StandardListItem.less

@@ -0,0 +1,8 @@
+/* ======================================= */
+/* CSS for control sap.m/StandardListItem  */
+/* Horizon High Contrast White theme       */
+/* ======================================= */
+
+.sapMSLIWithDescription .sapMSLIDescription {
+	padding-top: 0.75rem;
+}

package/src/sap/m/themes/sap_horizon_hcw/Switch.less

@@ -65,53 +65,8 @@ html.sap-desktop {
 
 /* disabled */
 
-.sapMSwtDisabled.sapMSwt {
-	&.sapMSwtOn:not(.sapMSwtAcceptReject) {
-		background: @sapUiHcReducedBackground;
-		border-color: @sapUiHcReducedForeground;
-		.sapMSwtText.sapMSwtText .sapMSwtLabel,
-		.sapMSwtText.sapMSwtText .sapMSwtLabel:before {
-			color: @sapUiHcReducedForeground;
-		}
-		.sapMSwtHandle {
-			background: @sapUiHcReducedBackground;
-			border-color: @sapUiHcReducedForeground;
-		}
-	}
-	&.sapMSwtOff:not(.sapMSwtAcceptReject) {
-		border-color: @sapUiHcReducedForeground;
-		.sapMSwtText.sapMSwtText .sapMSwtLabel,
-		.sapMSwtText.sapMSwtText .sapMSwtLabel:before {
-			color: @sapUiHcReducedForeground;
-		}
-		.sapMSwtHandle {
-			border-color: @sapUiHcReducedBackground;
-		}
-	}
-	&.sapMSwtAcceptReject {
-		&.sapMSwtOn {
-			background: @sapUiHcReducedBackground;
-			border-color: @sapUiHcReducedForeground;
-			.sapMSwtText.sapMSwtText .sapMSwtLabel,
-			.sapMSwtText.sapMSwtText .sapMSwtLabel:before {
-				color: @sapUiHcReducedForeground;
-			}
-			.sapMSwtHandle {
-				background: @sapUiHcReducedBackground;
-				border-color: @sapUiHcReducedForeground;
-			}
-		}
-		&.sapMSwtOff {
-			border-color: @sapUiHcReducedForeground;
-			.sapMSwtText.sapMSwtText .sapMSwtLabel,
-			.sapMSwtText.sapMSwtText .sapMSwtLabel:before {
-				color: @sapUiHcReducedForeground;
-			}
-			.sapMSwtHandle {
-				border-color: @sapUiHcReducedBackground;
-			}
-		}
-	}
+.sapMSwtDisabled {
+	opacity: @sapUiContentDisabledOpacity;
 }
 
 /* ------------------------------ */

package/src/sap/m/themes/sap_horizon_hcw/TabStrip.less

@@ -29,17 +29,20 @@
 			.sapMTabStripItem {
 				height: 2.625rem;
 				padding: 0 0 0 0.5rem;
-				border: solid 0.0625rem @sapUiObjectHeaderBorderColor;
+				border: solid 0.0625rem @sapList_BorderColor;
 				border-radius: 0.125rem 0.125rem 0 0;
 				border-bottom: 0;
 				margin-right: 0.5rem;
 				margin-top: 0.125rem;
+				.sapMTabStripItemLabel {
+					font-family: @sapFontFamily;
+				}
 				&:last-child {
 					margin-right: 0;
 				}
 				&:hover {
-					color: @_sap_m_TabStrip_ItemHoverTextColor;
-					background-color: @sapUiListHoverBackground;
+					color: @sapTextColor;
+					background-color: @sapList_Hover_Background;
 				}
 				&.sapMTabStripItemSelected {
 					height: 2.75rem;

package/src/sap/m/themes/sap_horizon_hcw/Table.less

@@ -44,15 +44,14 @@
 	border-top: 0.125rem solid @sapUiListTableFooterBorder;
 }
 
-/* Moved due to new default vertical-align regardless of density */
-.sapMListTblNavCol,
-.sapMListTblCell {
-  vertical-align: top;
-}
-
-.sapUiSizeCompact{
-  .sapMListTblNavCol,
-  .sapMListTblCell {
-    vertical-align: middle;
-  }
+/* overwrite text control styles */
+.sapUiSizeCompact .sapMListTblCell {
+	.sapMLnk,
+	.sapMText,
+	.sapMLabel,
+	.sapMObjectNumber,
+	.sapMObjectIdentifier,
+	.sapMObjStatus {
+		line-height: 1.5rem;
+	}
 }

package/src/sap/m/themes/sap_horizon_hcw/Text.less

@@ -8,4 +8,8 @@
 	min-height: 2.75rem; /* for empty text */
 	padding-top: 0.6875rem;
 	padding-bottom: 0.6875rem;
+}
+
+.sapMTB-Info-CTX > .sapMText {
+	font-style: italic;
 }

package/src/sap/m/themes/sap_horizon_hcw/ToggleButton.less

@@ -24,11 +24,15 @@ html.sap-desktop .sapMBtnDisabled .sapMTB-Transparent-CTX .sapMBtnInner.sapMTogg
 .sapMTB-Transparent-CTX span.sapMBtnInner.sapMToggleBtnPressed .sapMBtnIcon,
 .sapMTB-Transparent-CTX span.sapMBtnInner.sapMToggleBtnPressed.sapMBtnTransparent > .sapMBtnIcon,
 html.sap-desktop .sapMTB-Transparent-CTX .sapMToggleBtnPressed.sapMBtnTransparent > .sapMBtnIcon {
-  color: @sapUiHcStandardForeground;
+	color: @sapUiHcStandardForeground;
 }
 
 .sapMBtnDisabled .sapMToggleBtnPressed.sapMBtnInner .sapMBtnIcon,
 .sapMBtnDisabled .sapMToggleBtnPressed.sapMBtnInner.sapMBtnTransparent .sapMBtnIcon,
 html.sap-desktop.sapMToggleBtnPressed.sapMBtnTransparent.sapMBtnDisabled > .sapMBtnIcon{
-  color: @sapUiHcReducedAltForeground;
+	color: @sapUiHcReducedAltForeground;
+}
+
+.sapUiSizeCompact .sapMBar-CTX .sapMBtnDefault.sapMBtnInner.sapMToggleBtnPressed:not(.sapMBtnDisabled) {
+	border-color: @sapUiButtonSelectedBorderColor;
 }

package/src/sap/m/themes/sap_horizon_hcw/Token.less

@@ -5,7 +5,7 @@
 
 @_sap_m_Token_TokenPadding: 0.5rem;
 @_sap_m_Token_TokenCompactPadding: 0.25rem;
-@_sap_m_Token_LeftPadding: 0.25rem;
+@_sap_m_Token_LeftPadding: 0.3125rem;
 @_sap_m_Token_TokenSize: @sapMFontSmallSize + (2 * @_sap_m_Token_TokenPadding) - @_sap_m_Token_LeftPadding;
 @_sap_m_Token_TokenCompactSize: @sapMFontSmallSize  + @_sap_m_Token_TokenCompactPadding;
 
@@ -14,12 +14,12 @@
 	border-radius: 0.25rem;
 }
 
-html.sap-desktop .sapMToken:hover {
+html.sap-desktop .sapMToken:not(.sapMTokenReadOnly):hover {
 	border: @sapUiButtonBorderWidth solid @sapUiButtonHoverBorderColor;
 	background: @sapUiButtonHoverBackground;
 }
 
-html.sap-desktop .sapMToken.sapMTokenSelected:hover {
+html.sap-desktop .sapMToken.sapMTokenSelected:not(.sapMTokenReadOnly):hover {
 	background: @sapUiButtonSelectedHoverBackground;
 	border: @sapUiButtonBorderWidth solid @sapUiButtonSelectedBorderColor;
 }
@@ -34,12 +34,19 @@ html.sap-desktop .sapMToken {
 		border: @sapUiButtonBorderWidth solid @sapUiFieldReadOnlyBorderColor;
 	}
 }
-
 html.sap-desktop .sapMToken:focus {
-	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-	outline-offset: -0.1875rem;
+	outline: none;
 }
 
-html.sap-desktop .sapMToken.sapMTokenSelected:focus {
-	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentContrastFocusColor;
+html.sap-desktop .sapMToken:focus::after {
+	content: '';
+	position: absolute;
+	pointer-events: none;
+	z-index: 2;
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiFieldActiveBorderColor;
+	border-radius: 0.25rem;
+	top: 0.0625rem;
+	bottom: 0.0625rem;
+	left: 0.0625rem;
+	right: 0.0625rem;
 }

package/src/sap/m/themes/sap_horizon_hcw/Tokenizer.less

@@ -17,7 +17,8 @@
 .sapMTokenizer .sapMToken {
 	margin-right: 0.3125rem;
 	max-width: calc(~"100% - 0.3125rem");
-	margin-top: 0.25rem;
+	margin-top: 0.1875rem;
+	margin-bottom: 0.1875rem;
 }
 
 html.sap-desktop .sapMTokenizer:focus {
@@ -40,6 +41,11 @@ html.sap-desktop .sapMTokenizer.sapMTokenizerReadonly {
 		padding-left: 0.25rem;
 		.sapMToken {
 			margin-right: 0.25rem;
+			margin-top: 0.0625rem;
+			margin-bottom: 0.0625rem;
+		}
+		.sapMTokenizerIndicator {
+			line-height: 1.375rem;
 		}
 	}
 }
@@ -53,6 +59,7 @@ html.sap-desktop .sapMTokenizer.sapMTokenizerReadonly {
 
 	&.sapMToken:hover,
 	&.sapMToken:focus,
+	&.sapMToken.sapMTokenSelected:hover,
 	&.sapMTokenSelected {
 		background: @sapUiButtonBackground;
 		cursor: default;
@@ -61,6 +68,10 @@ html.sap-desktop .sapMTokenizer.sapMTokenizerReadonly {
 		border-color: @sapUiHcReducedAltForeground;
 	}
 
+	&:focus:after {
+		content: none;
+	}
+
 	&.sapMTokenSelected .sapMTokenText {
 		color: @sapUiBaseText;
 	}

package/src/sap/m/themes/sap_horizon_hcw/Wizard.less

@@ -29,8 +29,16 @@
 	overflow: hidden;
 }
 
+.sapMWizard .sapMWizardStep {
+	padding-bottom: 1rem;
+}
+
+.sapMWizard:not(.sapMWizardModePage) .sapMWizardLastActivatedStep {
+	min-height: calc(100% - 3rem);
+}
+
 html.sap-phone .sapMWizard .sapMWizardNextButtonVisible {
-	left: 1rem;
+	left: 2rem;
 	bottom: 3.5rem;
 	-webkit-transform: none;
 	transform: none;