nicoloye
--- a/core/themes/claro/claro.theme
+++ b/core/themes/claro/claro.theme
      }
    }
  }
+
+  if (isset($variables['theme_hook_original']) && substr($variables['theme_hook_original'], 0, 14) === 'links__toolbar' ) {
-  if (isset($variables['theme_hook_original']) && substr($variables['theme_hook_original'], 0, 14) === 'links__toolbar' ) {
+  if (isset($variables['theme_hook_original']) && substr($variables['theme_hook_original'], 0, 14) === 'links__toolbar') {
--- a/core/themes/claro/css/base/variables.pcss.css
+++ b/core/themes/claro/css/base/variables.pcss.css
   * Breadcrumb.
   */
  --breadcrumb-height: 1.25rem;
-  /**
+   /* Toolbar */
-   /* Toolbar */
+  /* Toolbar */
--- a/core/themes/claro/css/base/variables.pcss.css
+++ b/core/themes/claro/css/base/variables.pcss.css
+  --toolbar-tray-link-padding-start--level4: calc(var(--toolbar-tray-link-padding-start--level3) + var(--toolbar-tray-link-padding--vertical));
+  --toolbar-tray-link-line-height: 1.25rem; /* Line height must be higher than horizontal to account for text wrapping. */
+  --toolbar-icon-item-width--only-icon: calc(var(--toolbar-icon-width) * 3);
+  --toolbar-icon-item-padding-start: calc(var(--space-m) + var(--space-xs) + var(--toolbar-icon-position-start));
+  --toolbar-icon-item-padding-end: calc(var(--toolbar-icon-item-width--only-icon) + var(--space-m));
+  --toolbar-icon-width: var(--space-m);
+  --toolbar-icon-position-start: calc(var(--space-m) - 1px);
+  --toolbar-orientation-toggle-bg-color: var(--color-white);
+  --toolbar-orientation-toggle-size: 2.75rem;
+  --toolbar-handle-bg-color--hover: var(--color-bgblue-hover);
+  --toolbar-handle-bg-color--active: var(--color-bgblue-active);
+  --toolbar-tray-z-index: 501;
+  --toolbar-icon-z-index: calc(var(--toolbar-tray-z-index) + 1);
+  --toolbar-bar-z-index: calc(var(--toolbar-tray-z-index) + 1);
+  --toolbar-tray-z-index--active: calc(var(--toolbar-icon-z-index) + 1);
+    /**
-    /**
+   /**