@openui5/themelib_sap_horizon 1.132.1 → 1.133.1

package/src/sap/tnt/themes/sap_horizon_dark/NavigationList.less

@@ -3,12 +3,11 @@
 /* Evening Horizon theme                   */
 /* ======================================= */
 
-@_sap_tnt_NavigationList_CollapsedWidth: 3.5rem;
+@_sap_tnt_NavigationList_CollapsedWidth: 4rem;
 @_sap_tnt_NavigationList_IconColor: @sapUiListTextColor;
-@_sap_tnt_NavigationList_IconFontSize: 1.125rem;
 @_sap_tnt_NavigationList_ExpandIconColor: @sapUiListTextColor;
 @_sap_tnt_NavigationList_GroupBorderStyleColor: none;
-@_sap_tnt_NavigationList_ItemHeight: 2.5rem;
+@_sap_tnt_NavigationList_ItemHeight: 2.75rem;
 @_sap_tnt_NavigationList_ItemBorderRadius: 0.375rem;
 @_sap_tnt_NavigationList_ItemBottomMargin: 0.25rem;
 @_sap_tnt_NavigationList_ItemBottomMarginCompact: 0.25rem;
@@ -20,11 +19,14 @@
 @_sap_tnt_NavigationList_SelectedItemBorder: none;
 @_sap_tnt_NavigationList_Collapsed_SelectedItemBorder: 0.125rem solid @_sap_tnt_NavigationList_SelectedItemBorderColor;
 @_sap_tnt_NavigationList_GroupIconWidth: 2rem;
+@_sap_tnt_NavigationList_GroupIconWidthExpanded: 1rem;
+@_sap_tnt_NavigationList_GroupIconMarginLeft: 1rem;
+@_sap_tnt_NavigationList_GroupIconMarginRight: 0.5rem;
 @_sap_tnt_NavigationList_GroupBottomMarginInPopup: 0.75rem;
 @_sap_tnt_NavigationList_GroupTextWeight: bold;
 @_sap_tnt_NavigationList_NoIconsNestedItemPadding: 2rem;
-@_sap_tnt_NavigationList_Padding: 0.5rem;
-@_sap_tnt_NavigationList_PaddingCompact: 1.5rem 0.75rem 0.75rem 0.75rem;
+@_sap_tnt_NavigationList_Padding: 0.5rem 0.5rem 0 0.5rem;
+@_sap_tnt_NavigationList_PaddingFixed: 0 0.5rem 0.5rem 0.5rem;
 @_sap_tnt_NavigationList_ParentPopupPadding: 0.75rem;
 @_sap_tnt_NavigationList_ParentPopupBorderRadius: 0.75rem;
 @_sap_tnt_NavigationList_PopupItemPadding: 0 0.5rem;
@@ -33,9 +35,16 @@
 @_sap_tnt_NavigationList_PopupArrowBoxShadow: 0 0 0.125rem 0 fade(@sapUiContentShadowColor, 48), 0 1rem 2rem 0 fade(@sapUiContentShadowColor, 64);
 @_sap_tnt_NavigationList_PopupTitleTextSize: 1.25rem;
 @_sap_tnt_NavigationList_PopupTitleLineHeight: 1.5rem;
-@_sap_tnt_NavigationList_SelectionIndicatorDisplay: block;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusTextDisplay: block;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemZIndex: 1;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPosition: absolute;
-@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding: 0.5rem 0.5rem 0.5rem 0.25rem;
-@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPaddingCompact: 0.5rem 0.5rem 0.5rem 0;
+@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding: 0.5rem;
+@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPaddingCompact: @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding;
+@_sap_tnt_NavigationList_CollapsedIconPaddingLeft: 0.25rem;
+@_sap_tnt_NavigationList_NavigationIndicator: "\E066";
+@_sap_tnt_NavigationList_ExpandIconWidth: 2.25rem;
+@_sap_tnt_NavigationList_ExpandIconMarginRight: 0.375rem;
+@_sap_tnt_NavigationList_ExpandIconMarginLeft: 0.5rem;
+@_sap_tnt_NavigationList_ExpandIconFontSize: 1rem;
+@_sap_tnt_NavigationList_Collapsed_SelectedItemBackground: ~"0 100% / 0.188rem 100%" no-repeat linear-gradient(0deg, @sapUiListHighlightColor, @sapUiListHighlightColor), @sapUiListSelectionBackgroundColor;
+@_sap_tnt_NavigationList_Collapsed_SelectedItemBackgroundRTL: ~"100% 0 / 0.188rem 100%" no-repeat linear-gradient(0deg, @sapUiListHighlightColor, @sapUiListHighlightColor), @sapUiListSelectionBackgroundColor;

package/src/sap/tnt/themes/sap_horizon_dark/SideNavigation.less

@@ -4,9 +4,8 @@
 /* ======================================= */
 
 @_sap_tnt_SideNavigation_Width: 16rem;
-@_sap_tnt_SideNavigation_CollapsedWidth: 3.5rem;
-@_sap_tnt_SideNavigation_NavigationSeparatorMargin: 0.5rem;
-@_sap_tnt_SideNavigation_NavigationSeparatorMarginCollapsed: 0.5rem;
+@_sap_tnt_SideNavigation_CollapsedWidth: 4rem;
+@_sap_tnt_SideNavigation_NavigationSeparatorMargin: 0.25rem 0.5rem 0.25rem 0.5rem;
 @_sap_tnt_SideNavigation_NavigationSeparatorBackgroundColor: @sapUiToolbarSeparatorColor;
 @_sap_tnt_SideNavigation_NavigationSeparatorRadius: 0.125rem;
 @_sap_tnt_SideNavigation_NavigationSeparatorHeight: 0.0625rem;

package/src/sap/tnt/themes/sap_horizon_hcb/NavigationList.less

@@ -3,10 +3,9 @@
 /* Horizon High Contrast Black theme       */
 /* ======================================= */
 
-@_sap_tnt_NavigationList_CollapsedWidth: 3.5rem;
-@_sap_tnt_NavigationList_IconFontSize: 1.125rem;
+@_sap_tnt_NavigationList_CollapsedWidth: 4rem;
 @_sap_tnt_NavigationList_ExpandIconColor: @sapUiContentNonInteractiveIconColor;
-@_sap_tnt_NavigationList_ItemHeight: 2.5rem;
+@_sap_tnt_NavigationList_ItemHeight: 2.75rem;
 @_sap_tnt_NavigationList_ItemBorderStyleColor: solid @sapUiListBorderColor;
 @_sap_tnt_NavigationList_ItemBorderWidth: 0 0 0.0625rem 0;
 @_sap_tnt_NavigationList_ItemFocusBorderOffset: 0;
@@ -15,14 +14,18 @@
 @_sap_tnt_NavigationList_HoverBorderWidth: 0.0625rem;
 @_sap_tnt_NavigationList_SelectedBorderWidth: 0.0625rem;
 @_sap_tnt_NavigationList_SelectedAndFocusedBorderStyleColor: none;
-@_sap_tnt_NavigationList_Collapsed_SelectedItemBackground: @sapUiListSelectionBackgroundColor;
+@_sap_tnt_NavigationList_Collapsed_SelectedItemBackground: ~"0 100% / 0.188rem 100%" no-repeat linear-gradient(0deg, @sapUiListHighlightColor, @sapUiListHighlightColor), @sapUiListSelectionBackgroundColor;
+@_sap_tnt_NavigationList_Collapsed_SelectedItemBackgroundRTL: ~"100% 0 / 0.188rem 100%" no-repeat linear-gradient(0deg, @sapUiListHighlightColor, @sapUiListHighlightColor), @sapUiListSelectionBackgroundColor;
 @_sap_tnt_NavigationList_ItemBottomMargin: 0.25rem;
 @_sap_tnt_NavigationList_ItemBottomMarginCompact: 0.25rem;
 @_sap_tnt_NavigationList_GroupTextWeight: bold;
 @_sap_tnt_NavigationList_GroupIconWidth: 2rem;
+@_sap_tnt_NavigationList_GroupIconWidthExpanded: 1rem;
+@_sap_tnt_NavigationList_GroupIconMarginLeft: 1rem;
+@_sap_tnt_NavigationList_GroupIconMarginRight: 0.5rem;
 @_sap_tnt_NavigationList_NoIconsNestedItemPadding: 2rem;
-@_sap_tnt_NavigationList_Padding: 0.5rem;
-@_sap_tnt_NavigationList_PaddingCompact: 1.5rem 0.75rem 0.75rem 0.75rem;
+@_sap_tnt_NavigationList_Padding: 0.5rem 0.5rem 0 0.5rem;
+@_sap_tnt_NavigationList_PaddingFixed: 0 0.5rem 0.5rem 0.5rem;
 @_sap_tnt_NavigationList_PopupItemPadding: 0 0.5rem;
 @_sap_tnt_NavigationList_PopupIconWidth: 0.5rem;
 @_sap_tnt_NavigationList_ParentPopupPadding: 0.75rem;
@@ -31,11 +34,16 @@
 @_sap_tnt_NavigationList_PopupArrowBoxShadow: 0 0 0 0.0625rem @sapUiContentShadowColor, 0 1rem 2rem 0 fade(@sapUiContentShadowColor, 16);
 @_sap_tnt_NavigationList_PopupTitleTextSize: 1.25rem;
 @_sap_tnt_NavigationList_PopupTitleLineHeight: 1.5rem;
-@_sap_tnt_NavigationList_SelectionIndicatorDisplay: block;
 @_sap_tnt_NavigationList_PopupPadding: 0.5rem;
 @_sap_tnt_NavigationList_Collapsed_GroupBorderWidth: @_sap_tnt_NavigationList_GroupBorderWidth;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusTextDisplay: block;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemZIndex: 1;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPosition: absolute;
-@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding: 0.5rem 0.5rem 0.5rem 0.25rem;
-@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPaddingCompact: 0.5rem 0.5rem 0.5rem 0;
+@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding: 0.5rem;
+@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPaddingCompact: @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding;
+@_sap_tnt_NavigationList_CollapsedIconPaddingLeft: 0.25rem;
+@_sap_tnt_NavigationList_NavigationIndicator: "\E066";
+@_sap_tnt_NavigationList_ExpandIconWidth: 2.25rem;
+@_sap_tnt_NavigationList_ExpandIconMarginRight: 0.375rem;
+@_sap_tnt_NavigationList_ExpandIconMarginLeft: 0.5rem;
+@_sap_tnt_NavigationList_ExpandIconFontSize: 1rem;

package/src/sap/tnt/themes/sap_horizon_hcb/SideNavigation.less

@@ -4,7 +4,8 @@
 /* ======================================= */
 
 @_sap_tnt_SideNavigation_Width: 16rem;
-@_sap_tnt_SideNavigation_CollapsedWidth: 3.5rem;
+@_sap_tnt_SideNavigation_CollapsedWidth: 4rem;
+@_sap_tnt_SideNavigation_NavigationSeparatorMargin: 0.25rem 0.5rem 0.25rem 0.5rem;
 @_sap_tnt_SideNavigation_NavigationSeparatorHeight: 0.0625rem;
 @_sap_tnt_SideNavigation_PhoneBorderRadius: 0.5rem;
 @_sap_tnt_SideNavigation_BoxShadow: var(--sapContent_Shadow0);

package/src/sap/tnt/themes/sap_horizon_hcw/NavigationList.less

@@ -3,10 +3,9 @@
 /* Horizon High Contrast White theme       */
 /* ======================================= */
 
-@_sap_tnt_NavigationList_CollapsedWidth: 3.5rem;
-@_sap_tnt_NavigationList_IconFontSize: 1.125rem;
+@_sap_tnt_NavigationList_CollapsedWidth: 4rem;
 @_sap_tnt_NavigationList_ExpandIconColor: @sapUiContentNonInteractiveIconColor;
-@_sap_tnt_NavigationList_ItemHeight: 2.5rem;
+@_sap_tnt_NavigationList_ItemHeight: 2.75rem;
 @_sap_tnt_NavigationList_ItemBorderStyleColor: solid @sapUiListBorderColor;
 @_sap_tnt_NavigationList_ItemBorderWidth: 0 0 0.0625rem 0;
 @_sap_tnt_NavigationList_ItemFocusBorderOffset: 0;
@@ -15,14 +14,18 @@
 @_sap_tnt_NavigationList_HoverBorderWidth: 0.0625rem;
 @_sap_tnt_NavigationList_SelectedBorderWidth: 0.0625rem;
 @_sap_tnt_NavigationList_SelectedAndFocusedBorderStyleColor: none;
-@_sap_tnt_NavigationList_Collapsed_SelectedItemBackground: @sapUiListSelectionBackgroundColor;
+@_sap_tnt_NavigationList_Collapsed_SelectedItemBackground: ~"0 100% / 0.188rem 100%" no-repeat linear-gradient(0deg, @sapUiListHighlightColor, @sapUiListHighlightColor), @sapUiListSelectionBackgroundColor;
+@_sap_tnt_NavigationList_Collapsed_SelectedItemBackgroundRTL: ~"100% 0 / 0.188rem 100%" no-repeat linear-gradient(0deg, @sapUiListHighlightColor, @sapUiListHighlightColor), @sapUiListSelectionBackgroundColor;
 @_sap_tnt_NavigationList_ItemBottomMargin: 0.25rem;
 @_sap_tnt_NavigationList_ItemBottomMarginCompact: 0.25rem;
 @_sap_tnt_NavigationList_GroupTextWeight: bold;
 @_sap_tnt_NavigationList_GroupIconWidth: 2rem;
+@_sap_tnt_NavigationList_GroupIconWidthExpanded: 1rem;
+@_sap_tnt_NavigationList_GroupIconMarginLeft: 1rem;
+@_sap_tnt_NavigationList_GroupIconMarginRight: 0.5rem;
 @_sap_tnt_NavigationList_NoIconsNestedItemPadding: 2rem;
-@_sap_tnt_NavigationList_Padding: 0.5rem;
-@_sap_tnt_NavigationList_PaddingCompact: 1.5rem 0.75rem 0.75rem 0.75rem;
+@_sap_tnt_NavigationList_Padding: 0.5rem 0.5rem 0 0.5rem;
+@_sap_tnt_NavigationList_PaddingFixed: 0 0.5rem 0.5rem 0.5rem;
 @_sap_tnt_NavigationList_PopupItemPadding: 0 0.5rem;
 @_sap_tnt_NavigationList_PopupIconWidth: 0.5rem;
 @_sap_tnt_NavigationList_ParentPopupPadding: 0.75rem;
@@ -31,11 +34,16 @@
 @_sap_tnt_NavigationList_PopupArrowBoxShadow: 0 0 0 0.0625rem @sapUiContentShadowColor, 0 1rem 2rem 0 fade(@sapUiContentShadowColor, 16);
 @_sap_tnt_NavigationList_PopupTitleTextSize: 1.25rem;
 @_sap_tnt_NavigationList_PopupTitleLineHeight: 1.5rem;
-@_sap_tnt_NavigationList_SelectionIndicatorDisplay: block;
 @_sap_tnt_NavigationList_PopupPadding: 0.5rem;
 @_sap_tnt_NavigationList_Collapsed_GroupBorderWidth: @_sap_tnt_NavigationList_GroupBorderWidth;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusTextDisplay: block;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemZIndex: 1;
 @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPosition: absolute;
-@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding: 0.5rem 0.5rem 0.5rem 0.25rem;
-@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPaddingCompact: 0.5rem 0.5rem 0.5rem 0.25rem;
+@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding: 0.5rem;
+@_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPaddingCompact: @_sap_tnt_NavigationList_Collapsed_HoverOrFocusItemPadding;
+@_sap_tnt_NavigationList_CollapsedIconPaddingLeft: 0.25rem;
+@_sap_tnt_NavigationList_NavigationIndicator: "\E066";
+@_sap_tnt_NavigationList_ExpandIconWidth: 2.25rem;
+@_sap_tnt_NavigationList_ExpandIconMarginRight: 0.375rem;
+@_sap_tnt_NavigationList_ExpandIconMarginLeft: 0.5rem;
+@_sap_tnt_NavigationList_ExpandIconFontSize: 1rem;

package/src/sap/tnt/themes/sap_horizon_hcw/SideNavigation.less

@@ -4,7 +4,8 @@
 /* ======================================= */
 
 @_sap_tnt_SideNavigation_Width: 16rem;
-@_sap_tnt_SideNavigation_CollapsedWidth: 3.5rem;
+@_sap_tnt_SideNavigation_CollapsedWidth: 4rem;
+@_sap_tnt_SideNavigation_NavigationSeparatorMargin: 0.25rem 0.5rem 0.25rem 0.5rem;
 @_sap_tnt_SideNavigation_NavigationSeparatorHeight: 0.0625rem;
 @_sap_tnt_SideNavigation_PhoneBorderRadius: 0.5rem;
 @_sap_tnt_SideNavigation_BoxShadow: var(--sapContent_Shadow0);

package/src/sap/ui/core/themes/sap_horizon/.theme

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.132.1</version>
+	<version>1.133.1</version>
 
 	<documentation>SAPUI5 Horizon theme library.</documentation>
 

package/src/sap/ui/core/themes/sap_horizon_dark/.theme

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.132.1</version>
+	<version>1.133.1</version>
 
 	<documentation>SAPUI5 Evening Horizon theme library.</documentation>
 

package/src/sap/ui/core/themes/sap_horizon_hcb/.theme

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.132.1</version>
+	<version>1.133.1</version>
 
 	<documentation>SAPUI5 horizon high contrast black theme library.</documentation>
 

package/src/sap/ui/core/themes/sap_horizon_hcw/.theme

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.132.1</version>
+	<version>1.133.1</version>
 
 	<documentation>SAPUI5 horizon high contrast white theme library.</documentation>
 

package/src/sap/ui/rta/themes/sap_horizon_dark/Toolbar.adaptation.less

@@ -13,6 +13,7 @@
 @_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiShellPositiveColor; //#97dd40
 @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor: @sapUiContentFocusColor; //#9ad3ff
 @_sap_ui_rta_Toolbar_Adaptation_VersionListBackgroundColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_Toolbar_Adaptation_BtnHoverTextColor: @sapUiButtonLiteHoverTextColor; //#4db1ff
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
@@ -134,6 +135,12 @@
 			}
 		}
 
+		.sapUiRtaVersionButton.sapUiRtaVersionColor:hover  {
+			> span.sapMBtnHoverable.sapMBtnTransparent > span.sapMBtnIcon,
+			> span > span > bdi {
+				color: @_sap_ui_rta_Toolbar_Adaptation_BtnHoverTextColor;
+			}
+		}
 	}
 	.sapUiRtaVersionHistory {
 		.sapMLIB:not(:hover) {

package/src/sap/ui/unified/themes/sap_horizon/Calendar.less

@@ -179,6 +179,36 @@ html.sap-desktop .sapUiCalHead > .sapUiCalHeadB:active {
 	color: @sapUiBaseText;
 }
 
+.sapUiCalYearPicker,
+.sapUiCalMonthPicker {
+	.sapUiCalItem {
+		outline: 0.0625rem solid @sapUiButtonLiteBorderColor;
+		outline-offset: -0.125rem;
+		background: @sapUiButtonLiteBackground;
+		color: @sapUiButtonLiteTextColor;
+
+		&:hover {
+			outline: 0.0625rem solid @sapUiButtonLiteHoverBorderColor;
+			color: @sapUiButtonLiteHoverTextColor;
+
+			&.sapUiCalItemSel,
+			&.sapUiCalItemSelBetween,
+			&.sapUiCalItemSel:not(.sapUiCalItemSelBetween):not(.sapUiCalItemSelStart):not(.sapUiCalItemSelEnd) {
+				outline: 0.0625rem solid @sapUiButtonSelectedHoverBorderColor;
+				background: @sapUiButtonSelectedHoverBackground;
+			}
+		}
+
+		&.sapUiCalItemSel,
+		&.sapUiCalItemSelBetween,
+		&.sapUiCalItemSel:not(.sapUiCalItemSelBetween):not(:hover) {
+			outline: 0.0625rem solid @sapUiButtonSelectedBorderColor;
+			background: @sapUiButtonSelectedBackground;
+			color: @sapUiButtonSelectedTextColor;
+		}
+	}
+}
+
 /* make outline for days on number to prevent it around week number */
 /* hide outline for all devices, but enable later for desktop */
 .sapUiCalItem:focus {
@@ -186,27 +216,38 @@ html.sap-desktop .sapUiCalHead > .sapUiCalHeadB:active {
 	overflow: hidden;
 }
 
-html.sap-desktop .sapUiCalItem:not(.sapUiCalItemSel):not(.sapUiCalItemWeekEnd):focus:not(:hover) {
-	background-color: @sapUiLegendWorkingBackground;
-}
 
 html.sap-desktop .sapUiCalItem.sapUiCalItemNow:not(.sapUiCalItemSelBetween):not(.sapUiCalItemSelStart):not(.sapUiCalItemSelEnd):focus > .sapUiCalItemText{
 	outline-offset: -0.45rem;
 }
 
-html.sap-desktop .sapUiCalMonthPicker .sapUiCalItem:focus,
-html.sap-desktop .sapUiCalYearPicker .sapUiCalItem:focus {
-	border: 0.125rem solid @sapUiContentFocusColor;
-}
+html.sap-desktop {
+	.sapUiCalMonthPicker,
+	.sapUiCalYearPicker {
+		.sapUiCalItem {
+			&:focus::before {
+				content: '';
+				position: absolute;
+				box-sizing: border-box;
+				left: 0.125rem;
+				top: 0.125rem;
+				right: 0.125rem;
+				bottom: 0.125rem;
+				border: 0.125rem solid @sapUiContentFocusColor;
+				border-radius: 0.375rem;
+			}
 
-html.sap-desktop .sapUiCalItemSel:not(.sapUiCalItemNow):not(.sapUiCalItemSelBetween):focus > .sapUiCalItemText {
-	color: @sapUiContentSelectedTextColor;
+			&.sapUiCalItemSel,
+			&.sapUiCalItemSelBetween {
+				&:focus:not(:hover) {
+					background: @sapUiButtonSelectedBackground;
+				}
+			}
+		}
+	}
 }
 
-html.sap-desktop .sapUiCalMonthPicker .sapUiCalItemSel:focus,
-html.sap-desktop .sapUiCalYearPicker .sapUiCalItemSel:focus {
-	outline-color: @sapUiContentSelectedTextColor;
-	background-color: @sapUiContentSelectedBackground;
+html.sap-desktop .sapUiCalItemSel:not(.sapUiCalItemNow):not(.sapUiCalItemSelBetween):focus > .sapUiCalItemText {
 	color: @sapUiContentSelectedTextColor;
 }
 
@@ -583,17 +624,11 @@ html.sap-desktop .sapUiCalItemOtherMonth:not(.sapUiCalItemSel) :not(.sapUiCalWee
 
 .sapUiCalMonthPicker,
 .sapUiCalYearPicker {
-	.sapUiCalItem {
-		color: @sapUiButtonLiteTextColor;
-	}
-	.sapUiCalItem.sapUiCalItemSel {
-		font-family: @sapFontBoldFamily;
-	}
 	.sapUiCalItem.sapUiCalItemDsbl {
 		opacity: @sapUiContentDisabledOpacity;
 	}
 	.sapUiCalItem:focus {
-		line-height: 2.75rem;
+		line-height: 2.875rem;
 	}
 }
 
@@ -601,7 +636,7 @@ html.sap-desktop .sapUiCalItemOtherMonth:not(.sapUiCalItemSel) :not(.sapUiCalWee
 	.sapUiCalMonthPicker,
 	.sapUiCalYearPicker {
 		.sapUiCalItem:focus {
-			line-height: 1.75rem;
+			line-height: 1.875rem;
 		}
 	}
 }

package/src/sap/ui/unified/themes/sap_horizon/ColorPicker.less

@@ -107,10 +107,6 @@
 	line-height: 2.75rem;
 }
 
-.sapUiColorPicker-ColorPickerMatrix.sapUnifiedColorPicker .sapUiColorPicker-ColorPickerCircle:after {
-	border-color: @sapUiFieldBorderColor;
-}
-
 .sapUnifiedColorPicker .sapMSliderInner:not(.sapMSliderInnerDisabled):hover .sapMSliderHandle {
 	background: @sapUiButtonBackground;
 	border-color: darken(@sapUiFieldBorderColor, 15);

package/src/sap/ui/unified/themes/sap_horizon_dark/Calendar.less

@@ -179,6 +179,36 @@ html.sap-desktop .sapUiCalHead > .sapUiCalHeadB:active {
 	color: @sapUiBaseText;
 }
 
+.sapUiCalYearPicker,
+.sapUiCalMonthPicker {
+	.sapUiCalItem {
+		outline: 0.0625rem solid @sapUiButtonLiteBorderColor;
+		outline-offset: -0.125rem;
+		background: @sapUiButtonLiteBackground;
+		color: @sapUiButtonLiteTextColor;
+
+		&:hover {
+			outline: 0.0625rem solid @sapUiButtonLiteHoverBorderColor;
+			color: @sapUiButtonLiteHoverTextColor;
+
+			&.sapUiCalItemSel,
+			&.sapUiCalItemSelBetween,
+			&.sapUiCalItemSel:not(.sapUiCalItemSelBetween):not(.sapUiCalItemSelStart):not(.sapUiCalItemSelEnd) {
+				outline: 0.0625rem solid @sapUiButtonSelectedHoverBorderColor;
+				background: @sapUiButtonSelectedHoverBackground;
+			}
+		}
+
+		&.sapUiCalItemSel,
+		&.sapUiCalItemSelBetween,
+		&.sapUiCalItemSel:not(.sapUiCalItemSelBetween):not(:hover) {
+			outline: 0.0625rem solid @sapUiButtonSelectedBorderColor;
+			background: @sapUiButtonSelectedBackground;
+			color: @sapUiButtonSelectedTextColor;
+		}
+	}
+}
+
 /* make outline for days on number to prevent it around week number */
 /* hide outline for all devices, but enable later for desktop */
 .sapUiCalItem:focus {
@@ -186,27 +216,37 @@ html.sap-desktop .sapUiCalHead > .sapUiCalHeadB:active {
 	overflow: hidden;
 }
 
-html.sap-desktop .sapUiCalItem:not(.sapUiCalItemSel):not(.sapUiCalItemWeekEnd):focus:not(:hover) {
-	background-color: @sapUiLegendWorkingBackground;
-}
-
 html.sap-desktop .sapUiCalItem.sapUiCalItemNow:not(.sapUiCalItemSelBetween):not(.sapUiCalItemSelStart):not(.sapUiCalItemSelEnd):focus > .sapUiCalItemText{
 	outline-offset: -0.45rem;
 }
 
-html.sap-desktop .sapUiCalMonthPicker .sapUiCalItem:focus,
-html.sap-desktop .sapUiCalYearPicker .sapUiCalItem:focus {
-	border: 0.125rem solid @sapUiContentFocusColor;
-}
+html.sap-desktop {
+	.sapUiCalMonthPicker,
+	.sapUiCalYearPicker {
+		.sapUiCalItem {
+			&:focus::before {
+				content: '';
+				position: absolute;
+				box-sizing: border-box;
+				left: 0.125rem;
+				top: 0.125rem;
+				right: 0.125rem;
+				bottom: 0.125rem;
+				border: 0.125rem solid @sapUiContentFocusColor;
+				border-radius: 0.375rem;
+			}
 
-html.sap-desktop .sapUiCalItemSel:not(.sapUiCalItemNow):not(.sapUiCalItemSelBetween):focus > .sapUiCalItemText {
-	color: @sapUiContentSelectedTextColor;
+			&.sapUiCalItemSel,
+			&.sapUiCalItemSelBetween {
+				&:focus:not(:hover) {
+					background: @sapUiButtonSelectedBackground;
+				}
+			}
+		}
+	}
 }
 
-html.sap-desktop .sapUiCalMonthPicker .sapUiCalItemSel:focus,
-html.sap-desktop .sapUiCalYearPicker .sapUiCalItemSel:focus {
-	outline-color: @sapUiContentSelectedTextColor;
-	background-color: @sapUiContentSelectedBackground;
+html.sap-desktop .sapUiCalItemSel:not(.sapUiCalItemNow):not(.sapUiCalItemSelBetween):focus > .sapUiCalItemText {
 	color: @sapUiContentSelectedTextColor;
 }
 
@@ -583,17 +623,11 @@ html.sap-desktop .sapUiCalItemOtherMonth:not(.sapUiCalItemSel) :not(.sapUiCalWee
 
 .sapUiCalMonthPicker,
 .sapUiCalYearPicker {
-	.sapUiCalItem {
-		color: @sapUiButtonLiteTextColor;
-	}
-	.sapUiCalItem.sapUiCalItemSel {
-		font-family: @sapFontBoldFamily;
-	}
 	.sapUiCalItem.sapUiCalItemDsbl {
 		opacity: @sapUiContentDisabledOpacity;
 	}
 	.sapUiCalItem:focus {
-		line-height: 2.75rem;
+		line-height: 2.875rem;
 	}
 }
 
@@ -601,7 +635,7 @@ html.sap-desktop .sapUiCalItemOtherMonth:not(.sapUiCalItemSel) :not(.sapUiCalWee
 	.sapUiCalMonthPicker,
 	.sapUiCalYearPicker {
 		.sapUiCalItem:focus {
-			line-height: 1.75rem;
+			line-height: 1.875rem;
 		}
 	}
 }

package/src/sap/ui/unified/themes/sap_horizon_dark/ColorPicker.less

@@ -107,10 +107,6 @@
 	line-height: 2.75rem;
 }
 
-.sapUiColorPicker-ColorPickerMatrix.sapUnifiedColorPicker .sapUiColorPicker-ColorPickerCircle:after {
-	border-color: @sapUiFieldBorderColor;
-}
-
 .sapUnifiedColorPicker .sapMSliderInner:not(.sapMSliderInnerDisabled):hover .sapMSliderHandle {
 	background: @sapUiButtonBackground;
 	border-color: darken(@sapUiFieldBorderColor, 15);

package/src/sap/ui/unified/themes/sap_horizon_hcb/Calendar.less

@@ -144,6 +144,36 @@ html.sap-desktop .sapUiCalHead > .sapUiCalHeadB:active {
 	color: @sapUiBaseText;
 }
 
+.sapUiCalYearPicker,
+.sapUiCalMonthPicker {
+	.sapUiCalItem {
+		outline: 0.0625rem solid @sapUiButtonLiteBorderColor;
+		outline-offset: -0.125rem;
+		background: @sapUiButtonLiteBackground;
+		color: @sapUiButtonLiteTextColor;
+
+		&:hover {
+			outline: 0.0625rem solid @sapUiButtonLiteHoverBorderColor;
+			color: @sapUiButtonLiteHoverTextColor;
+
+			&.sapUiCalItemSel,
+			&.sapUiCalItemSelBetween,
+			&.sapUiCalItemSel:not(.sapUiCalItemSelBetween):not(.sapUiCalItemSelStart):not(.sapUiCalItemSelEnd) {
+				outline: 0.0625rem solid @sapUiButtonSelectedHoverBorderColor;
+				background: @sapUiButtonSelectedHoverBackground;
+			}
+		}
+
+		&.sapUiCalItemSel,
+		&.sapUiCalItemSelBetween,
+		&.sapUiCalItemSel:not(.sapUiCalItemSelBetween):not(:hover) {
+			outline: 0.0625rem solid @sapUiButtonSelectedBorderColor;
+			background: @sapUiButtonSelectedBackground;
+			color: @sapUiButtonSelectedTextColor;
+		}
+	}
+}
+
 /* make outline for days on number to prevent it around week number */
 /* hide outline for all devices, but enable later for desktop */
 .sapUiCalItem:focus {
@@ -151,27 +181,44 @@ html.sap-desktop .sapUiCalHead > .sapUiCalHeadB:active {
 	overflow: visible;
 }
 
-html.sap-desktop .sapUiCalItem:not(.sapUiCalItemSel):not(.sapUiCalItemWeekEnd):focus {
-	background-color: @sapUiLegendWorkingBackground;
-}
-
 html.sap-desktop .sapUiCalItem.sapUiCalItemNow:not(.sapUiCalItemSelBetween):not(.sapUiCalItemSelStart):not(.sapUiCalItemSelEnd):focus > .sapUiCalItemText{
 	outline-offset: -0.45rem;
 }
 
-html.sap-desktop .sapUiCalMonthPicker .sapUiCalItem:focus,
-html.sap-desktop .sapUiCalYearPicker .sapUiCalItem:focus {
-	border: 0.125rem dotted @sapUiContentFocusColor;
-}
+html.sap-desktop {
+	.sapUiCalMonthPicker,
+	.sapUiCalYearPicker {
+		.sapUiCalItem {
+			&:focus::before {
+				content: '';
+				position: absolute;
+				box-sizing: border-box;
+				left: 0.125rem;
+				top: 0.125rem;
+				right: 0.125rem;
+				bottom: 0.125rem;
+				border: 0.125rem dotted @sapUiContentFocusColor;
+				border-radius: 0.375rem;
+			}
 
-html.sap-desktop .sapUiCalItemSel:not(.sapUiCalItemNow):not(.sapUiCalItemSelBetween):focus > .sapUiCalItemText {
-	color: @sapUiContentSelectedTextColor;
+			&:focus {
+				outline: 0.0625rem solid @sapUiButtonLiteBorderColor;
+			}
+
+			&.sapUiCalItemSel,
+			&.sapUiCalItemSelBetween {
+				&:focus:not(:hover) {
+					background: @sapUiButtonSelectedBackground;
+				}
+				&:focus:hover {
+					background: @sapUiButtonSelectedHoverBackground;
+				}
+			}
+		}
+	}
 }
 
-html.sap-desktop .sapUiCalMonthPicker .sapUiCalItemSel:focus,
-html.sap-desktop .sapUiCalYearPicker .sapUiCalItemSel:focus {
-	outline-color: @sapUiContentSelectedTextColor;
-	background-color: @sapUiContentSelectedBackground;
+html.sap-desktop .sapUiCalItemSel:not(.sapUiCalItemNow):not(.sapUiCalItemSelBetween):focus > .sapUiCalItemText {
 	color: @sapUiContentSelectedTextColor;
 }
 
@@ -415,17 +462,11 @@ html.sap-desktop .sapUiCalItemOtherMonth:not(.sapUiCalItemSel) :not(.sapUiCalWee
 
 .sapUiCalMonthPicker,
 .sapUiCalYearPicker {
-	.sapUiCalItem {
-		color: @sapUiButtonLiteTextColor;
-	}
-	.sapUiCalItem.sapUiCalItemSel {
-		font-family: @sapFontBoldFamily;
-	}
 	.sapUiCalItem.sapUiCalItemDsbl {
 		opacity: @sapUiContentDisabledOpacity;
 	}
 	.sapUiCalItem:focus {
-		line-height: 2.75rem;
+		line-height: 2.875rem;
 	}
 }
 
@@ -433,7 +474,7 @@ html.sap-desktop .sapUiCalItemOtherMonth:not(.sapUiCalItemSel) :not(.sapUiCalWee
 	.sapUiCalMonthPicker,
 	.sapUiCalYearPicker {
 		.sapUiCalItem:focus {
-			line-height: 1.75rem;
+			line-height: 1.875rem;
 		}
 	}
 }