@openui5/themelib_sap_horizon 1.127.0 → 1.128.0

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

@@ -1,33 +1,36 @@
 /******************************************************************
 	Style of the RTA Toolbar (type: adaptation) - Horizon Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiToolbarBackground; //#fff
-@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiShellTextColor; //#223548
-@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: @sapUiShellTextColor; //#223548
-@_sap_ui_rta_Toolbar_Adaptation_BtnHoverText: @sapUiShellTextColor; //#223548
-@_sap_ui_rta_Toolbar_Adaptation_FocusColor: @sapUiToolbarBackground; //#fff
-@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol: @sapUiSelected; //#0070f2
+@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiShellTextColor; //#1d2d3e
+@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorderColor: transparent;
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor: @sapUiButtonEmphasizedTextColor; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor: @sapUiShellBorderColor; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnFocusColor: @sapUiShellBorderColor; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelectedBackgroundColor: darken(@sapUiButtonEmphasizedBackground, 5%); //#0064d9
 @_sap_ui_rta_Toolbar_Adaptation_BorderRadius: @sapUiButtonBorderCornerRadius; //0.5rem
-@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: transparent;
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverTextColor: @sapUiShellTextColor;
-@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: @sapUiCriticalText; //#b95100
-@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiPositiveText; //#256f3a
-@_sap_ui_rta_Toolbar_Adaptation_BaseColorLight: @sapUiGroupTitleBorderColor; // #a8b3bd
-@_sap_ui_rta_Toolbar_Adaptation_VersionHistoryHover: @sapUiListHoverBackground; // #eaecee
+@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: darken(@sapUiContentRatedColor, 10%); //#9f5a00
+@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiShellPositiveColor; //#256f3a
+@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor: @sapUiContentFocusColor; //#0032a5
+@_sap_ui_rta_Toolbar_Adaptation_VersionListBackgroundColor: @sapUiShellBorderColor; //#fff
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
 
+		//Segmented Buttons
 		.sapMSegB {
+			background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor;
 			.sapMSegBBtn {
 				.sapMSegBBtnInnerWrapper {
+					background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor;
 					border: none;
-					background-color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
 				}
 
 				&.sapMSegBBtnFocusable {
+					.sapMSegBBtnInner {
+						color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+					}
 					&.sapMSegBBtnSel:focus .sapMSegBBtnInner {
-						outline: 0.0625rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusColor; //1px
+						outline: 0.0625rem solid @_sap_ui_rta_Toolbar_Adaptation_SegBBtnFocusColor; //1px
 						outline-offset: -0.125rem; //2px
 					}
 
@@ -44,23 +47,45 @@
 
 					&.sapMSegBBtnSel {
 						&:hover .sapMSegBBtnInner {
-							color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
-
 							&:after {
 								content: none;
 							}
 						}
 
 						& .sapMSegBBtnInner {
-							background: @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol;
-							color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
+							background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelectedBackgroundColor;
+							color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor;
 
 							&:after {
 								content: none;
 							}
 
 							.sapUiIcon {
-								color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
+								color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor;
+							}
+						}
+					}
+				}
+			}
+			&.sapMSegBIcons {
+				.sapMSegBBtn {
+					&.sapMSegBBtnFocusable {
+						&:not(.sapMSegBBtnSel):focus {
+							.sapMSegBBtnInner {
+								outline: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor; //1px
+								border-radius: @_sap_ui_rta_Toolbar_Adaptation_BorderRadius;
+								outline-offset: -0.125rem;
+
+								&:after {
+									content: none;
+								}
+							}
+						}
+						&.sapMSegBBtnSel:focus {
+							.sapMSegBBtnInner {
+								&:after {
+									content: none;
+								}
 							}
 						}
 					}
@@ -68,10 +93,16 @@
 			}
 		}
 
-		.sapMBtn {
+		//Buttons
+		.sapMBtn:not(.sapUiRtaVersionButton) {
 			&.sapMBtnDisabled .sapMBtnInner {
 				opacity: 1.0;
 			}
+			.sapMBtnTransparent,
+			.sapMBtnTransparent bdi,
+			.sapMBtnTransparent>.sapMBtnIcon {
+				color: @_sap_ui_rta_Toolbar_Adaptation_TextColor!important;
+			}
 		}
 
 		.sapMTB:not(.sapMTB-Info-CTX) {
@@ -81,7 +112,8 @@
 
 		.sapUiRtaVersionButton.sapUiRtaDraftVersionAccent {
 			&:hover {
-				> span > span > bdi {
+				> span > span > bdi,
+				> span > span.sapMBtnIcon {
 					color: @_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor !important;
 				}
 			}
@@ -89,11 +121,22 @@
 
 		.sapUiRtaVersionButton.sapUiRtaActiveVersionAccent {
 			&:hover {
-				> span > span > bdi {
+				> span > span > bdi,
+				> span > span.sapMBtnIcon{
 					color: @_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor !important;
 				}
 			}
 		}
 
 	}
+	.sapUiRtaVersionHistory {
+		.sapMLIB:not(:hover) {
+			background: @_sap_ui_rta_Toolbar_Adaptation_VersionListBackgroundColor;
+		}
+		.sapMLIBHoverable:hover {
+			outline: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor;
+			border-radius: @_sap_ui_rta_Toolbar_Adaptation_BorderRadius;
+			outline-offset: -0.125rem;
+		}
+	}
 }

package/src/sap/ui/rta/themes/sap_horizon/Toolbar.base.less

@@ -1,8 +1,8 @@
 /******************************************************************
 	Style of the RTA Toolbar (all types) - Horizon Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Base_BaseBG: @sapUiToolbarBackground; //#fff
-@_sap_ui_rta_Toolbar_Base_OutlineColor: @sapUiButtonEmphasizedBorderColor; //#0070f2
+@_sap_ui_rta_Toolbar_Base_BackgroundColor: @sapUiShellBorderColor; //#fff
+@_sap_ui_rta_Toolbar_Base_OutlineColor: @sapUiShellSelectedTextColor; //#0070f2
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar {

package/src/sap/ui/rta/themes/sap_horizon/library.source.less

@@ -7,11 +7,11 @@
 @import "../../../../../sap/ui/core/themes/sap_horizon/base.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon/global.less";
 
-@import "Overlay.less";
-@import "ContextMenu.less";
 @import "AddIFrame.less";
+@import "ChangeVisualization.less";
+@import "ContextMenu.less";
 @import "Dialogs.less";
 @import "FieldRepository.less";
+@import "Overlay.less";
 @import "Toolbar.adaptation.less";
-@import "Toolbar.base.less";
-@import "ChangeVisualization.less";
+@import "Toolbar.base.less";

package/src/sap/ui/rta/themes/sap_horizon_dark/AddIFrame.less

@@ -1,9 +1,8 @@
 /******************************************************************
 	Style of the RTA Add IFrame Dialog  - Horizon Dark Theme
 *******************************************************************/
-@_sap_ui_rta_AddIFrame_DelimiterLineColor: @sapUiToolbarSeparatorColor; //#3c4957
-@_sap_ui_rta_AddIFrame_BorderRadius: @sapUiGroupBorderCornerRadius; //0.5rem
-@_sap_ui_rta_AddIFrame_PreviewTlbarHoverBG: @sapUiButtonHoverBackground; //	#1d232a
+@_sap_ui_rta_AddIFrame_BorderRadius: @sapUiFieldBorderCornerRadius; //0.25rem
+@_sap_ui_rta_AddIFrame_ButtonHoverBackgroundColor: @sapUiButtonHoverBackground; //#222b35
 
 .sapUiRtaMode {
 	.sapUiRtaAddIFrameDialog {
@@ -19,24 +18,12 @@
 				.sapUiRtaAddIFrameDialogEditUrl {
 					.sapMTextArea {
 						.sapMInputBaseContentWrapper {
-							border: 0.0625rem solid @_sap_ui_rta_AddIFrame_BorderColor; //1px
-							border-radius: @_sap_ui_rta_AddIFrame_BorderRadius;
 							background-image: none;
 						}
 
 						.sapMTextAreaInner {
 							border: none;
 						}
-
-						&.sapMFocus.sapMInputBase .sapMInputBaseContentWrapper:not(.sapMInputBaseDisabledWrapper)::before {
-							content: none;
-						}
-
-						&.sapMFocus {
-							.sapMInputBaseContentWrapper .sapMInputBaseInner {
-								outline: none;
-							}
-						}
 					}
 				}
 			}
@@ -53,9 +40,12 @@
 						padding-left: 0;
 						padding-right: 0.125rem;
 
-						&.sapMTB:hover,
-						&.sapMTB-Solid-CTX.sapMTB:hover {
-							background-color: @_sap_ui_rta_AddIFrame_PreviewTlbarHoverBG;
+						.sapUiRtaAddIFrameDialogPreviewButton {
+							&:not(.sapMBtnDisabled):hover {
+								.sapMBtnInner {
+									background-color: @_sap_ui_rta_AddIFrame_ButtonHoverBackgroundColor;
+								}
+							}
 						}
 					}
 				}
@@ -63,8 +53,6 @@
 
 			.sapUiRtaAddIFrameDialogPreviewGrid {
 				border-radius: @_sap_ui_rta_AddIFrame_BorderRadius;
-				padding-bottom: 0.5rem;
-				background: transparent;
 			}
 		}
 	}

package/src/sap/ui/rta/themes/sap_horizon_dark/ChangeVisualization.less

@@ -1,9 +1,9 @@
 /******************************************************************
 	Style of the RTA Change Visualization - Horizon Dark theme
 *******************************************************************/
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: @sapUiChartPaletteSequentialHue1Light3; //#90c9ff
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: darken(@sapUiChartPaletteSequentialHue1Light1, 5%); //#4ea9ff
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: @sapUiChartPaletteSequentialHue1Dark1; //#0874da
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: @sapUiChartPaletteSequentialHue1Light3; //#68aeff
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: darken(@sapUiChartPaletteSequentialHue1Light1, 5%); //#0074fc
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: @sapUiChartPaletteSequentialHue1Dark1; //#0757b3
 @_sap_ui_rta_ChangeVisualization_BorderRadius: @sapUiButtonBorderCornerRadius; // 0.5rem
 
 .sapUiDtOverlay {

package/src/sap/ui/rta/themes/sap_horizon_dark/ContextMenu.less

@@ -1,15 +1,16 @@
 /******************************************************************
 	Style of the RTA Contextmenu - Horizon Dark Theme
 *******************************************************************/
-@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiButtonEmphasizedBorderColor; // #0070f2
-@_sap_ui_rta_ContextMenu_Border_Radius: @sapUiGroupBorderCornerRadius; // 0.5rem
+@_sap_ui_rta_ContextMenu_BorderLightColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_ContextMenu_BorderDarkColor: @sapUiShellSelectedTextColor; //#4db1ff
+@_sap_ui_rta_ContextMenu_BorderRadius: @sapUiGroupBorderCornerRadius; // 0.5rem
 
 .sapUiRtaMode {
 	.sapUiDtContextMenu {
 		&.sapMMenu {
-			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_Border_DarkColor; //2px
+			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_BorderDarkColor; //2px
 			border-image: none;
-			border-radius: @_sap_ui_rta_ContextMenu_Border_Radius;
+			border-radius: @_sap_ui_rta_ContextMenu_BorderRadius;
 		}
 	}
 }

package/src/sap/ui/rta/themes/sap_horizon_dark/Dialogs.less

@@ -1,13 +1,11 @@
 /******************************************************************
 	Style of the RTA Dialogs - Horizon Dark Theme
 *******************************************************************/
-@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiShellBorderColor; //#fff
-@_sap_ui_rta_Dialogs_BorderRadius: @sapUiElementBorderCornerRadius; //0.75rem
-@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiButtonEmphasizedBorderColor; //#0070f2
+@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiShellSelectedTextColor; //#4db1ff
 
 .sapMDialog.sapUiRTABorder {
 	border-image: none;
-	border-radius: @_sap_ui_rta_Dialogs_BorderRadius;
 	outline: 0.188rem dashed @_sap_ui_rta_Dialogs_BorderDarkColor; //3px
 	outline-offset: -0.188rem;
 }
@@ -17,7 +15,6 @@
 	&.sapMPopover, .sapMPopover {
 		border: 0.188rem dashed @_sap_ui_rta_Dialogs_BorderDarkColor; //3px
 		border-image: none;
-		border-radius: @_sap_ui_rta_Dialogs_BorderRadius;
 	}
 
 	&.sapMPopoverArr, .sapMPopoverArr {

package/src/sap/ui/rta/themes/sap_horizon_dark/FieldRepository.less

@@ -1,19 +1,16 @@
 /******************************************************************
 	Style of the RTA Add Fields Dialog  - Horizon Dark Theme
 *******************************************************************/
-@_sap_ui_rta_FieldRepository_ListSelect: @sapUiListHoverSelectionBackground;
-@_sap_ui_rta_FieldRepository_BtnHoverOutline: @sapUiButtonActiveBorderColor;
+@_sap_ui_rta_FieldRepository_BtnHoverOutlineColor: @sapUiButtonSelectedHoverBorderColor; //#4db1ff
 @_sap_ui_rta_FieldRepository_ListItmBorderRadius: @sapUiButtonBorderCornerRadius; //0.5rem
+@_sap_ui_rta_FieldRepository_BtnHoverBorderColor: @sapUiButtonHoverBorderColor; //#3a4a5a
+@_sap_ui_rta_FieldRepository_BtnEmphasizedFocusBorderColor: @sapUiButtonEmphasizedHoverTextColor; //#eaecee
 
 .sapUiRtaMode {
 
 	.sapUIRtaFieldRepositoryDialog {
 
 		.sapMLIBHoverable {
-			&.sapMLIBSelected:hover {
-				background: @_sap_ui_rta_FieldRepository_ListSelect;
-			}
-
 			&.sapMLIB.sapMLIBSelected {
 				border-bottom: 0.0625rem solid transparent;
 			}
@@ -25,7 +22,36 @@
 
 		// Search field
 		.sapMSF.sapMFocus:hover .sapMSFF {
-			outline: 0.0625rem solid @_sap_ui_rta_FieldRepository_BtnHoverOutline; //1px
+			outline: 0.0625rem solid @_sap_ui_rta_FieldRepository_BtnHoverOutlineColor; //1px
+		}
+
+		// Sort-Button
+		.sapMTB:not(.sapMIBar-CTX){
+			.sapMBtn {
+				&:hover {
+					.sapMBtnInner {
+						border: 0.0625rem solid @_sap_ui_rta_FieldRepository_BtnHoverBorderColor!important; //1px
+					}
+				}
+			}
+		}
+		.sapMBtn {
+
+			>.sapMBtnInner {
+				border: 0.0625rem solid transparent; //1px
+			}
+
+			&:focus {
+				> .sapMBtnInner{
+					outline: none;
+				}
+				&:not(:hover) > .sapMFocusable {
+					outline: none;
+				}
+				&:not(:hover) > .sapMFocusable.sapMBtnEmphasized {
+					border-color:transparent;
+				}
+			}
 		}
 	}
 }

package/src/sap/ui/rta/themes/sap_horizon_dark/Overlay.less

@@ -1,17 +1,31 @@
 /******************************************************************
 	Style of the RTA Overlays - Horizon Dark Theme
 *******************************************************************/
-@_sap_ui_rta_Overlay_PlaceholderBG: lighten(saturate(@sapUiShellBackground, 15%), 2%);
-@_sap_ui_rta_Overlay_ShellBG: transparent;
-@_sap_ui_rta_Overlay_HoverBG: fade(@sapUiSelected, 5%); // rgba(0, 112, 242, 0.05)
-@_sap_ui_rta_Overlay_BorderRadius: @sapUiButtonBorderCornerRadius; // 0.5rem
+@_sap_ui_rta_Overlay_PlaceholderBackgroundColor: darken(@sapUiContentImagePlaceholderBackground, 25%); //#17212a
 
 .sapUiRta {
-	&:not(.sapUiRtaVisualizationMode) {
-		.sapUiRtaOverlayHover:after {
-			border-radius: @_sap_ui_rta_Overlay_BorderRadius;
-			border: none;
-			background: @_sap_ui_rta_Overlay_HoverBG;
+	.sapUiDtOverlayDropZone {
+		> .sapUiDtOverlayChildren {
+			> .sapUiRtaOverlayPlaceholder {
+				background: @_sap_ui_rta_Overlay_PlaceholderBackgroundColor !important;
+				// no "focus" border
+				&:focus {
+					&:before {
+						content: none;
+					}
+				}
+
+				// all descendants
+				* {
+					background: @_sap_ui_rta_Overlay_PlaceholderBackgroundColor;
+					// no "focus" border
+					&:focus {
+						&:before {
+							content: none;
+						}
+					}
+				}
+			}
 		}
 	}
 }

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

@@ -1,45 +1,40 @@
 /********************************************************************
 	Style of the RTA Toolbar (type: adaptation) - Horizon Dark Theme
 *********************************************************************/
-@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiToolbarBackground; //#1d232a
 @_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiShellTextColor; //#eaecee
-@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: @sapUiShellTextColor; //#eaecee
-@_sap_ui_rta_Toolbar_Adaptation_BtnHoverText: @sapUiShellTextColor; //#eaecee
-@_sap_ui_rta_Toolbar_Adaptation_FocusColor: @sapUiContentContrastFocusColor; //#fff
-@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol: @sapUiSelected; //#4db1ff
+@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorderColor: transparent;
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor: @sapUiButtonEmphasizedTextColor; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverBackgroundColor: @sapUiButtonHoverBorderColor; //#3a4a5a
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnFocusColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelectedBackgroundColor: darken(@sapUiButtonEmphasizedBackground, 5%); //#0064d9
 @_sap_ui_rta_Toolbar_Adaptation_BorderRadius: @sapUiButtonBorderCornerRadius; //0.5rem
-@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: transparent;
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverTextColor: @sapUiShellTextColor; //#eaecee
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelHoverBG: @sapUiButtonEmphasizedHoverBackground; //#0064d9
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverBG: fade(@sapUiNeutral, 30); //#474e56
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnBG: @sapUiButtonEmphasizedBackground; //	#0070f2
-@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: @sapUiCriticalElement; //#f7bf00
-@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiPositiveText; //#97dd40
-@_sap_ui_rta_Toolbar_Adaptation_VersionHistoryHover: @sapUiListSelectionBackgroundColor; //#1d2d3e
-@_sap_ui_rta_Toolbar_Adaptation_BaseColorLight: @sapUiListHoverBackground; // #232b33
+@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: darken(@sapUiContentRatedColor, 10%); //#ffd33f
+@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiShellPositiveColor; //#97dd40
+@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor: @sapUiContentFocusColor; //#9ad3ff
+@_sap_ui_rta_Toolbar_Adaptation_VersionListBackgroundColor: @sapUiShellBorderColor; //#1d232a
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
 
+		//Segmented Buttons
 		.sapMSegB {
+			background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor;
 			.sapMSegBBtn {
-				margin: 0 0.125rem;
-
 				.sapMSegBBtnInnerWrapper {
+					background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor;
 					border: none;
-					background-color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
 				}
 
 				&.sapMSegBBtnFocusable {
+					.sapMSegBBtnInner {
+						color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+					}
 					&.sapMSegBBtnSel:focus .sapMSegBBtnInner {
-						outline: 0.0625rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusColor; //1px
+						outline: 0.0625rem solid @_sap_ui_rta_Toolbar_Adaptation_SegBBtnFocusColor; //1px
 						outline-offset: -0.125rem; //2px
 					}
 
-					&:hover .sapMSegBBtnInner {
-						background-color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverBG;
-					}
-
 					&:focus .sapMSegBBtnInner {
 						outline: none;
 
@@ -48,31 +43,53 @@
 							top: 0.0625rem;
 							right: 0.0625rem;
 							bottom: 0.0625rem;
-							border: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol;
-							border-radius: 0.375rem;
 						}
 					}
+					&:hover .sapMSegBBtnInner {
+						background-color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverBackgroundColor;
+					}
 
 					&.sapMSegBBtnSel {
 						&:hover .sapMSegBBtnInner {
-							background-color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelHoverBG;
-							color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
-
 							&:after {
 								content: none;
 							}
 						}
 
 						& .sapMSegBBtnInner {
-							background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnBG;
-							color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+							background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelectedBackgroundColor;
+							color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor;
 
 							&:after {
 								content: none;
 							}
 
 							.sapUiIcon {
-								color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+								color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor;
+							}
+						}
+					}
+				}
+			}
+			&.sapMSegBIcons {
+				.sapMSegBBtn {
+					&.sapMSegBBtnFocusable {
+						&:not(.sapMSegBBtnSel):focus {
+							.sapMSegBBtnInner {
+								outline: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor; //1px
+								border-radius: @_sap_ui_rta_Toolbar_Adaptation_BorderRadius;
+								outline-offset: -0.125rem;
+
+								&:after {
+									content: none;
+								}
+							}
+						}
+						&.sapMSegBBtnSel:focus {
+							.sapMSegBBtnInner {
+								&:after {
+									content: none;
+								}
 							}
 						}
 					}
@@ -80,10 +97,18 @@
 			}
 		}
 
-		.sapMBtn {
+		//Buttons
+		.sapMBtn:not(.sapUiRtaVersionButton) {
 			&.sapMBtnDisabled .sapMBtnInner {
 				opacity: 1.0;
 			}
+			&:not(:hover){
+				.sapMBtnTransparent,
+				.sapMBtnTransparent bdi,
+				.sapMBtnTransparent>.sapMBtnIcon {
+					color: @_sap_ui_rta_Toolbar_Adaptation_TextColor!important;
+				}
+			}
 		}
 
 		.sapMTB:not(.sapMTB-Info-CTX) {
@@ -93,7 +118,8 @@
 
 		.sapUiRtaVersionButton.sapUiRtaDraftVersionAccent {
 			&:hover {
-				> span > span > bdi {
+				> span > span > bdi,
+				> span > span.sapMBtnIcon {
 					color: @_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor !important;
 				}
 			}
@@ -101,17 +127,21 @@
 
 		.sapUiRtaVersionButton.sapUiRtaActiveVersionAccent {
 			&:hover {
-				> span > span > bdi {
+				> span > span > bdi,
+				> span > span.sapMBtnIcon{
 					color: @_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor !important;
 				}
 			}
 		}
+
 	}
 	.sapUiRtaVersionHistory {
-		border: 0.0625rem solid fade(@sapUiNeutralBorder, 35%);
+		.sapMLIB:not(:hover) {
+			background: @_sap_ui_rta_Toolbar_Adaptation_VersionListBackgroundColor;
+		}
 		.sapMLIBHoverable:hover {
-			outline: 0.125rem solid @sapUiSelected;
-			border-radius: 0.375rem;
+			outline: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor;
+			border-radius: @_sap_ui_rta_Toolbar_Adaptation_BorderRadius;
 			outline-offset: -0.125rem;
 		}
 	}

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

@@ -1,8 +1,8 @@
 /******************************************************************
 	Style of the RTA Toolbar (all types) - Horizon Dark Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Base_BaseBG: @sapUiToolbarBackground; //#1d232a
-@_sap_ui_rta_Toolbar_Base_OutlineColor: @sapUiButtonEmphasizedBorderColor; //#0070f2
+@_sap_ui_rta_Toolbar_Base_BackgroundColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_Toolbar_Base_OutlineColor: @sapUiShellSelectedTextColor; //#4db1ff
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar {

package/src/sap/ui/rta/themes/sap_horizon_dark/library.source.less

@@ -7,11 +7,11 @@
 @import "../../../../../sap/ui/core/themes/sap_horizon_dark/base.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon_dark/global.less";
 
-@import "Overlay.less";
+@import "AddIFrame.less";
+@import "ChangeVisualization.less";
 @import "ContextMenu.less";
 @import "Dialogs.less";
-@import "AddIFrame.less";
 @import "FieldRepository.less";
+@import "Overlay.less";
 @import "Toolbar.adaptation.less";
-@import "Toolbar.base.less";
-@import "ChangeVisualization.less";
+@import "Toolbar.base.less";

package/src/sap/ui/rta/themes/sap_horizon_hcb/ChangeVisualization.less

@@ -4,13 +4,14 @@
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: lighten(@sapUiPositiveText, 10%); //#bbddbb
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiCriticalText; //#ffab1d
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: lighten(@sapUiChart8, 20%); //#dd8ec9
-@_sap_ui_rta_ChangeVisualization_OverlayOutline: @sapUiContentHelpColor; // #03b803
-@_sap_ui_rta_ChangeVisualization_BorderRadius: @sapUiButtonBorderCornerRadius;
+@_sap_ui_rta_ChangeVisualization_OverlayOutlineColor: darken(@sapUiSuccessBorder, 25%); //#4c994c
+@_sap_ui_rta_ChangeVisualization_BorderRadius: @sapUiButtonBorderCornerRadius; // 0.375rem
 
 .sapUiDtOverlay {
 	.sapUiRtaChangeIndicatorHovered {
 		&:after {
 			box-shadow: none;
+			border-radius: @_sap_ui_rta_ChangeVisualization_BorderRadius;
 		}
 	}