@openui5/themelib_sap_horizon 1.101.0 → 1.102.0

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

@@ -76,7 +76,8 @@ html.sap-desktop {
 		border: 0.125rem solid @sapUiContentFocusColor;
 		border-radius: 0.375rem;
 	}
-	.sapUiSizeCompact .sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
+	.sapUiSizeCompact .sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after,
+	&.sapUiSizeCompact .sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
 		top: 0.325rem;
 		bottom: 0.325rem;
 	}
@@ -153,10 +154,6 @@ html.sap-desktop .sapMSegBBtnFocusable.sapMBtnActive:hover .sapMSegBBtnInner {
 	.sapMSegBBtnInner:hover {
 		border-right: 1px solid @sapUiButtonSelectedHoverBorderColor;
 	}
-	// Hide next button left border
-	+ .sapMSegBBtn .sapMSegBBtnInner {
-		border-left: 1px solid transparent;
-	}
 }
 
 .sapMSegB img {
@@ -255,8 +252,8 @@ html.sap-desktop .sapMSegBBtnFocusable.sapMBtnActive:hover .sapMSegBBtnInner {
 	}
 }
 
-.sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner {
-	border-right: 1px solid @sapUiButtonBorderColor;
+.sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner,
+.sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInnerWrapper {
 	border-top-right-radius: @sapUiButtonBorderCornerRadius;
 	border-bottom-right-radius: @sapUiButtonBorderCornerRadius;
 }

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

@@ -11,7 +11,7 @@
 .sapMSelectListItemBase.sapMSelectListItemBaseSelected {
 	background: @sapUiListSelectionBackgroundColor;
 	color: @sapUiListTextColor;
-	border-color: @sapUiListSelectionBorderColor;
+	border-bottom: 0.0625rem solid @sapUiListSelectionBorderColor;
 
 	&:hover {
 		background: @sapUiListHoverSelectionBackground;
@@ -46,7 +46,8 @@ html.sap-desktop .sapMSelectListItemBase:focus::after,
 .sapMComboBoxBasePicker-CTX .sapMSelectListItemBaseSelected::after {
 	pointer-events: none;
 	content: "";
-	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+	outline-offset: -0.1875rem;
 	position: absolute;
 	top: 0;
 	right: 0;
@@ -66,16 +67,4 @@ html.sap-desktop .sapMSelectListItemBase:focus {
 	position: relative;
 	font-size: @sapFontSize;
 	color: @sapUiListTextColor;
-
-	&:last-child:not(:only-child)::after {
-		border-bottom-left-radius: 0.75rem;
-		border-bottom-right-radius: 0.75rem;
-	}
-}
-
-.sapMSltPicker-CTX:not(.sapMSltPickerWithSubHeader) .sapMSelectListItemBase {
-	&:first-child::after {
-		border-top-left-radius: 0.75rem;
-		border-top-right-radius: 0.75rem;
-	}
 }

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

@@ -30,8 +30,7 @@
 	}
 
 	.sapMSinglePCColumnHeader .sapUiCalItem.sapUiCalItemNow {
-		border-color: @sapUiLegendCurrentDateTime;
-		border-radius: 0.25rem;
+		border: none;
 	}
 
 	.sapMSinglePCNowMarker {
@@ -55,10 +54,6 @@
 
 	.sapMSinglePCColumnHeader {
 		.sapUiCalItem.sapUiCalItemNow {
-			.sapUiCalItemText {
-				border: 0.0625rem solid @sapUiListBackground;
-			}
-
 			.sapUiCalSpecialDate {
 				position: absolute;
 				left: 0;
@@ -70,9 +65,12 @@
 		.sapUiCalItem .sapUiCalSpecialDate {
 			height: 0.25rem;
 		}
+	}
 
-		.sapUiCalItem.sapUiCalItemNow.sapUiCalItemSel .sapUiCalItemText {
-			border: 0.0625rem solid @sapUiListBackground;
+	.sapMSinglePCAppointmentWrap.sapUiCalendarRowApps {
+		.sapUiCalendarApp {
+			border-top-left-radius: 0;
+			border-bottom-left-radius: 0;
 		}
 	}
 }
@@ -87,9 +85,6 @@
 .sapUiSizeCompact .sapMSinglePC {
 	.sapMSinglePCColumnHeader {
 		.sapUiCalItem.sapUiCalItemNow {
-			&.sapUiCalItemSel {
-				background-color: @sapUiActive;
-			}
 			.sapUiCalItemText,
 			.sapUiCalItemSel.sapUiItemText {
 				box-shadow: none;
@@ -110,10 +105,6 @@
 		.sapUiCalItem.sapUiCalItemNow {
 			outline: 0.0625rem solid white;
 			box-shadow: inset white;
-			&.sapUiCalItemSel {
-				background-color: @sapUiActive;
-				border: 0.125rem solid @sapUiLegendCurrentDateTime;
-			}
 			&.sapUiCalItemSel:hover {
 				background-color: @sapUiContentSelectedHoverBackground;
 			}
@@ -162,7 +153,7 @@
 	&:focus {
 		.sapUiCalendarAppCont:after {
 			border: 0.125rem solid @sapUiContentFocusColor;
-			border-radius: 0.25rem;
+			border-radius: 0.125rem;
 		}
 	}
 }
@@ -222,4 +213,11 @@ html.sap-desktop {
 			border-radius: 0.5rem;
 		}
 	}
+}
+
+.sapMSinglePCAppointmentWrap.sapUiCalendarRowApps:focus .sapUiCalendarAppSel:hover .sapUiCalendarAppCont:after {
+	top: 0.125rem;
+	left: 0.125rem;
+	right: 0.125rem;
+	bottom: 0.125rem;
 }

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

@@ -5,55 +5,68 @@
 
 /*new*/
 .sapMSliderInner .sapMSliderHandle {
-	border: 1px solid @sapContent_Selected_Background;
-	background: @sapContent_Selected_Background;
-	border-radius: @sapButton_BorderCornerRadius;
-	padding-left: 0.25rem;
-	box-shadow: @sapContent_Selected_Shadow;
-	width: 1.625rem;
-	height: 1.625rem;
-	top: -0.8125rem;
+	border: 1px solid @sapUiSliderHandleBorderColor;
+	background: @sapUiSliderHandleBackground;
+	border-radius: @sapUiButtonBorderCornerRadius;
+	width: 2rem;
+	height: 1.5rem;
+	margin-left: -1rem;
+	top: -0.625rem;
+
+	&:not(:focus) {
+		box-shadow: @sapUiContentSelectedShadow;
+	}
 }
 
-.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled):hover>.sapMSliderHandle):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
+.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
 	font-family: SAP-icons;
 	content: "\e244";
 	position: absolute;
-	top: 6px;
-	right: 3px;
+	top: 4px;
+	right: 0.5rem;
 	overflow: hidden;
 	vertical-align: middle;
 	font-size:14px;
-	color:@sapContent_Selected_ForegroundColor;
-	padding-left: 5px;
-	padding-right: 5px;
+	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 {
+	&:after {
+		top: 3px;
+		right: 0.4375rem;
+	}
 }
 
 .sapMSliderInner:not(.sapMSliderInnerDisabled):not(.sapMSliderPressed):hover>.sapMSliderHandle {
 	&:not(:focus) {
-		border-color: @sapContent_Selected_ForegroundColor;
-		box-shadow: @sapContent_Selected_Shadow;
+		border-color: @sapUiSliderHoverHandleBorderColor;
+		background: @sapUiSliderHoverHandleBackground;
+		box-shadow: @sapUiContentSelectedShadow;
 	}
 }
 
 .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus {
-	border: none;
+	background: @sapUiSliderActiveHandleBackground;
+	border: 0.125rem solid #4DB1FF;
 	outline: none;
-	box-shadow: 0px 0px 0px 2px @sapContent_FocusColor;
-	top: -0.75rem;
+	box-shadow: none;
+	top: -0.625rem;
+}
+
+.sapMSliderHandle:focus:before {
+	content: none;
 }
 
 .sapMSliderInner {
-	background: @sapButton_Track_Background;
-	height: 0.25rem;
-	min-width: 4rem;
-	border-radius: 0.25rem;
+	background: @sapUiSliderBackground;
 }
 
 .sapMSliderProgress {
-	background: @sapContent_Selected_ForegroundColor;
-	height: 0.25rem;
-	border-radius: 0.25rem;
+	background: @sapUiSliderSelectedBackground;
+	&:before {
+		content: none;
+		transform: none;
+	}
 }
 
 /* disabled */
@@ -64,23 +77,27 @@
 .sapMSliderInner::before {
 	content: "";
 	position: absolute;
-	background-color: @sapContent_Selected_ForegroundColor;
+	box-sizing: border-box;
+	border: 0.0625rem solid @sapUiContentSelectedMeasureIndicatorColor;
+	background-color: @sapUiSliderSelectedBackground;
 	border-radius: 50%;
-	width: 6px;
-	height: 6px;
+	width: 0.5rem;
+	height: 0.5rem;
 	left: -14px;
-	top: -1px;
+	top: -2px;
 }
 
 .sapMSlider::after {
 	content: "";
 	position: absolute;
-	background-color: @sapField_BorderColor;
+	box-sizing: border-box;
+	border: 0.0625rem solid @sapUiContentMeasureIndicatorColor;
+	background-color: @sapUiContentMeasureIndicatorColor;
 	border-radius: 50%;
-	width: 6px;
-	height: 6px;
+	width: 0.5rem;
+	height: 0.5rem;
 	right: 2px;
-	top: 21px;
+	top: 20px;
 }
 
 .sapMSliderTooltip {
@@ -116,33 +133,38 @@
 
 .sapUiSizeCompact {
 	.sapMSlider::after {
-		top: 15px;
+		top: 14px;
+		right: 6px;
 	}
 
-	.sapMSliderInner .sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled):hover>.sapMSliderHandle):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
-		font-family: SAP-icons;
-		content: "\e244";
-		position: absolute;
-		top: 3px;
-		right: 0px;
-		overflow: hidden;
-		vertical-align: middle;
-		font-size:14px;
-		color:@sapContent_Selected_ForegroundColor;
-		padding-left: 0px;
+	.sapMSliderInner::before {
+		left: -12px;
 	}
 
 	.sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus {
-		top: -0.5625rem;
+		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 {
+		&:after {
+			top: 1px;
+			right: 0.1875rem;
+		}
+	}
 }

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

@@ -18,6 +18,7 @@
 .sapMSliderTooltipInput {
 	font-size: @sapMFontMediumSize;
 	color: @sapUiFieldTextColor;
+	background: @sapField_Focus_Background; 
 }
 
 .sapMSliderTooltipErrorState {

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

@@ -26,14 +26,6 @@
 	}
 }
 
-.sapMSB .sapMBtn:hover > .sapMBtnHoverable.sapMBtnEmphasized:not(.sapMBtnActive):not(.sapMToggleBtnPressed) {
-	border-left-color: @sapUiButtonBackground;
-}
-
-.sapMMenuBtn.sapMMenuBtnSplit .sapMSBActive:not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnEmphasized {
-	border-left-color: @sapUiButtonBackground;
-}
-
 //ie
 .sapMSBTextIE.sapMSBText {
 	padding-right: 2.25rem;
@@ -214,4 +206,20 @@ html.sap-desktop .sapMSB .sapMBtn:focus > .sapMFocusable:not(.sapMBadgeIndicator
 	width: auto;
 	height: auto;
 	background-color: transparent;
+}
+
+.sapMMenuBtn.sapMMenuBtnSplit .sapMSBActive:not(.sapMBtnDisabled) > .sapMBtnInner {
+	border: 0.0625rem solid @sapUiButtonActiveBorderColor;
+	.sapUiIcon {
+		line-height: 2.125rem;
+	}
+}
+
+.sapMSB .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnTransparent.sapMBtnIconFirst::before,
+.sapMIBar .sapMSB .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnDefault::before {
+	background-color: @sapUiButtonActiveTextColor;
+}
+
+.sapMIBar .sapMSB .sapMBtn {
+	background-color: transparent;
 }

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

@@ -14,10 +14,6 @@
 	height: 2.75rem;
 }
 
-.sapMSLI.sapMSLIWrapping {
-	min-height: 2.75rem;
-}
-
 .sapMSLIImgIcon {
 	height: 2.75rem;
 	width: 2.75rem;
@@ -29,6 +25,10 @@
 	border-radius: 0.25rem;
 }
 
+.sapMSLIWithDescription .sapMSLIDescription {
+	padding-top: 0.75rem;
+}
+
 /* Compact Size */
 .sapUiSizeCompact .sapMSLIImgIcon {
 	height: 2rem;

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

@@ -6,19 +6,5 @@
 .sapMSuggestionsPopover .sapMList .sapMLIB.sapMLIBFocusable.sapMLIBFocused,
 .sapMSuggestionsPopover .sapMValueStateHeaderRoot.sapMPseudoFocus {
 	outline: @sapContent_FocusWidth @sapContent_FocusStyle @sapContent_FocusColor;
-}
-
-.sapMSuggestionsPopoverNoneState .sapMList:not(.sapMListTblCnt) .sapMLIBFocused[data-sap-ui-first-suggestion-item] {
-	border-top-left-radius:  @sapUiElementBorderCornerRadius;
-	border-top-right-radius:  @sapUiElementBorderCornerRadius;
-}
-
-.sapMSuggestionsPopover .sapMValueStateHeaderRoot.sapMPseudoFocus {
-	border-top-left-radius: @sapUiElementBorderCornerRadius;
-	border-top-right-radius: @sapUiElementBorderCornerRadius;
-}
-
-.sapMSuggestionsPopover .sapMLIBFocused[data-sap-ui-last-suggestion-item] {
-	border-bottom-left-radius: @sapUiElementBorderCornerRadius;
-	border-bottom-right-radius: @sapUiElementBorderCornerRadius;
+	outline-offset: -0.25rem;
 }

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

@@ -29,16 +29,22 @@
 				padding: 0 0 0 0.5rem;
 				border-bottom: 0;
 				margin-right: 0.5rem;
+				.sapMTabStripItemLabel {
+					font-family: @sapFontBoldFamily;
+				}
 				&:last-child {
 					margin-right: 0;
 				}
 				&:hover {
-					color: @_sap_m_TabStrip_ItemHoverTextColor;
-					background-color: @sapUiListHoverBackground;
+					color: @sapTextColor;
+					background-color: @sapList_Hover_Background;
 				}
 				&.sapMTabStripItemSelected {
-					color: @sapUiSelected;
-					background: @sapUiListBackground;
+					color: @sapContent_Selected_ForegroundColor;
+					background: @sapList_Background;
+					.sapMTabStripItemLabel {
+						font-family: @sapFontBoldFamily;
+					}
 				}
 				.sapMTSItemCloseBtnCnt {
 					width: 2rem;
@@ -77,6 +83,9 @@
 
 .sapMTabStrip .sapMTSTabsContainer .sapMTSTabs .sapMTabStripItem:focus::before {
 	top: 0.25rem;
+	left: 0;
+	right: 0;
+	bottom: 0;
 	border-radius: 0.25rem;
 	border: 0.125rem solid @sapUiContentFocusColor;
 }
@@ -96,8 +105,8 @@
 					padding: 0 2rem 0 0.5rem;
 				}
 				&.sapMTabStripItemSelected {
-					color: @sapUiSelected;
-					background: @sapUiListBackground;
+					color: @sapContent_Selected_ForegroundColor;
+					background: @sapList_Background;
 					padding: 0 2rem 0 0.5rem;
 				}
 				.sapMTSItemCloseBtnCnt {

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

@@ -25,10 +25,6 @@
 	border-top-color: transparent;
 }
 
-.sapMListTblCell {
-	padding: 0 0.5rem;
-}
-
 .sapMTableRowCustomFocus:focus > :not(.sapMListTblDummyCell:last-child)::before {
 	margin-right: 0; // Avoid gaps in the focus viszualization between the cells
 }
@@ -38,9 +34,21 @@
 .sapMListShowSeparatorsAll .sapMLIBShowSeparator:last-child > td.sapMListTblDummyCell,
 .sapMListShowSeparatorsAll .sapMListTblSubRow:last-child > td.sapMListTblDummyCell,
 :not(.sapMListHasGrowing):not(.sapMListShowSeparatorsInner):not(.sapMListShowSeparatorsNone) > .sapMTableTBody .sapMListTblRow:last-child > .sapMListTblDummyCell:last-child {
-    border-bottom: none;
+	border-bottom: none;
 }
 
 .sapMListTblDummyCell:last-child {
 	background-color: @sapUiListBackground;
+}
+
+/* overwrite text control styles */
+.sapUiSizeCompact .sapMListTblCell {
+	.sapMLnk,
+	.sapMText,
+	.sapMLabel,
+	.sapMObjectNumber,
+	.sapMObjectIdentifier,
+	.sapMObjStatus {
+		line-height: 1.5rem;
+	}
 }

package/src/sap/m/themes/sap_horizon_dark/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_dark/ToggleButton.less

@@ -101,6 +101,6 @@ html.sap-desktop .sapMBtn:focus > .sapMBtnEmphasized.sapMToggleBtnPressed.sapMFo
 	border-radius: 0.5rem;
 }
 
-.sapMBtn:not(.sapMBtnDisabled):focus > span.sapMBtnInner.sapMBtnEmphasized.sapMToggleBtnPressed {
-	border-color: @sapUiContentContrastFocusColor;
+.sapUiSizeCompact .sapMBar-CTX .sapMBtnDefault.sapMBtnInner.sapMToggleBtnPressed:not(.sapMBtnDisabled) {
+	border-color: @sapUiButtonSelectedBorderColor;
 }

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

@@ -5,11 +5,12 @@
 
 @_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;
 
 .sapMToken {
+	overflow: visible;
 	padding-left: @_sap_m_Token_LeftPadding;
 }
 
@@ -20,20 +21,20 @@
 	border-radius: @sapUiButtonBorderCornerRadius;
 }
 
-html.sap-desktop .sapMToken:not(.sapMTokenSelected):not(:focus):hover {
+html.sap-desktop .sapMToken:not(.sapMTokenSelected):not(.sapMTokenReadOnly):not(:focus):hover {
 	background: @sapUiButtonTokenBackground;
 	border: 1px solid @sapUiButtonTokenBorderColor;
 	border-radius: @sapUiButtonBorderCornerRadius;
 	box-shadow: @sapUiContentInteractionShadow;
 }
 
-html.sap-desktop .sapMToken.sapMTokenSelected:hover {
+html.sap-desktop .sapMToken.sapMTokenSelected:not(.sapMTokenReadOnly):hover {
 	background: @sapUiButtonSelectedBackground;
 	border: @sapUiButtonBorderWidth solid @sapUiButtonSelectedBorderColor;
 	border-radius: @sapUiButtonBorderCornerRadius;
 }
 
-html.sap-desktop .sapMToken.sapMTokenSelected:not(:focus):hover {
+html.sap-desktop .sapMToken.sapMTokenSelected:not(.sapMTokenReadOnly):not(:focus):hover {
 	box-shadow: @sapUiContentInteractionShadow;
 }
 
@@ -43,18 +44,32 @@ html.sap-desktop .sapMToken.sapMTokenSelected:not(:focus):hover {
 }
 
 html.sap-desktop .sapMToken:focus {
-	outline: 2px solid @sapUiButtonSelectedBorderColor;
-	outline-offset: 0.0625rem;
-	border-radius: @sapUiButtonBorderCornerRadius;
+	outline: none;
+}
+
+html.sap-desktop .sapMToken:focus::after {
+	content: '';
+	position: absolute;
+	pointer-events: none;
+	z-index: 2;
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiFieldActiveBorderColor;
+	border-radius: 0.625rem;
+	top: -0.25rem;
+	bottom: -0.25rem;
+	left: -0.25rem;
+	right: -0.25rem;
 }
 
-html.sap-desktop .sapMToken:not(.sapMTokenSelected):focus:hover {
+html.sap-desktop .sapMToken:not(.sapMTokenSelected):not(.sapMTokenReadOnly):focus:hover {
 	border: @sapUiButtonBorderWidth solid @sapUiButtonTokenBorderColor;
 }
 
-html.sap-desktop .sapUiSizeCompact .sapMToken:focus,
-html.sap-desktop .sapUiSizeCondensed .sapMToken:focus {
-	outline-offset: 0;
+html.sap-desktop .sapUiSizeCompact .sapMToken:focus::after,
+html.sap-desktop .sapUiSizeCondensed .sapMToken:focus::after {
+	top: -0.125rem;
+	bottom: -0.125rem;
+	left: -0.125rem;
+	right: -0.125rem;
 }
 
 html.sap-desktop .sapMToken.sapMTokenSelected:focus {

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

@@ -49,8 +49,8 @@ html.sap-desktop .sapMTokenizer:focus {
 	&:focus,
 	&.sapMTokenSelected,
 	&.sapMTokenSelected:focus,
-	&.sapMTokenSelected:hover,
-	&:not(.sapMTokenSelected):not(:focus):hover {
+	&.sapMToken.sapMTokenSelected:hover,
+	&.sapMToken:not(.sapMTokenSelected):not(:focus):hover {
 		background: @sapButton_TokenBackground;
 		cursor: default;
 		color: @sapUiBaseText;
@@ -60,6 +60,10 @@ html.sap-desktop .sapMTokenizer:focus {
 		box-shadow: none;
 	}
 
+	&:focus:after {
+		content: none;
+	}
+
 	.sapMTokenText,
 	.sapMTokenIcon {
 		color: @sapUiBaseText;
@@ -79,15 +83,4 @@ html.sap-desktop .sapMTokenizer:focus {
 .sapMTokenizer .sapMTokenizerIndicator {
 	color: @sapLinkColor;
 	font-weight: bold;
-}
-
-.sapMTokenizerTokensPopup .sapMListItems {
-	& li:first-child:focus {
-		border-top-left-radius: @sapUiElementBorderCornerRadius;
-		border-top-right-radius: @sapUiElementBorderCornerRadius;
-	}
-	& li:last-child:focus {
-		border-bottom-left-radius: @sapUiElementBorderCornerRadius;
-		border-bottom-right-radius: @sapUiElementBorderCornerRadius;
-	}
 }

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

@@ -20,8 +20,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;