@openui5/themelib_sap_horizon 1.97.1 → 1.99.1

package/.reuse/dep5

@@ -28,7 +28,7 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
 # OpenUI5 code
 
 Files: *
-Copyright: 2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0
 
 
@@ -60,7 +60,7 @@ Comment: these files belong to: jQuery UI
 
 Files: src/sap.ui.commons/src/sap/ui/commons/Carousel.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Spencer Tipping
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jquery.fix.clone: Carousel.js is authored by SAP, but contains an improved implementation of the clone function which is taken from jquery-fix-clone
@@ -75,35 +75,35 @@ Comment: these files belong to: jQuery 3
 
 Files: src/sap.ui.core/src/sap/base/util/isPlainObject.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: isPlainObject.js is overall written by SAP, but contains a modified implementation of jQuery.isPlainObject taken from jQuery
 
 Files: src/sap.ui.core/src/sap/base/util/_merge.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: _merge.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/jquery.sap.script.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: jquery.sap.script.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/sap/ui/Device.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011, John Resig
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 1: Device.js is overall written by SAP, but contains code taken from jQuery 1.7.1 (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/Selectors.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.8: Selectors.js is overall written by SAP, but contains code taken from jQuery UI (see the respective comments)
@@ -115,14 +115,14 @@ Comment: these files belong to: jQuery UI 1.10
 
 Files: src/sap.ui.core/src/jquery.sap.dom.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.10: jquery.sap.dom.js is overall written by SAP, but contains code taken from jQuery UI Core (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/zIndex.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.11: zIndex.js is overall written by SAP, but contains an implementation of the function 'fnzIndex' which is taken from jQuery UI Datepicker 1.11.1
@@ -149,7 +149,7 @@ Comment: these files belong to: jQuery Mobile
 
 Files: src/sap.ui.core/src/sap/ui/util/_FeatureDetection.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2012 Wei-Ko Kao
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
@@ -281,14 +281,14 @@ Comment: these files belong to: blanket.js
 
 Files: src/sap.ui.core/src/sap/base/util/JSTokenizer.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Douglas Crockford
 License: Apache-2.0 and LicenseRef-JSONinJSPublicDomain
 Comment: these files contain content from SAP and JSON in JS: JSTokenizer.js is overall written by SAP, but contains code has been taken from the component JSON in JavaScript (https://github.com/douglascrockford/JSON-js/blob/master/json2.js) from Douglas Crockford which is licensed under Public Domain
 
 Files: src/sap.ui.core/src/sap/ui/base/ExpressionParser.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2010 Douglas Crockford
 License: Apache-2.0
 Comment: these files contain content from SAP and Top Down Operator Precedence: ExpressionParser.js is overall written by SAP, but contains code taken from or inspired by TDOP by Douglas Crockford (see the respective comment)
@@ -322,7 +322,7 @@ Comment: these files contain content from p-cancelable and @babel/helpers: _Canc
 
 Files: src/sap.ui.core/src/sap/ui/core/date/Persian.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Behrang Norouzinia
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and Jalaali JS: Persian.js is overall written by SAP, but the calculation is taken from jalaali-js
@@ -334,7 +334,7 @@ Comment: these files belong to: vkBeautify
 
 Files: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Isaac Z. Schlueter and Contributors
 License: Apache-2.0 and ISC
 Comment: these files contain content from SAP and node-lru-cache: LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.
@@ -370,21 +370,11 @@ Comment: these files belong to: Buttons extension for DataTables
 
 # Library: sap.ui.integration:
 
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*.*.json src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/bundle*
+Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
 
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/webcomponentsjs/*
-Copyright: 2015 The Polymer Authors
-License: BSD-3-Clause
-Comment: these files belong to: Webcomponentsjs
-
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
-Copyright: 1991-2014 Unicode, Inc.
-License: Unicode-DFS-2015
-Comment: these files belong to: Unicode Common Locale Data Repository
-
 Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards.js src/sap.ui.integration/src/sap/ui/integration/schemas/adaptive-card.json
 Copyright: 2017 Microsoft
 License: MIT
@@ -395,22 +385,27 @@ Copyright: 2017 Microsoft
 License: MIT
 Comment: these files belong to: Adaptive Cards Templating
 
+Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
+Copyright: Microsoft
+License: MIT
+Comment: these files belong to: Adaptive Expressions
+
 Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
-Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
+Copyright: 2020 Jeremy Danyow
 License: MIT
-Comment: these files belong to: ajv
+Comment: these files belong to: @cfworker/json-schema
 
 
 # Library: sap.ui.mdc:
 
 Files: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperators/BoolExprTool.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2015 unnikked
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and BooleanExpressionEvaluator: BoolExprTool.js is authored by SAP, but partly inspired by BooleanExpressionEvaluator
@@ -454,7 +449,7 @@ Comment: these files belong to: LESS
 
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)

package/THIRDPARTY.txt

@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.7
+Component: URI.js, version: 1.19.10
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -351,24 +351,11 @@ Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/D
 
 Library: sap.ui.integration:
 
-Component: UI5 Web Components, version: 1.0.0-rc.8
+Component: UI5 Web Components, version: 1.0.1
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*.*.json
-	src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/bundle*
-
-Component: Webcomponentsjs, version: 1.0.2
-Copyright: 2015 The Polymer Authors
-License: BSD-3-Clause
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/webcomponentsjs/*
-
-Component: Unicode Common Locale Data Repository
-Copyright: 1991-2014 Unicode, Inc.
-License: Unicode-DFS-2015
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
+Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*
 
 Component: Adaptive Cards, version: 2.9.0
 Copyright: 2017 Microsoft
@@ -377,23 +364,29 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards.js
 	src/sap.ui.integration/src/sap/ui/integration/schemas/adaptive-card.json
 
-Component: Adaptive Cards Templating, version: 0.1.1-alpha.0
+Component: Adaptive Cards Templating, version: 2.2.0
 Copyright: 2017 Microsoft
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards-templating.js
 
-Component: Markdown-it, version: 10.0.0
+Component: Adaptive Expressions, version: 4.15.0
+Copyright: Microsoft
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
+
+Component: Markdown-it, version: 12.2.0
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
+Component: @cfworker/json-schema, version: 1.6.8
+Copyright: 2020 Jeremy Danyow
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
 
 
 Library: sap.ui.mdc:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/themelib_sap_horizon",
-  "version": "1.97.1",
+  "version": "1.99.1",
   "description": "OpenUI5 Theme Library sap_horizon",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,22 +14,22 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "devDependencies": {
-    "@openui5/sap.f": "1.97.1",
-    "@openui5/sap.m": "1.97.1",
-    "@openui5/sap.tnt": "1.97.1",
-    "@openui5/sap.ui.codeeditor": "1.97.1",
-    "@openui5/sap.ui.commons": "1.97.1",
-    "@openui5/sap.ui.core": "1.97.1",
-    "@openui5/sap.ui.dt": "1.97.1",
-    "@openui5/sap.ui.fl": "1.97.1",
-    "@openui5/sap.ui.mdc": "1.97.1",
-    "@openui5/sap.ui.integration": "1.97.1",
-    "@openui5/sap.ui.layout": "1.97.1",
-    "@openui5/sap.ui.rta": "1.97.1",
-    "@openui5/sap.ui.suite": "1.97.1",
-    "@openui5/sap.ui.table": "1.97.1",
-    "@openui5/sap.ui.unified": "1.97.1",
-    "@openui5/sap.ui.ux3": "1.97.1",
-    "@openui5/sap.uxap": "1.97.1"
+    "@openui5/sap.f": "1.99.1",
+    "@openui5/sap.m": "1.99.1",
+    "@openui5/sap.tnt": "1.99.1",
+    "@openui5/sap.ui.codeeditor": "1.99.1",
+    "@openui5/sap.ui.commons": "1.99.1",
+    "@openui5/sap.ui.core": "1.99.1",
+    "@openui5/sap.ui.dt": "1.99.1",
+    "@openui5/sap.ui.fl": "1.99.1",
+    "@openui5/sap.ui.mdc": "1.99.1",
+    "@openui5/sap.ui.integration": "1.99.1",
+    "@openui5/sap.ui.layout": "1.99.1",
+    "@openui5/sap.ui.rta": "1.99.1",
+    "@openui5/sap.ui.suite": "1.99.1",
+    "@openui5/sap.ui.table": "1.99.1",
+    "@openui5/sap.ui.unified": "1.99.1",
+    "@openui5/sap.ui.ux3": "1.99.1",
+    "@openui5/sap.uxap": "1.99.1"
   }
 }

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

@@ -1,16 +1,19 @@
 /* =================================== */
-/* CSS for control sap.m/Page.control  */
+/* CSS for control sap.m/ComboBoxBase  */
 /* Horizon theme                       */
 /* =================================== */
 
-.sapMInputBase:not(.sapMInputBaseDisabled):not(.sapMInputBaseIconPressed).sapMComboBoxBase.sapMComboBoxBaseArrowPressed .sapMInputBaseIconContainer .sapMInputBaseIcon:last-child {
-	background-color: @sapField_Focus_Background;
-	box-shadow: @sapContent_Interaction_Shadow;
-	&:hover {
+.sapMInputBase:not(.sapMInputBaseDisabled).sapMInputBaseIconPressed .sapMInputBaseIconContainer .sapMComboBoxBaseClearIcon,
+.sapMInputBase:not(.sapMInputBaseDisabled).sapMInputBaseIconPressed .sapMInputBaseIconContainer .sapMComboBoxBaseClearIcon:hover {
+	background-color: transparent;
+	box-shadow: none;
+
+	&:active {
 		background-color: @sapField_Focus_Background;
 		box-shadow: @sapContent_Interaction_Shadow;
 	}
-	&::before {
-		color: @sapButton_Active_TextColor;
-	}
+}
+
+.sapMInputBaseIconPressed .sapMComboBoxBaseClearIcon::before {
+	color: @sapUiContentIconColor;
 }

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

@@ -7,7 +7,6 @@
 	.sapMGTContent {
 		border-bottom-left-radius: @sapElement_BorderCornerRadius;
 		border-bottom-right-radius: @sapElement_BorderCornerRadius;
-		height: auto;
 	}
 }
 
@@ -266,6 +265,14 @@ large.sapUiSizeCompact .sapMGT.sapMGTLineMode, .sapUiMedia-GenericTileDeviceSet-
 	width: 22.5rem;
 }
 
+.sapMGT.TwoByOne.sapMGTActionMode {
+	width: 20rem;
+}
+
+.sapMGT.sapMTileSmallPhone.TwoByOne.sapMGTActionMode {
+	width: 19rem;
+}
+
 .sapMGT.TwoByHalf {
 	width: 22.5rem;
 }
@@ -296,6 +303,10 @@ html.sap-desktop .sapMGT:hover:not(.sapMGTPressActive) {
 	box-shadow: @sapContent_Shadow1 !important;
 }
 
+html.sap-desktop .sapMGTIconMode.sapMGT:hover:not(.sapMGTPressActive) {
+	border: none !important;
+}
+
 .sapMTileCntFtrTxt .sapMLnk .sapUiIcon {
 	font-size: 0.75rem !important;
 	margin-left: 1px;
@@ -352,10 +363,8 @@ html.sap-desktop .sapMGT.sapMGTBackgroundImage:focus .sapMGTFocusDiv:after, html
 }
 
 .TwoByOne.sapMGTActionMode {
-	width: 20rem;
-	height: 10.875rem;
-	border-radius: 1.25rem;
+	border-radius: 1rem;
 	.sapMGTFocusDiv {
-		border-radius: 1.25rem !important;
+		border-radius: 1rem !important;
 	}
 }

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

@@ -49,7 +49,6 @@
 
 // Filter icon
 @_sap_m_IconTabBar_FilterIconHeight: 2.75rem;
-@_sap_m_IconTabBar_FilterIconLineHeight: 2.5rem;
 @_sap_m_IconTabBar_FilterIconWidth: 2.75rem;
 
 // Filter text

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

@@ -136,8 +136,7 @@
 	}
 }
 
-.sapMInputBase:not(.sapMFocus) .sapMInputBaseContentWrapper:not(.sapMInputBaseDisabledWrapper):not(.sapMInputBaseReadonlyWrapper):not(.sapMInputBaseContentWrapperState):hover,
-.sapMInputBase:not(.sapMFocus).sapMInputBaseIconPressed .sapMInputBaseContentWrapper:not(.sapMInputBaseDisabledWrapper):not(.sapMInputBaseReadonlyWrapper):not(.sapMInputBaseContentWrapperState) {
+.sapMInputBase:not(.sapMFocus) .sapMInputBaseContentWrapper:not(.sapMInputBaseDisabledWrapper):not(.sapMInputBaseReadonlyWrapper):not(.sapMInputBaseContentWrapperState):hover {
 		box-shadow: @sapContent_Interaction_Shadow;
 		background: @sapField_Hover_Background;
 		background-image: linear-gradient(0deg, @sapField_BorderColor 0, @sapField_BorderColor 100%);

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

@@ -17,17 +17,6 @@
 	}
 }
 
-.sapMMenuBtn {
-	.sapMBtn:hover > .sapMBtnHoverable.sapMBtnEmphasized,
-	span.sapMBtnInner.sapMBtnEmphasized {
-		border-left-color: @sapUiButtonEmphasizedTextColor;
-	}
-}
-
-.sapMMenuBtn.sapMMenuBtnSplit .sapMSBActive:not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnEmphasized {
-	border-left-color: @sapUiButtonEmphasizedTextColor;
-}
-
 .sapMMenuBtn.sapMMenuBtnRegular .sapMBtnInner::after {
 	line-height: 2.125rem;
 }
@@ -50,4 +39,8 @@
 
 .sapMMenuBtn.sapMMenuBtnRegular .sapMBtnInner::after {
 	font-size: 1rem;
+}
+
+.sapMMenuBtnRegular.sapMMenuBtn .sapMBtnDisabled {
+	opacity: @sapUiContentDisabledOpacity;
 }

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

@@ -5,11 +5,11 @@
 
 @_sap_m_ObjectAttribute_ListTextShadowColor: none;
 
-.sapMObjectAttributeActive:focus .sapMObjectAttributeText {
+.sapMObjectAttributeActive .sapMObjectAttributeText:focus {
 	position: relative;
 }
 
-.sapMObjectAttributeActive:focus .sapMObjectAttributeText::after {
+.sapMObjectAttributeActive .sapMObjectAttributeText:focus::after {
 	pointer-events: none;
 	display: block;
 	content: "";
@@ -22,7 +22,7 @@
 	border-radius: 0.25rem;
 }
 
-.sapMObjectAttributeActive:focus .sapMObjectAttributeText {
+.sapMObjectAttributeActive .sapMObjectAttributeText:focus {
 	text-decoration: none;
 }
 
@@ -38,7 +38,7 @@
 
 .sapMOHR .sapMObjectAttributeActive .sapMObjectAttributeText:active,
 .sapMOHR .sapMObjectAttributeActive .sapMObjectAttributeText:hover,
-.sapMOHR .sapMObjectAttributeActive:focus .sapMObjectAttributeText {
+.sapMOHR .sapMObjectAttributeActive .sapMObjectAttributeText:focus {
 	text-decoration: underline;
 	color: @sapUiLinkHover;
 }

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

@@ -138,10 +138,13 @@ html[data-sap-ui-animation='on'] .sapMPageWithFloatingFooter {
 		top: 2.75rem;
 	}
 
-	> .sapMPageHeader + .sapMPageSubHeader + section,
-	> .sapMPageHeader + .sapMPageSubHeader.sapMPageSubHeaderInfoBar + section {
+	> .sapMPageHeader + .sapMPageSubHeader + section {
 		top: 5.5rem;
 	}
+
+	> .sapMPageHeader + .sapMPageSubHeader.sapMPageSubHeaderInfoBar + section {
+		top: 4.75rem;
+	}
 }
 
 .sapUiSizeCompact .sapF2CollapsedHeader.sapMPageWithHeader {

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

@@ -251,13 +251,6 @@ html.sap-desktop .sapMSegBBtnFocusable.sapMBtnActive:hover .sapMSegBBtnInner {
 	}
 }
 
-/* Android size compact fix */
-html[data-sap-ui-os^="Android4.1"][data-sap-ui-browser^="an"] {
-	.sapUiSizeCompact .sapMSegBBtn img {
-		margin-bottom: 0.128rem;
-	}
-}
-
 .sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner {
 	border-right: 1px solid @sapUiButtonBorderColor;
 	border-top-right-radius: @sapUiButtonBorderCornerRadius;

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

@@ -43,7 +43,7 @@ html.sap-desktop .sapMST:active .sapMSTFocusDiv:after {
 }
 
 .sapMST.TwoByOne {
-	width: 23rem;
+	width: 22.5rem;
 }
 
 .sapMST.TwoByHalf {
@@ -73,4 +73,13 @@ html.sap-desktop .sapMST:focus .sapMSTFocusDiv:after,
 html.sap-desktop .sapMST:active .sapMSTFocusDiv:after {
 	border: none;
 	border-radius: @sapElement_BorderCornerRadius;
+}
+
+html.sap-desktop .sapMST:hover {
+	box-shadow: @sapContent_Shadow1 !important;;
+
+	.sapMGT:hover {
+		box-shadow: none !important;
+	}
+
 }

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

@@ -21,10 +21,6 @@
 }
 
 .sapMMenuBtn {
-	.sapMBtn:hover > .sapMBtnHoverable.sapMBtnEmphasized,
-	span.sapMBtnInner.sapMBtnEmphasized {
-		border-left-color: @sapUiButtonBackground;
-	}
 	.sapMBtn.sapMSBActive:hover > .sapMBtnHoverable.sapMBtnEmphasized:not(.sapMBtnActive):not(.sapMToggleBtnPressed) .sapMBtnIcon {
 		color: @sapUiButtonActiveTextColor;
 	}
@@ -150,10 +146,10 @@
 	height: 0.9rem;
 }
 
-.sapMSB .sapMBtnInner.sapMBtnIconFirst:hover::before,
-.sapMSB .sapMBtn.sapMSBActive .sapMBtnInner.sapMBtnIconFirst::before,
-.sapMMenuBtn:hover .sapMBtnInner.sapMBtnIconFirst::before,
-.sapMMenuBtn:focus .sapMBtnInner.sapMBtnIconFirst::before {
+.sapMSB .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnIconFirst:hover::before,
+.sapMSB .sapMBtn.sapMSBActive.sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnIconFirst::before,
+.sapMMenuBtn:hover .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnIconFirst::before,
+.sapMMenuBtn:focus .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnIconFirst::before {
 	display: none;
 }
 

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

@@ -35,7 +35,7 @@
 	width: 100%;
 	border-top-left-radius: 0.125rem;
 	border-top-right-radius: 0.125rem;
-	bottom: (@_sap_m_WizardProgressNavigator_ListHeight - @_sap_m_WizardProgressNavigator_NavHeight) / 2 - @_sap_m_WizardProgressNavigator_BoxShadow + @_sap_m_WizardProgressNavigator_StepUnderlineHeight;
+	bottom: -0.75rem;
 }
 
 .sapMWizardProgressNavStep[data-sap-ui-wpn-step-current="true"] .sapMWizardProgressNavStepContainer::after {

package/src/sap/tnt/themes/sap_horizon/InfoLabel.less

@@ -38,7 +38,7 @@
 			background-color: @backgroundColor;
 
 			.sapTntInfoLabelInner {
-				color: @borderColor;
+				color: @sapUiBaseText;
 			}
 		}
 	}

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

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

package/src/sap/ui/core/themes/sap_horizon/shared.less

@@ -347,7 +347,7 @@ html.sap-tablet:not(.sap-desktop) input, html.sap-tablet:not(.sap-desktop) texta
 	font-style: normal;
 	font-weight: 700;
 	unicode-range: U+0102-0103, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EB7, U+1EB8-1EC7, U+1EC8-1ECB, U+1ECC-1EE3, U+1EE4-1EF1, U+1EF4-1EF7;
-	src: local('Arial'), local('Helvetica'), local('sans-serif');
+	src: local('Arial Bold'), local('Arial'), local('Helvetica'), local('sans-serif');
 }
 
 @font-face {

package/src/sap/ui/mdc/themes/sap_horizon/TokenDisplay.less

@@ -0,0 +1,34 @@
+/* ======================================== */
+/* CSS for control sap.ui.mdc/TokenDisplay  */
+/* Horizon theme              				*/
+/* ======================================== */
+
+.sapUiMdcTokenizerDisplay .sapMToken {
+	background: transparent;
+	border: 0px;
+
+	padding-left: 0.3125rem;
+}
+
+.sapUiMdcTokenizerDisplay .sapMTokenSelected:not(:focus),
+.sapUiMdcTokenizerDisplay .sapMToken.sapMTokenReadOnly.sapMTokenSelected {
+	background: transparent;
+	border: 0px;
+	box-shadow: none;
+}
+
+html.sap-desktop .sapUiMdcTokenizerDisplay .sapMToken:not(.sapMTokenSelected):not(:focus):hover {
+	background: transparent;
+	border: 0px;
+	box-shadow: none;
+}
+
+html.sap-desktop .sapUiMdcTokenizerDisplay .sapMToken.sapMTokenSelected:hover {
+	background: transparent;
+	border: 0px;
+}
+
+html.sap-desktop .sapUiMdcTokenizerDisplay .sapMToken:focus {
+	border: 0px;
+	box-shadow: none;
+}

package/src/sap/ui/mdc/themes/sap_horizon/TokenizerDisplay.less

@@ -0,0 +1,10 @@
+/* =========================================== */
+/* CSS for control sap.ui.mdc/TokenizerDisplay */
+/* Horizon theme                               */
+/* =========================================== */
+
+html.sap-desktop .sapUiMdcTokenizerDisplay.sapMTokenizer:focus {
+    outline: none;
+    box-shadow: none;
+}
+

package/src/sap/ui/mdc/themes/sap_horizon/ValueHelpDialog.less

@@ -6,4 +6,13 @@
 // give the title 2rem left margin
 .sapMdcValueHelpTitle.sapMDialog header .sapMBarPH {
 	padding-left: 2rem;
+}
+
+// setting some background to transparent so that the VH dialog content get a white background
+.sapMdcValueHelpPanel .sapMPanel.sapMdcTokenizerPanel {
+    background-color: transparent;
+}
+
+.sapMdcValueHelpPanel .sapMITBContent {
+	background-color: transparent;
 }

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

@@ -10,4 +10,6 @@
 
 @import "CollectiveSearchSelect.less";
 @import "Table.less";
-@import "ValueHelpDialog.less";
+@import "ValueHelpDialog.less";
+@import "TokenDisplay.less";
+@import "TokenizerDisplay.less";

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

@@ -3,67 +3,29 @@
 /* Horizon theme                           */
 /* ======================================= */
 
-@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiWhite; //#fff
-@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapPrimary1; //#354a5f
+@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiButtonEmphasizedBorderColor;
+@_sap_ui_rta_ContextMenu_ShadowDarkColor: #000;
+@_sap_ui_rta_ContextMenu_ShadowLightColor: #fff;
+@_sap_ui_rta_ContextMenu_BoxShadow: 0 0.625rem 1.25rem fade(@_sap_ui_rta_ContextMenu_ShadowDarkColor, 19),
+									0 0.375rem 0.375rem fade(@_sap_ui_rta_ContextMenu_ShadowDarkColor, 23),
+									0 0 0 0.0625rem fade(@_sap_ui_rta_ContextMenu_ShadowLightColor, 20),
+									0 0.0625rem 0 0 fade(@_sap_ui_rta_ContextMenu_ShadowLightColor, 20);
 
 .sapUiRtaMode {
-
 	.sapUiDtContextMenu {
-
-		&.sapMPopover, .sapMPopover {
-			border: 0.125rem solid @_sap_ui_rta_ContextMenu_Border_LightColor; //2px
-			border-image: repeating-linear-gradient( -45deg, @_sap_ui_rta_ContextMenu_Border_DarkColor, @_sap_ui_rta_ContextMenu_Border_DarkColor 4px, @_sap_ui_rta_ContextMenu_Border_LightColor 4px, @_sap_ui_rta_ContextMenu_Border_LightColor 6px) 4;
-			box-shadow: 0 0.625rem 1.25rem fade(black, 19), 0 0.375rem 0.375rem fade(black, 23), 0 0 0 0.0625rem fade(white, 20), 0 0.0625rem 0 0 fade(white, 20); //10px 20px 6px 6px 1px 1px
+		&.sapMMenu {
+			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_Border_DarkColor; //2px
+			box-shadow: @_sap_ui_rta_ContextMenu_BoxShadow;
+			border-radius: @sapUiElementBorderCornerRadius;
 		}
-
-		&.sapMPopoverArr, .sapMPopoverArr {
-			width: 2rem; //32px
-			height: 2rem; //32px
-			bottom: -2rem; //32px
-			left: 0.25rem !important; //4px
-			&:after {
-				box-shadow: 0.375rem -0.375rem 0.75rem 0 fade(black,30), 0 0 0 0.0625rem fade(white,20); //6px 6px 12px 1px
-				border: 0.125rem solid @_sap_ui_rta_ContextMenu_Border_LightColor; //2px
-				border-image: repeating-linear-gradient( -50deg, @_sap_ui_rta_ContextMenu_Border_DarkColor, @_sap_ui_rta_ContextMenu_Border_DarkColor 3px, @_sap_ui_rta_ContextMenu_Border_LightColor 3px, @_sap_ui_rta_ContextMenu_Border_LightColor 5px) 4;
-				width: 1rem; //16px
-				height: 0.8125rem; //13px
-				margin: -0.65rem 0 0 0.35rem; //10px 6px
-			}
-			&.sapMPopoverArrUp {
-				height: 0.8125rem; //13px
-				top: -0.8125rem; //13px
-				&:after {
-					box-shadow: -0.375rem 0.375rem 0.75rem 0 fade(black,30), 0 0 0 0.0625rem fade(white,20); //6px 6px 12px 1px
-					margin: 0.35rem 0 0 0.35rem; //6px 6px
+		&.sapUiSubmenu,
+		&:not(.sapUiDtContextMiniMenu) {
+			.sapUiMnuItm {
+				&.sapUiMnuItmHov {
+					color: @sapUiListTextColor;
+					background-color: @sapUiListHoverBackground;
 				}
 			}
 		}
-
-		.sapMBtnInner.sapMBtnText .sapMBtnIcon {
-			padding-left: 0;
-		}
-
-		.sapMBtnIcon {
-			margin-left: 0.4375rem; //7px
-			margin-right: 0.4375rem; //7px
-		}
-
-		&.sapMBtn:focus:not(:hover) > .sapMFocusable,
-		.sapMBtn:focus:not(:hover) > .sapMFocusable {
-			outline: none;
-			border: 0.0625rem dotted; //1px
-		}
-		&.sapMBtn:hover:not(:focus) > .sapMBtnHoverable,
-		.sapMBtn:hover:not(:focus) > .sapMBtnHoverable {
-			outline: none;
-			border: 0.0625rem solid; //1px
-		}
-
-		.sapMBtn:focus:hover > .sapMFocusable,
-		&.sapMBtn:focus:hover > .sapMFocusable {
-			border: 0.0625rem solid; //1px
-			outline: 0.0625rem dotted; //1px
-			outline-offset: -0.25rem; //4px
-		}
 	}
 }

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

@@ -3,21 +3,23 @@
 /* Horizon theme                       */
 /* =================================== */
 
-@_sap_ui_rta_Border_LightColor: @sapUiWhite; //#fff
-@_sap_ui_rta_Border_DarkColor: @sapPrimary1; //#354a5f
+@_sap_ui_rta_Border_LightColor: @sapUiShellBorderColor; //#fff
+@_sap_ui_rta_Border_DarkColor: @sapUiButtonEmphasizedBorderColor; //#0070f2
 @_sap_ui_rta_Border_BoxShadow: 0 0.625rem 1.25rem fade(black, 19), 0 0.375rem 0.375rem fade(black, 23), 0 0 0 0.0625rem fade(white, 20), 0 0.0625rem 0 0 fade(white, 20); //10px 20px 6px 6px 1px 1px
 
 .sapMDialog.sapUiRTABorder {
-	border: 0.1875rem solid @_sap_ui_rta_Border_LightColor; //3px
-	border-image: repeating-linear-gradient( -45deg, @_sap_ui_rta_Border_DarkColor, @_sap_ui_rta_Border_DarkColor 5px, @_sap_ui_rta_Border_LightColor 5px, @_sap_ui_rta_Border_LightColor 10px) 4;
+	border: 0.188rem solid @_sap_ui_rta_Border_LightColor; //3px
+	border-radius: @sapUiElementBorderCornerRadius;
+	outline: 0.188rem dashed @_sap_ui_rta_Border_DarkColor; //3px
+	outline-offset: -0.188rem;
 }
 
 .sapUiRtaPopover {
 
 	&.sapMPopover, .sapMPopover {
-		border: 0.125rem solid @_sap_ui_rta_Border_LightColor; //2px
-		border-image: repeating-linear-gradient(-45deg, @_sap_ui_rta_Border_DarkColor, @_sap_ui_rta_Border_DarkColor 4px, @_sap_ui_rta_Border_LightColor 4px, @_sap_ui_rta_Border_LightColor 6px) 4;
+		border: 0.188rem dashed @_sap_ui_rta_Border_DarkColor; //3px
 		box-shadow: @_sap_ui_rta_Border_BoxShadow;
+		border-radius: @sapUiElementBorderCornerRadius;
 	}
 
 	&.sapMPopoverArr, .sapMPopoverArr {
@@ -26,8 +28,7 @@
 		bottom: -2rem; //32px
 		&:after {
 			box-shadow: 0.375rem -0.375rem 0.75rem 0 fade(black, 30), 0 0 0 0.0625rem fade(white, 20); //6px 6px 12px 1px
-			border: 0.125rem solid @_sap_ui_rta_Border_LightColor; //2px
-			border-image: repeating-linear-gradient(-50deg, @_sap_ui_rta_Border_DarkColor, @_sap_ui_rta_Border_DarkColor 3px, @_sap_ui_rta_Border_LightColor 3px, @_sap_ui_rta_Border_LightColor 5px) 4;
+			border: 0.188rem dashed @_sap_ui_rta_Border_DarkColor; //3px
 			width: 1rem; //16px
 			height: 0.8125rem; //13px
 			margin: -0.65rem 0 0 0.35rem; //10px 6px

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

@@ -3,13 +3,8 @@
 /* Horizon theme                               */
 /* =========================================== */
 
-@sap_ui_rta_FieldRepository_ListSelect: darken(@sapList_Active_TextColor, 10%); //#e6e6e6
-@sap_ui_rta_FieldRepository_ListHoverText: @sapPrimary6; //#32363a
-@sap_ui_rta_FieldRepository_ListHoverBG: @sapUiListSelectionHoverBackground; //#dde8f1
-@sap_ui_rta_FieldRepository_ButtonEmphasizedBG: @sapUiButtonEmphasizedBackground; //#0a6ed1
-@sap_ui_rta_FieldRepository_ButtonEmphasizedText: @sapUiButtonEmphasizedTextColor; //#ffffff
-@sap_ui_rta_FieldRepository_ButtonEmphasizedHoverBG: @sapUiButtonHoverBackground; //#ebf5fe
-@sap_ui_rta_FieldRepository_FocusColor: @sapContent_FocusColor; //#000000
+@sap_ui_rta_FieldRepository_ListSelect: @sapUiListHoverSelectionBackground;
+@sap_ui_rta_FieldRepository_ButtonActiveColor: @sapUiButtonActiveBorderColor;
 
 .sapUiRtaMode {
 
@@ -17,42 +12,27 @@
 
 		.sapMBtn {
 			&:hover:not(focus) {
-				.sapMBtnInner {
-					border: 0.0625rem solid @sap_ui_rta_FieldRepository_ButtonEmphasizedBG; //1px
-				}
 				.sapMBtnHoverable {
 					outline: none;
 				}
 			}
 
-			> .sapMBtnInner {
-				border: 0.0625rem solid @sap_ui_rta_FieldRepository_ButtonEmphasizedText; //1px
+			> .sapMBtnInner:not(.sapMBtnEmphasized) {
+				background: transparent;
 			}
 
 			&:focus {
-				&:not(:hover) > .sapMFocusable {
-					border: 0.0625rem dotted @sap_ui_rta_FieldRepository_FocusColor; //1px
-					outline: none;
-				}
 				&:hover > .sapMFocusable {
-					border: 0.0625rem solid; //1px
-					outline: 0.0625rem dotted; //1px
-					outline-offset: -0.25rem; //4px
+					outline: 0.125rem solid @sap_ui_rta_FieldRepository_ButtonActiveColor;
+					outline-offset: -0.125rem;
 				}
 			}
 		}
 
 		.sapMLIBHoverable {
-			&:hover {
-				background: @sap_ui_rta_FieldRepository_ListSelect;
-			}
 			&.sapMLIBSelected:hover {
-				background: @sap_ui_rta_FieldRepository_ListHoverBG;
+				background: @sap_ui_rta_FieldRepository_ListSelect;
 			}
 		}
-
-		.sapMLIB.sapMLIBSelected {
-			border-color: transparent;
-		}
 	}
 }

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

@@ -3,9 +3,9 @@
 /* Horizon theme                       */
 /* =================================== */
 
-@_sap_ui_rta_Overlay_BaseBG: @sapBackgroundColor; //#fafafa
-@_sap_ui_rta_Overlay_BaseColor: @sapPrimary1; //#3f5161
-@_sap_ui_rta_Overlay_Base_PlaceholderBG: lighten(saturate(@sapPrimary4, 15%), 2%); //#f1f5f6
+@_sap_ui_rta_Overlay_BaseBG: @sapUiShellBackground; //#f5f6f7
+@_sap_ui_rta_Overlay_BaseColor: @sapUiNotificationBarBG; //rgba(85,107,130,0.98)
+@_sap_ui_rta_Overlay_Base_PlaceholderBG: lighten(saturate(@sapUiShellBackground, 15%), 2%);
 
 .sapUiRta {
 	.sapUiDtOverlayDropZone {

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

@@ -3,5 +3,26 @@
 /* Horizon theme                                  */
 /* ============================================== */
 
-@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapPrimary1; //#3f5161;
-@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiWhite; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiToolbarBackground;
+@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiShellTextColor;
+@_sap_ui_rta_Toolbar_Adaptation_BorderDarkColor: @sapUiButtonEmphasizedBorderColor;
+
+.sapUiRtaMode {
+
+  .sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
+    border: 0.188rem dashed @_sap_ui_rta_Toolbar_Adaptation_BorderDarkColor;
+    border-image: none;
+
+    .sapMFlexBox {
+      background-color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
+    }
+  }
+
+  .sapMList {
+    padding: 3px;
+  }
+
+  .sapUiRtaVersionHistory {
+    border: none;
+  }
+}

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

@@ -3,21 +3,78 @@
 /* Horizon theme                            */
 /* ======================================== */
 
-@_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG: lighten(saturate(@sapPrimary2, 40%), 42%); //#CAE4FB
-@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiWhite; //#fff
-@_sap_ui_rta_Toolbar_Base_BaseColor: @sapPrimary1; //#3f5161;
-@_sap_ui_rta_Toolbar_Base_BtnHover: fade(lighten(@sapPrimary1, 18%), 50%); //rgba(99, 127, 153, 0.5)
+@_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG: @sapUiToolbarBackground;
+@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiShellTextColor;
+@_sap_ui_rta_Toolbar_Base_BaseColor: @sapUiToolbarBackground;
+@_sap_ui_rta_Toolbar_Base_BtnHover: @sapUiShellTextColor;
+@_sap_ui_rta_Toolbar_Base_BtnSelected: @sapUiSelected;
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar {
+
+		.sapMSegB {
+			.sapMSegBBtn {
+				margin:0px 2px;
+				.sapMSegBBtnInnerWrapper {
+					background-color: @sapUiToolbarBackground;
+				}
+			}
+		}
+
 		.sapMBtn {
 			&.sapMBtnDisabled .sapMBtnInner {
 				opacity: 1.0;
 			}
 		}
+
+		.sapMSegBBtn.sapMSegBBtnFocusable {
+
+			&:hover .sapMSegBBtnInner,
+			&.sapMSegBBtnSel:hover .sapMSegBBtnInner {
+				color: @_sap_ui_rta_Toolbar_Base_BtnHover;
+			}
+
+			&:focus .sapMSegBBtnInner {
+				outline: 0.0625rem solid @_sap_ui_rta_Toolbar_Base_BtnSelected; //1px
+				outline-offset: -0.0625rem; //1px
+				border-radius: @sapUiElementBorderCornerRadius;
+			}
+
+			&.sapMSegBBtnSel {
+
+				&:hover .sapMSegBBtnInner::after {
+					border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_BtnHover; //2px
+					border-radius: 0;
+				}
+
+				& .sapMSegBBtnInner::after {
+					border-radius: 0;
+				}
+			}
+		}
+		.sapMBtn:focus .sapMFocusable {
+			border: 0.0625rem solid @_sap_ui_rta_Toolbar_Base_BtnSelected; //1px
+		}
+		.sapUiRtaToolbarSwitcherSection {
+			.sapMSegBBtn:hover {
+				.sapUiIcon,
+				&.sapMSegBBtnSel .sapMSegBBtnInner .sapUiIcon {
+					color: @_sap_ui_rta_Toolbar_Base_BtnHover;
+				}
+			}
+		}
+
+		.sapMTB:not(.sapMTB-Info-CTX) {
+			border-top-right-radius: 0;
+			border-top-left-radius: 0;
+		}
 	}
 }
 
 .sapUiSizeCozy .sapUiRtaToolbar .sapMSegB .sapMSegBBtn .sapMSegBBtnInner {
 	line-height: 2rem; //32px
+}
+
+html.sap-desktop .sapUiRtaMode .sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
+	border: none;
 }

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

@@ -3,4 +3,15 @@
 /* Horizon theme                                       */
 /* =================================================== */
 
-@_sap_ui_rta_Toolbar_Personalization_BaseColor: darken(saturate(@sapPrimary1, 5), 9); //#2a3a48
+@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiToolbarBackground;
+@_sap_ui_rta_Toolbar_Personalization_TextColor: @sapUiShellTextColor;
+
+.sapUiRtaToolbar.type_personalization {
+  .sapMBtn {
+    .sapMBtnTransparent.sapMBtnInner {
+      .sapMBtnContent {
+        text-shadow: none;
+      }
+    }
+  }
+}

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

@@ -3,4 +3,5 @@
 /* Horizon theme                                  */
 /* ============================================== */
 
-@_sap_ui_rta_Toolbar_Standalone_BaseColor: @sapPrimary1; //#3f5161;
+@_sap_ui_rta_Toolbar_Standalone_BaseColor: @sapUiToolbarBackground;
+@_sap_ui_rta_Toolbar_Standalone_TextColor: @sapUiShellTextColor;

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

@@ -70,12 +70,12 @@ html.sap-desktop .sapUiCalHead > .sapUiCalHeadB:focus,
 .sapUiCalHead .sapUiCalHeadPrev,
 .sapUiCalHead .sapUiCalHeadNext,
 .sapUiCalHead .sapUiCalHeadToday {
-	color: @sapUiButtonLiteTextColor;
-	border: 0.0625rem solid @sapUiButtonBorderColor;
 	border-radius: 0.5rem;
 
 }
 
+.sapUiCalHead .sapUiCalHeadPrev:hover,
+.sapUiCalHead .sapUiCalHeadNext:hover,
 html.sap-desktop .sapUiCalHead > .sapUiCalHeadB:hover {
 	box-shadow: 0 0 0.125rem 0 fade(@sapContent_ShadowColor, 72);
 }
@@ -404,10 +404,6 @@ html.sap-desktop .sapUiCalItemSelBetween:focus:not(:hover){
 	bottom: 0.5rem;
 }
 
-.sapUiCalHead > button,
-.sapUiCalCancel {
-	background-color: @sapUiButtonBackground;
-}
 /* Day names inside day */
 .sapUiCalItemNow > .sapUiCalItemText > .sapUiCalItemTextAmPm{
 	line-height: 2.5rem;
@@ -439,6 +435,10 @@ html.sap-desktop .sapUiCalItemSelBetween:focus:not(:hover){
 	line-height: 2rem;
 }
 
+.sapUiCalHead > button {
+	height: 2.25rem;
+}
+
 .sapUiSizeCompact {
 	.sapUiCalContentOver{
 		bottom: 0.25rem;
@@ -451,6 +451,11 @@ html.sap-desktop .sapUiCalItemSelBetween:focus:not(:hover){
 	.sapUiCalItemSel.sapUiCalItemSelBetween:not(.sapUiCalItemNow) > .sapUiCalItemText {
 		line-height: 1.75rem;
 	}
+
+	.sapUiCalHead > button {
+		margin: 0.1875rem 0;
+		height: 1.625rem;
+	}
 }
 
 @media only screen