@patternfly/patternfly 6.0.0-alpha.63 → 6.0.0-alpha.64

package/patternfly-no-globals.css

@@ -26,51 +26,77 @@
   --pf-v5-c-button--m-primary--BackgroundColor: var(--pf-v5-global--primary-color--dark-100);
 }
 
-.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > *, .pf-v5-c-page__header-tools-item, .pf-v5-c-page__header-tools-group, .pf-v5-c-menu__group, .pf-v5-c-menu__list-item, .pf-v5-c-menu__list, .pf-v5-c-divider, .pf-v5-c-toolbar__content-section, .pf-v5-c-toolbar__content, .pf-v5-c-toolbar__item, .pf-v5-c-toolbar__group, .pf-v5-c-data-list__item-action {
+.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > *, .pf-v5-c-page__header-tools-item, .pf-v5-c-page__header-tools-group, .pf-v5-c-menu__group, .pf-v5-c-menu__list-item, .pf-v5-c-menu__list, .pf-v5-c-divider, .pf-v5-c-toolbar__content-section,
+.pf-v5-c-toolbar__group,
+.pf-v5-c-toolbar__item,
+.pf-v5-c-toolbar__group.pf-m-chip-group-container,
+.pf-v5-c-toolbar__group.pf-m-chip-group, .pf-v5-c-data-list__item-action {
   --pf-v5-hidden-visible--hidden--Display: none;
   --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   display: var(--pf-v5-hidden-visible--Display);
 }
-.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden, .pf-m-hidden.pf-v5-c-page__header-tools-item, .pf-m-hidden.pf-v5-c-page__header-tools-group, .pf-m-hidden.pf-v5-c-menu__group, .pf-m-hidden.pf-v5-c-menu__list-item, .pf-m-hidden.pf-v5-c-menu__list, .pf-m-hidden.pf-v5-c-divider, .pf-m-hidden.pf-v5-c-toolbar__content-section, .pf-m-hidden.pf-v5-c-toolbar__content, .pf-m-hidden.pf-v5-c-toolbar__item, .pf-m-hidden.pf-v5-c-toolbar__group, .pf-m-hidden.pf-v5-c-data-list__item-action {
+.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden, .pf-m-hidden.pf-v5-c-page__header-tools-item, .pf-m-hidden.pf-v5-c-page__header-tools-group, .pf-m-hidden.pf-v5-c-menu__group, .pf-m-hidden.pf-v5-c-menu__list-item, .pf-m-hidden.pf-v5-c-menu__list, .pf-m-hidden.pf-v5-c-divider, .pf-m-hidden.pf-v5-c-toolbar__content-section,
+.pf-m-hidden.pf-v5-c-toolbar__group,
+.pf-m-hidden.pf-v5-c-toolbar__item, .pf-m-hidden.pf-v5-c-data-list__item-action {
   --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
 }
 @media screen and (min-width: 576px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-sm, .pf-m-hidden-on-sm.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-sm.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-sm.pf-v5-c-menu__group, .pf-m-hidden-on-sm.pf-v5-c-menu__list-item, .pf-m-hidden-on-sm.pf-v5-c-menu__list, .pf-m-hidden-on-sm.pf-v5-c-divider, .pf-m-hidden-on-sm.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-sm.pf-v5-c-toolbar__content, .pf-m-hidden-on-sm.pf-v5-c-toolbar__item, .pf-m-hidden-on-sm.pf-v5-c-toolbar__group, .pf-m-hidden-on-sm.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-sm, .pf-m-hidden-on-sm.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-sm.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-sm.pf-v5-c-menu__group, .pf-m-hidden-on-sm.pf-v5-c-menu__list-item, .pf-m-hidden-on-sm.pf-v5-c-menu__list, .pf-m-hidden-on-sm.pf-v5-c-divider, .pf-m-hidden-on-sm.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-sm.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-sm.pf-v5-c-toolbar__item, .pf-m-hidden-on-sm.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-sm, .pf-m-visible-on-sm.pf-v5-c-page__header-tools-item, .pf-m-visible-on-sm.pf-v5-c-page__header-tools-group, .pf-m-visible-on-sm.pf-v5-c-menu__group, .pf-m-visible-on-sm.pf-v5-c-menu__list-item, .pf-m-visible-on-sm.pf-v5-c-menu__list, .pf-m-visible-on-sm.pf-v5-c-divider, .pf-m-visible-on-sm.pf-v5-c-toolbar__content-section, .pf-m-visible-on-sm.pf-v5-c-toolbar__content, .pf-m-visible-on-sm.pf-v5-c-toolbar__item, .pf-m-visible-on-sm.pf-v5-c-toolbar__group, .pf-m-visible-on-sm.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-sm, .pf-m-visible-on-sm.pf-v5-c-page__header-tools-item, .pf-m-visible-on-sm.pf-v5-c-page__header-tools-group, .pf-m-visible-on-sm.pf-v5-c-menu__group, .pf-m-visible-on-sm.pf-v5-c-menu__list-item, .pf-m-visible-on-sm.pf-v5-c-menu__list, .pf-m-visible-on-sm.pf-v5-c-divider, .pf-m-visible-on-sm.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-sm.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-sm.pf-v5-c-toolbar__item, .pf-m-visible-on-sm.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 768px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-md, .pf-m-hidden-on-md.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-md.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-md.pf-v5-c-menu__group, .pf-m-hidden-on-md.pf-v5-c-menu__list-item, .pf-m-hidden-on-md.pf-v5-c-menu__list, .pf-m-hidden-on-md.pf-v5-c-divider, .pf-m-hidden-on-md.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-md.pf-v5-c-toolbar__content, .pf-m-hidden-on-md.pf-v5-c-toolbar__item, .pf-m-hidden-on-md.pf-v5-c-toolbar__group, .pf-m-hidden-on-md.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-md, .pf-m-hidden-on-md.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-md.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-md.pf-v5-c-menu__group, .pf-m-hidden-on-md.pf-v5-c-menu__list-item, .pf-m-hidden-on-md.pf-v5-c-menu__list, .pf-m-hidden-on-md.pf-v5-c-divider, .pf-m-hidden-on-md.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-md.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-md.pf-v5-c-toolbar__item, .pf-m-hidden-on-md.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-md, .pf-m-visible-on-md.pf-v5-c-page__header-tools-item, .pf-m-visible-on-md.pf-v5-c-page__header-tools-group, .pf-m-visible-on-md.pf-v5-c-menu__group, .pf-m-visible-on-md.pf-v5-c-menu__list-item, .pf-m-visible-on-md.pf-v5-c-menu__list, .pf-m-visible-on-md.pf-v5-c-divider, .pf-m-visible-on-md.pf-v5-c-toolbar__content-section, .pf-m-visible-on-md.pf-v5-c-toolbar__content, .pf-m-visible-on-md.pf-v5-c-toolbar__item, .pf-m-visible-on-md.pf-v5-c-toolbar__group, .pf-m-visible-on-md.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-md, .pf-m-visible-on-md.pf-v5-c-page__header-tools-item, .pf-m-visible-on-md.pf-v5-c-page__header-tools-group, .pf-m-visible-on-md.pf-v5-c-menu__group, .pf-m-visible-on-md.pf-v5-c-menu__list-item, .pf-m-visible-on-md.pf-v5-c-menu__list, .pf-m-visible-on-md.pf-v5-c-divider, .pf-m-visible-on-md.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-md.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-md.pf-v5-c-toolbar__item, .pf-m-visible-on-md.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 992px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-lg, .pf-m-hidden-on-lg.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-lg.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-lg.pf-v5-c-menu__group, .pf-m-hidden-on-lg.pf-v5-c-menu__list-item, .pf-m-hidden-on-lg.pf-v5-c-menu__list, .pf-m-hidden-on-lg.pf-v5-c-divider, .pf-m-hidden-on-lg.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-lg.pf-v5-c-toolbar__content, .pf-m-hidden-on-lg.pf-v5-c-toolbar__item, .pf-m-hidden-on-lg.pf-v5-c-toolbar__group, .pf-m-hidden-on-lg.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-lg, .pf-m-hidden-on-lg.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-lg.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-lg.pf-v5-c-menu__group, .pf-m-hidden-on-lg.pf-v5-c-menu__list-item, .pf-m-hidden-on-lg.pf-v5-c-menu__list, .pf-m-hidden-on-lg.pf-v5-c-divider, .pf-m-hidden-on-lg.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-lg.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-lg.pf-v5-c-toolbar__item, .pf-m-hidden-on-lg.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-lg, .pf-m-visible-on-lg.pf-v5-c-page__header-tools-item, .pf-m-visible-on-lg.pf-v5-c-page__header-tools-group, .pf-m-visible-on-lg.pf-v5-c-menu__group, .pf-m-visible-on-lg.pf-v5-c-menu__list-item, .pf-m-visible-on-lg.pf-v5-c-menu__list, .pf-m-visible-on-lg.pf-v5-c-divider, .pf-m-visible-on-lg.pf-v5-c-toolbar__content-section, .pf-m-visible-on-lg.pf-v5-c-toolbar__content, .pf-m-visible-on-lg.pf-v5-c-toolbar__item, .pf-m-visible-on-lg.pf-v5-c-toolbar__group, .pf-m-visible-on-lg.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-lg, .pf-m-visible-on-lg.pf-v5-c-page__header-tools-item, .pf-m-visible-on-lg.pf-v5-c-page__header-tools-group, .pf-m-visible-on-lg.pf-v5-c-menu__group, .pf-m-visible-on-lg.pf-v5-c-menu__list-item, .pf-m-visible-on-lg.pf-v5-c-menu__list, .pf-m-visible-on-lg.pf-v5-c-divider, .pf-m-visible-on-lg.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-lg.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-lg.pf-v5-c-toolbar__item, .pf-m-visible-on-lg.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 1200px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-xl, .pf-m-hidden-on-xl.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-xl.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-xl.pf-v5-c-menu__group, .pf-m-hidden-on-xl.pf-v5-c-menu__list-item, .pf-m-hidden-on-xl.pf-v5-c-menu__list, .pf-m-hidden-on-xl.pf-v5-c-divider, .pf-m-hidden-on-xl.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-xl.pf-v5-c-toolbar__content, .pf-m-hidden-on-xl.pf-v5-c-toolbar__item, .pf-m-hidden-on-xl.pf-v5-c-toolbar__group, .pf-m-hidden-on-xl.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-xl, .pf-m-hidden-on-xl.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-xl.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-xl.pf-v5-c-menu__group, .pf-m-hidden-on-xl.pf-v5-c-menu__list-item, .pf-m-hidden-on-xl.pf-v5-c-menu__list, .pf-m-hidden-on-xl.pf-v5-c-divider, .pf-m-hidden-on-xl.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-xl.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-xl.pf-v5-c-toolbar__item, .pf-m-hidden-on-xl.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-xl, .pf-m-visible-on-xl.pf-v5-c-page__header-tools-item, .pf-m-visible-on-xl.pf-v5-c-page__header-tools-group, .pf-m-visible-on-xl.pf-v5-c-menu__group, .pf-m-visible-on-xl.pf-v5-c-menu__list-item, .pf-m-visible-on-xl.pf-v5-c-menu__list, .pf-m-visible-on-xl.pf-v5-c-divider, .pf-m-visible-on-xl.pf-v5-c-toolbar__content-section, .pf-m-visible-on-xl.pf-v5-c-toolbar__content, .pf-m-visible-on-xl.pf-v5-c-toolbar__item, .pf-m-visible-on-xl.pf-v5-c-toolbar__group, .pf-m-visible-on-xl.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-xl, .pf-m-visible-on-xl.pf-v5-c-page__header-tools-item, .pf-m-visible-on-xl.pf-v5-c-page__header-tools-group, .pf-m-visible-on-xl.pf-v5-c-menu__group, .pf-m-visible-on-xl.pf-v5-c-menu__list-item, .pf-m-visible-on-xl.pf-v5-c-menu__list, .pf-m-visible-on-xl.pf-v5-c-divider, .pf-m-visible-on-xl.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-xl.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-xl.pf-v5-c-toolbar__item, .pf-m-visible-on-xl.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 1450px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-2xl, .pf-m-hidden-on-2xl.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-2xl.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-2xl.pf-v5-c-menu__group, .pf-m-hidden-on-2xl.pf-v5-c-menu__list-item, .pf-m-hidden-on-2xl.pf-v5-c-menu__list, .pf-m-hidden-on-2xl.pf-v5-c-divider, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__content, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__item, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__group, .pf-m-hidden-on-2xl.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-2xl, .pf-m-hidden-on-2xl.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-2xl.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-2xl.pf-v5-c-menu__group, .pf-m-hidden-on-2xl.pf-v5-c-menu__list-item, .pf-m-hidden-on-2xl.pf-v5-c-menu__list, .pf-m-hidden-on-2xl.pf-v5-c-divider, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-2xl.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-2xl.pf-v5-c-toolbar__item, .pf-m-hidden-on-2xl.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-2xl, .pf-m-visible-on-2xl.pf-v5-c-page__header-tools-item, .pf-m-visible-on-2xl.pf-v5-c-page__header-tools-group, .pf-m-visible-on-2xl.pf-v5-c-menu__group, .pf-m-visible-on-2xl.pf-v5-c-menu__list-item, .pf-m-visible-on-2xl.pf-v5-c-menu__list, .pf-m-visible-on-2xl.pf-v5-c-divider, .pf-m-visible-on-2xl.pf-v5-c-toolbar__content-section, .pf-m-visible-on-2xl.pf-v5-c-toolbar__content, .pf-m-visible-on-2xl.pf-v5-c-toolbar__item, .pf-m-visible-on-2xl.pf-v5-c-toolbar__group, .pf-m-visible-on-2xl.pf-v5-c-data-list__item-action {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-2xl, .pf-m-visible-on-2xl.pf-v5-c-page__header-tools-item, .pf-m-visible-on-2xl.pf-v5-c-page__header-tools-group, .pf-m-visible-on-2xl.pf-v5-c-menu__group, .pf-m-visible-on-2xl.pf-v5-c-menu__list-item, .pf-m-visible-on-2xl.pf-v5-c-menu__list, .pf-m-visible-on-2xl.pf-v5-c-divider, .pf-m-visible-on-2xl.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-2xl.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-2xl.pf-v5-c-toolbar__item, .pf-m-visible-on-2xl.pf-v5-c-data-list__item-action {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
@@ -6552,32 +6578,33 @@ html .ws-preview {
   --pf-v5-c-accordion__expandable-content-body--PaddingTop: var(--pf-v5-c-accordion__expandable-content-body--expandable-content-body--PaddingTop);
 }
 
-.pf-v5-c-action-list {
-  --pf-v5-c-action-list--m-icon--spacer: 0;
-  --pf-v5-c-action-list--child--spacer-base: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-action-list--group--spacer-base: var(--pf-v5-global--spacer--2xl);
+:where(:root) {
+  --pf-v5-c-action-list--RowGap: var(--pf-t--global--spacer--sm);
+  --pf-v5-c-action-list--ColumnGap: var(--pf-t--global--spacer--2xl);
+  --pf-v5-c-action-list__group--ColumnGap: var(--pf-t--global--spacer--md);
+  --pf-v5-c-action-list--m-icons--ColumnGap: var(--pf-t--global--spacer--sm);
 }
 
 .pf-v5-c-action-list,
 .pf-v5-c-action-list__group {
-  --pf-v5-c-action-list--child--spacer: var(--pf-v5-c-action-list--child--spacer-base);
-  --pf-v5-c-action-list--group--spacer: var(--pf-v5-c-action-list--group--spacer-base);
   display: flex;
-  align-items: center;
+  align-items: start;
 }
-.pf-v5-c-action-list > * + *,
-.pf-v5-c-action-list__group > * + * {
-  margin-inline-start: var(--pf-v5-c-action-list--child--spacer);
+
+.pf-v5-c-action-list {
+  row-gap: var(--pf-v5-c-action-list--RowGap);
+  column-gap: var(--pf-v5-c-action-list--ColumnGap);
 }
-.pf-v5-c-action-list > * + .pf-v5-c-action-list__group,
-.pf-v5-c-action-list .pf-v5-c-action-list__group + *,
-.pf-v5-c-action-list__group > * + .pf-v5-c-action-list__group,
-.pf-v5-c-action-list__group .pf-v5-c-action-list__group + * {
-  margin-inline-start: var(--pf-v5-c-action-list--group--spacer);
+.pf-v5-c-action-list.pf-m-icons {
+  column-gap: var(--pf-v5-c-action-list--m-icons--ColumnGap);
+}
+
+.pf-v5-c-action-list__group {
+  row-gap: var(--pf-v5-c-action-list__group--RowGap, var(--pf-v5-c-action-list--RowGap));
+  column-gap: var(--pf-v5-c-action-list__group--ColumnGap);
 }
-.pf-v5-c-action-list.pf-m-icons,
 .pf-v5-c-action-list__group.pf-m-icons {
-  --pf-v5-c-action-list--child--spacer: var(--pf-v5-c-action-list--m-icon--spacer);
+  column-gap: var(--pf-v5-c-action-list--m-icons--ColumnGap);
 }
 
 :root {
@@ -7802,10 +7829,6 @@ button.pf-v5-c-breadcrumb__link {
   --pf-v5-c-button--BorderWidth: var(--pf-t--global--border--width--button--default);
   --pf-v5-c-button--BorderRadius: var(--pf-t--global--border--radius--pill);
   --pf-v5-c-button--TextDecoration: none;
-  --pf-v5-c-button--BorderStartStartRadius: var(--pf-v5-c-button--BorderRadius);
-  --pf-v5-c-button--BorderStartEndRadius: var(--pf-v5-c-button--BorderRadius);
-  --pf-v5-c-button--BorderEndStartRadius: var(--pf-v5-c-button--BorderRadius);
-  --pf-v5-c-button--BorderEndEndRadius: var(--pf-v5-c-button--BorderRadius);
   --pf-v5-c-button--MixBlendMode: normal;
   --pf-v5-c-button--hover--BackgroundColor: transparent;
   --pf-v5-c-button--hover--BorderColor: transparent;
@@ -8035,11 +8058,10 @@ button.pf-v5-c-breadcrumb__link {
   user-select: none;
   background-color: var(--pf-v5-c-button--BackgroundColor);
   border: 0;
-  border-start-start-radius: var(--pf-v5-c-button--BorderStartStartRadius);
-  border-start-end-radius: var(--pf-v5-c-button--BorderStartEndRadius);
-  border-end-start-radius: var(--pf-v5-c-button--BorderEndStartRadius);
-  border-end-end-radius: var(--pf-v5-c-button--BorderEndEndRadius);
-  mix-blend-mode: var(--pf-v5-c-button--MixBlendMode);
+  border-start-start-radius: var(--pf-v5-c-button--BorderStartStartRadius, var(--pf-v5-c-button--BorderRadius));
+  border-start-end-radius: var(--pf-v5-c-button--BorderStartEndRadius, var(--pf-v5-c-button--BorderRadius));
+  border-end-start-radius: var(--pf-v5-c-button--BorderEndStartRadius, var(--pf-v5-c-button--BorderRadius));
+  border-end-end-radius: var(--pf-v5-c-button--BorderEndEndRadius, var(--pf-v5-c-button--BorderRadius));
 }
 .pf-v5-c-button::after {
   position: absolute;
@@ -11590,110 +11612,50 @@ label.pf-v5-c-check, .pf-v5-c-check__label,
   --pf-v5-c-dual-list-selector__list-item-row--m-selected--BackgroundColor: var(--pf-v5-global--BackgroundColor--400);
 }
 
-:root {
-  --pf-v5-c-toolbar--AlignItems--base: flex-start;
-  --pf-v5-c-toolbar--RowGap--base: var(--pf-v5-global--spacer--lg);
-  --pf-v5-c-toolbar--RowGap: var(--pf-v5-c-toolbar--RowGap--base);
-  --pf-v5-c-toolbar--PaddingTop: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar--PaddingBottom: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar--item--RowGap--base: var(--pf-v5-global--spacer--xs);
-  --pf-v5-c-toolbar__item--Display: flex;
-  --pf-v5-c-toolbar__item--MinWidth--base: auto;
-  --pf-v5-c-toolbar__item--AlignItems: var(--pf-v5-c-toolbar--AlignItems--base);
-  --pf-v5-c-toolbar__item--AlignSelf: var(--pf-v5-c-toolbar--AlignItems--base);
-  --pf-v5-c-toolbar__group--Display: flex;
-  --pf-v5-c-toolbar__group--RowGap: var(--pf-v5-c-toolbar--item--RowGap--base);
-  --pf-v5-c-toolbar__group--AlignItems: var(--pf-v5-c-toolbar--AlignItems--base);
-  --pf-v5-c-toolbar__group--AlignSelf: auto;
-  --pf-v5-c-toolbar--m-sticky--ZIndex: var(--pf-v5-global--ZIndex--xs);
-  --pf-v5-c-toolbar--m-sticky--BoxShadow: var(--pf-v5-global--BoxShadow--sm-bottom);
-  --pf-v5-c-toolbar--m-align-items-center--AlignItems: center;
-  --pf-v5-c-toolbar--m-align-items-baseline--AlignItems: baseline;
-  --pf-v5-c-toolbar--m-align-self-center--AlignSelf: center;
-  --pf-v5-c-toolbar--m-align-self-baseline--AlignSelf: baseline;
-  --pf-v5-c-toolbar__content--Display: flex;
-  --pf-v5-c-toolbar__content--AlignItems: var(--pf-v5-c-toolbar--AlignItems--base);
-  --pf-v5-c-toolbar__content--RowGap: var(--pf-v5-c-toolbar--RowGap--base);
-  --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar__content-section--Display: flex;
-  --pf-v5-c-toolbar__content-section--AlignItems: var(--pf-v5-c-toolbar--AlignItems--base);
-  --pf-v5-c-toolbar__content-section--RowGap: var(--pf-v5-c-toolbar--item--RowGap--base);
-  --pf-v5-c-toolbar--m-page-insets--inset: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar--m-page-insets--xl--inset: var(--pf-v5-global--spacer--lg);
-  --pf-v5-c-toolbar__expandable-content--Display: grid;
-  --pf-v5-c-toolbar__expandable-content--PaddingTop: 0;
-  --pf-v5-c-toolbar__expandable-content--PaddingRight: var(--pf-v5-c-toolbar__content--PaddingRight);
-  --pf-v5-c-toolbar__expandable-content--PaddingBottom: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar__expandable-content--PaddingLeft: var(--pf-v5-c-toolbar__content--PaddingLeft);
-  --pf-v5-c-toolbar__expandable-content--lg--PaddingRight: 0;
-  --pf-v5-c-toolbar__expandable-content--lg--PaddingBottom: 0;
-  --pf-v5-c-toolbar__expandable-content--lg--PaddingLeft: 0;
-  --pf-v5-c-toolbar__expandable-content--ZIndex: var(--pf-v5-global--ZIndex--sm);
-  --pf-v5-c-toolbar__expandable-content--BoxShadow: var(--pf-v5-global--BoxShadow--md-bottom);
-  --pf-v5-c-toolbar__expandable-content--BackgroundColor: var(--pf-v5-c-toolbar--BackgroundColor);
-  --pf-v5-c-toolbar__expandable-content--m-expanded--GridRowGap: var(--pf-v5-global--gutter--md);
-  --pf-v5-c-toolbar__group--m-chip-container--MarginTop: calc(var(--pf-v5-global--spacer--md) * -1);
-  --pf-v5-c-toolbar__group--m-chip-container__item--MarginTop: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar--spacer--base: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar__item--spacer: var(--pf-v5-c-toolbar--spacer--base);
-  --pf-v5-c-toolbar__item--Width: auto;
-  --pf-v5-c-toolbar__group--spacer: var(--pf-v5-c-toolbar--spacer--base);
-  --pf-v5-c-toolbar__group--m-toggle-group--spacer: var(--pf-v5-global--spacer--sm);
-  --pf-v5-c-toolbar__group--m-toggle-group--m-show--spacer: var(--pf-v5-c-toolbar__group--spacer);
-  --pf-v5-c-toolbar__group--m-icon-button-group--spacer: var(--pf-v5-c-toolbar__group--spacer);
-  --pf-v5-c-toolbar__group--m-icon-button-group--space-items: 0;
-  --pf-v5-c-toolbar__group--m-button-group--spacer: var(--pf-v5-c-toolbar__group--spacer);
-  --pf-v5-c-toolbar__group--m-button-group--space-items: var(--pf-v5-global--spacer--sm);
-  --pf-v5-c-toolbar__group--m-filter-group--spacer: var(--pf-v5-c-toolbar__group--spacer);
-  --pf-v5-c-toolbar__group--m-filter-group--space-items: 0;
-  --pf-v5-c-toolbar__item--m-overflow-menu--spacer: var(--pf-v5-c-toolbar__item--spacer);
-  --pf-v5-c-toolbar__item--m-bulk-select--spacer: var(--pf-v5-global--spacer--lg);
+:root,
+[data-theme=pf-v5-c-toolbar] {
+  --pf-v5-c-toolbar--RowGap: var(--pf-t--global--spacer--sm);
+  --pf-v5-c-toolbar--ColumnGap: var(--pf-t--global--spacer--md);
+  --pf-v5-c-toolbar--PaddingBlock: var(--pf-t--global--spacer--md);
+  --pf-v5-c-toolbar--PaddingInline: var(--pf-t--global--spacer--md);
+  --pf-v5-c-toolbar--LineHeight: var(--pf-t--global--font--line-height--body);
+  --pf-v5-c-toolbar--FontSize: var(--pf-t--global--font--size--body--default);
+  --pf-v5-c-toolbar__item--ColumnGap: var(--pf-t--global--spacer--sm);
+  --pf-v5-c-toolbar__content--RowGap: var(--pf-t--global--spacer--sm);
+  --pf-v5-c-toolbar__content--PaddingBlock: var(--pf-t--global--spacer--md);
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-c-toolbar--PaddingInline);
+  --pf-v5-c-toolbar__expandable-content--ZIndex: var(--pf-t--global--Zindex--xs);
+  --pf-v5-c-toolbar__expandable-content--BoxShadow: var(--pf-t--global--box-shadow--md--bottom);
+  --pf-v5-c-toolbar__expandable-content--BackgroundColor: var(--pf-t--global--background--color--floating--default);
+  --pf-v5-c-toolbar--m-sticky--ZIndex: var(--pf-t--global--Zindex--xs);
+  --pf-v5-c-toolbar--m-sticky--BoxShadow: var(--pf-t--global--box-shadow--md--bottom);
+  --pf-v5-c-toolbar--m-page-insets--inset: var(--pf-v5-c-page--inset);
   --pf-v5-c-toolbar__expand-all-icon--Rotate: 0;
   --pf-v5-c-toolbar__expand-all-icon--Transition: var(--pf-v5-global--Transition);
   --pf-v5-c-toolbar__item--m-expand-all--m-expanded__expand-all-icon--Rotate: 90deg;
-  --pf-v5-c-toolbar__item--m-search-filter--spacer: var(--pf-v5-global--spacer--sm);
-  --pf-v5-c-toolbar__item--m-chip-group--spacer: var(--pf-v5-global--spacer--sm);
-  --pf-v5-c-toolbar__item--m-label--spacer: var(--pf-v5-c-toolbar__item--spacer);
-  --pf-v5-c-toolbar__item--m-label--TranslateY: var(--pf-v5-global--spacer--form-element);
-  --pf-v5-c-toolbar__item--m-label--FontWeight: var(--pf-v5-global--FontWeight--bold);
-  --pf-v5-c-toolbar__item--m-form-element--spacer: var(--pf-v5-c-toolbar__item--spacer);
-  --pf-v5-c-toolbar__item--m-form-element--TranslateY: var(--pf-v5-global--spacer--form-element);
-  --pf-v5-c-toolbar__item--m-form-element--FontWeight: var(--pf-v5-global--FontWeight--bold);
-  --pf-v5-c-toolbar__item--m-form-control--TranslateY: var(--pf-v5-global--spacer--form-element);
-  --pf-v5-c-toolbar__expandable-content__item--m-label--MarginBottom: calc(-1 * var(--pf-v5-c-toolbar__expandable-content--m-expanded--GridRowGap) + var(--pf-v5-global--spacer--sm));
-  --pf-v5-c-toolbar__expandable-content__item--m-label--FontSize: var(--pf-v5-global--FontSize--sm);
-  --pf-v5-c-toolbar__toggle--m-expanded__c-button--m-plain--Color: var(--pf-v5-global--Color--100);
-  --pf-v5-c-toolbar--c-divider--m-vertical--spacer: var(--pf-v5-c-toolbar--spacer--base);
-  --pf-v5-c-toolbar--m-full-height--PaddingTop: 0;
-  --pf-v5-c-toolbar--m-full-height--PaddingBottom: 0;
-  --pf-v5-c-toolbar--m-full-height__item--Display: flex;
-  --pf-v5-c-toolbar--m-full-height__item--AlignItems: center;
+  --pf-v5-c-toolbar__group--m-filter-group--ColumnGap: var(--pf-t--global--spacer--xs);
+  --pf-v5-c-toolbar__item--m-label--FontWeight: var(--pf-t--global--font--weight--body--bold);
 }
 
-.pf-v5-c-toolbar {
+.pf-v5-c-toolbar__content-section,
+.pf-v5-c-toolbar__group,
+.pf-v5-c-toolbar__item,
+.pf-v5-c-toolbar__group.pf-m-chip-group-container,
+.pf-v5-c-toolbar__group.pf-m-chip-group {
+  --pf-v5-hidden-visible--visible--Display: flex;
+  flex-wrap: wrap;
+}
+
+.pf-v5-c-toolbar,
+.pf-v5-c-toolbar__content {
   position: relative;
   display: grid;
-  row-gap: var(--pf-v5-c-toolbar--RowGap);
-  padding-block-start: var(--pf-v5-c-toolbar--PaddingTop);
-  padding-block-end: var(--pf-v5-c-toolbar--PaddingBottom);
-  background-color: var(--pf-v5-c-toolbar--BackgroundColor);
 }
-@media screen and (min-width: 992px) {
-  .pf-v5-c-toolbar {
-    --pf-v5-c-toolbar__expandable-content--PaddingRight: var(--pf-v5-c-toolbar__expandable-content--lg--PaddingRight);
-    --pf-v5-c-toolbar__expandable-content--PaddingBottom: var(--pf-v5-c-toolbar__expandable-content--lg--PaddingBottom);
-    --pf-v5-c-toolbar__expandable-content--PaddingLeft: var(--pf-v5-c-toolbar__expandable-content--lg--PaddingLeft);
-  }
-}
-@media screen and (min-width: 1200px) {
-  .pf-v5-c-toolbar {
-    --pf-v5-c-toolbar--m-page-insets--inset: var(--pf-v5-c-toolbar--m-page-insets--xl--inset);
-  }
-}
-.pf-v5-c-toolbar.pf-m-page-insets {
-  --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--m-page-insets--inset);
-  --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--m-page-insets--inset);
+
+.pf-v5-c-toolbar {
+  width: var(--pf-v5-c-toolbar--Width, auto);
+  font-size: var(--pf-v5-c-toolbar--FontSize);
+  line-height: var(--pf-v5-c-toolbar--LineHeight);
 }
 .pf-v5-c-toolbar.pf-m-sticky {
   position: sticky;
@@ -11701,1086 +11663,2604 @@ label.pf-v5-c-check, .pf-v5-c-check__label,
   z-index: var(--pf-v5-c-toolbar--m-sticky--ZIndex);
   box-shadow: var(--pf-v5-c-toolbar--m-sticky--BoxShadow);
 }
-.pf-v5-c-toolbar.pf-m-full-height {
-  --pf-v5-c-toolbar--PaddingTop: var(--pf-v5-c-toolbar--m-full-height--PaddingTop);
-  --pf-v5-c-toolbar--PaddingBottom: var(--pf-v5-c-toolbar--m-full-height--PaddingTop);
-  --pf-v5-c-toolbar__item--Display: var(--pf-v5-c-toolbar--m-full-height__item--Display);
-  height: 100%;
-}
-.pf-v5-c-toolbar.pf-m-full-height,
-.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__content,
-.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__content-section,
-.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__expandable-content,
-.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__group {
-  min-width: 0;
-}
-.pf-v5-c-toolbar.pf-m-full-height,
-.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__content,
-.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__content-section,
-.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__group,
-.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__item {
-  align-self: stretch;
-}
-.pf-v5-c-toolbar.pf-m-full-height :where(.pf-v5-c-toolbar__item) {
-  --pf-v5-c-toolbar__item--AlignItems: var(--pf-v5-c-toolbar--m-full-height__item--AlignItems);
-}
-.pf-v5-c-toolbar.pf-m-static,
 .pf-v5-c-toolbar.pf-m-static .pf-v5-c-toolbar__content {
   position: static;
 }
 .pf-v5-c-toolbar.pf-m-static .pf-v5-c-toolbar__expandable-content {
   position: absolute;
 }
-
-.pf-v5-c-toolbar__content-section > .pf-v5-c-divider,
-.pf-v5-c-toolbar__group > .pf-v5-c-divider {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar--c-divider--m-vertical--spacer);
-}
-.pf-v5-c-toolbar__content-section > .pf-v5-c-divider.pf-m-vertical,
-.pf-v5-c-toolbar__group > .pf-v5-c-divider.pf-m-vertical {
-  margin-inline-end: var(--pf-v5-c-toolbar--spacer);
-}
-.pf-v5-c-toolbar__content-section > .pf-v5-c-divider.pf-m-vertical:last-child,
-.pf-v5-c-toolbar__group > .pf-v5-c-divider.pf-m-vertical:last-child {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-.pf-v5-c-toolbar__content-section.pf-m-align-items-start,
-.pf-v5-c-toolbar__group.pf-m-align-items-start {
-  align-items: flex-start;
-}
-.pf-v5-c-toolbar__content-section.pf-m-align-items-center,
-.pf-v5-c-toolbar__group.pf-m-align-items-center {
-  --pf-v5-c-toolbar__group--AlignItems: var(--pf-v5-c-toolbar--m-align-items-center--AlignItems);
-}
-.pf-v5-c-toolbar__content-section.pf-m-align-items-baseline,
-.pf-v5-c-toolbar__group.pf-m-align-items-baseline {
-  --pf-v5-c-toolbar__group--AlignItems: var(--pf-v5-c-toolbar--m-align-items-baseline--AlignItems);
-}
-.pf-v5-c-toolbar__content-section.pf-m-align-self-start,
-.pf-v5-c-toolbar__group.pf-m-align-self-start {
-  align-self: flex-start;
+.pf-v5-c-toolbar.pf-m-full-height {
+  --pf-v5-c-toolbar--PaddingBlockStart: 0;
+  --pf-v5-c-toolbar--PaddinkBlockEnd: 0;
 }
-.pf-v5-c-toolbar__content-section.pf-m-align-self-center,
-.pf-v5-c-toolbar__group.pf-m-align-self-center {
-  --pf-v5-c-toolbar__group--AlignSelf: var(--pf-v5-c-toolbar--m-align-self-center--AlignItems);
+.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__group,
+.pf-v5-c-toolbar.pf-m-full-height .pf-v5-c-toolbar__item {
+  align-items: stretch;
+  align-self: stretch;
 }
-.pf-v5-c-toolbar__content-section.pf-m-align-self-baseline,
-.pf-v5-c-toolbar__group.pf-m-align-self-baseline {
-  --pf-v5-c-toolbar__group--AlignSelf: var(--pf-v5-c-toolbar--m-align-self-baseline--AlignItems);
+.pf-v5-c-toolbar.pf-m-page-insets {
+  --pf-v5-c-toolbar--PaddingInlineStart: var(--pf-v5-c-toolbar--m-page-insets--inset);
+  --pf-v5-c-toolbar--PaddingInlineEnd: var(--pf-v5-c-toolbar--m-page-insets--inset);
 }
 
-.pf-v5-c-toolbar__group {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--spacer);
-  --pf-v5-hidden-visible--visible--Display: var(--pf-v5-c-toolbar__group--Display);
-  row-gap: var(--pf-v5-c-toolbar__group--RowGap);
-  align-items: var(--pf-v5-c-toolbar__group--AlignItems);
-  align-self: var(--pf-v5-c-toolbar__group--AlignSelf);
-  margin-inline-end: var(--pf-v5-c-toolbar--spacer);
-}
-.pf-v5-c-toolbar__group.pf-m-button-group {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-button-group--spacer);
-}
-.pf-v5-c-toolbar__group.pf-m-button-group > * {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-button-group--space-items);
-}
-.pf-v5-c-toolbar__group.pf-m-icon-button-group {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-icon-button-group--spacer);
-}
-.pf-v5-c-toolbar__group.pf-m-icon-button-group > * {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-icon-button-group--space-items);
-}
-.pf-v5-c-toolbar__group.pf-m-filter-group {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-filter-group--spacer);
-}
-.pf-v5-c-toolbar__group.pf-m-filter-group > * {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-filter-group--space-items);
-}
-.pf-v5-c-toolbar__group.pf-m-filter-group > * + * {
-  margin-inline-start: -1px;
+.pf-v5-c-toolbar__content,
+.pf-v5-c-toolbar__content-section,
+.pf-v5-c-toolbar__expandable-content {
+  row-gap: var(--pf-v5-c-toolbar__content--RowGap);
+  column-gap: var(--pf-v5-c-toolbar--ColumnGap);
 }
-.pf-v5-c-toolbar__group.pf-m-toggle-group {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-toggle-group--spacer);
+
+.pf-v5-c-toolbar__content,
+.pf-v5-c-toolbar__expandable-content {
+  padding-block-start: var(--pf-v5-c-toolbar__content--PaddingBlockStart, var(--pf-v5-c-toolbar__content--PaddingBlock));
+  padding-block-end: var(--pf-v5-c-toolbar__content--PaddingBlockEnd, var(--pf-v5-c-toolbar__content--PaddingBlock));
+  padding-inline-start: var(--pf-v5-c-toolbar__content--PaddingInlineStart, var(--pf-v5-c-toolbar__content--PaddingInline));
+  padding-inline-end: var(--pf-v5-c-toolbar__content--PaddingInlineEnd, var(--pf-v5-c-toolbar__content--PaddingInline));
 }
-.pf-v5-c-toolbar__group.pf-m-toggle-group .pf-v5-c-toolbar__group,
-.pf-v5-c-toolbar__group.pf-m-toggle-group .pf-v5-c-toolbar__item {
-  display: none;
+
+.pf-v5-c-toolbar__content-section {
+  align-items: start;
 }
-.pf-v5-c-toolbar__group.pf-m-toggle-group .pf-v5-c-toolbar__toggle {
-  display: inline-block;
+.pf-v5-c-toolbar__content-section:has(.pf-v5-c-toolbar__item.pf-m-pagination:not(:only-child):last-child) .pf-v5-c-toolbar__item.pf-m-pagination {
+  margin-inline-start: revert;
 }
-.pf-v5-c-toolbar__group:last-child {
-  --pf-v5-c-toolbar--spacer: 0;
+.pf-v5-c-toolbar__content-section:has(.pf-v5-c-toolbar__item.pf-m-pagination:not(:only-child):last-child) > .pf-v5-c-toolbar__group:nth-last-child(2),
+.pf-v5-c-toolbar__content-section:has(.pf-v5-c-toolbar__item.pf-m-pagination:not(:only-child):last-child) > .pf-v5-c-toolbar__item:nth-last-child(2) {
+  flex: 1;
 }
 
 .pf-v5-c-toolbar__item {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__item--spacer);
-  --pf-v5-c-toolbar__item--Width--base: var(--pf-v5-c-toolbar__item--Width);
-  --pf-v5-c-toolbar__item--MinWidth--base: var(--pf-v5-c-toolbar__item--MinWidth);
-  --pf-v5-hidden-visible--visible--Display: var(--pf-v5-c-toolbar__item--Display);
-  align-items: var(--pf-v5-c-toolbar__item--AlignItems);
-  align-self: var(--pf-v5-c-toolbar__item--AlignSelf);
-  width: var(--pf-v5-c-toolbar__item--Width--base);
-  min-width: var(--pf-v5-c-toolbar__item--MinWidth--base);
-  margin-inline-end: var(--pf-v5-c-toolbar--spacer);
-}
-@media (min-width: 576px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--Width--base: var(--pf-v5-c-toolbar__item--Width-on-sm, var(--pf-v5-c-toolbar__item--Width));
-  }
-}
-@media (min-width: 768px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--Width--base: var(--pf-v5-c-toolbar__item--Width-on-md, var(--pf-v5-c-toolbar__item--Width-on-sm, var(--pf-v5-c-toolbar__item--Width)));
-  }
-}
-@media (min-width: 992px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--Width--base: var(--pf-v5-c-toolbar__item--Width-on-lg, var(--pf-v5-c-toolbar__item--Width-on-md, var(--pf-v5-c-toolbar__item--Width-on-sm, var(--pf-v5-c-toolbar__item--Width))));
-  }
-}
-@media (min-width: 1200px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--Width--base: var(--pf-v5-c-toolbar__item--Width-on-xl, var(--pf-v5-c-toolbar__item--Width-on-lg, var(--pf-v5-c-toolbar__item--Width-on-md, var(--pf-v5-c-toolbar__item--Width-on-sm, var(--pf-v5-c-toolbar__item--Width)))));
-  }
-}
-@media (min-width: 1450px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--Width--base: var(--pf-v5-c-toolbar__item--Width-on-2xl, var(--pf-v5-c-toolbar__item--Width-on-xl, var(--pf-v5-c-toolbar__item--Width-on-lg, var(--pf-v5-c-toolbar__item--Width-on-md, var(--pf-v5-c-toolbar__item--Width-on-sm, var(--pf-v5-c-toolbar__item--Width))))));
-  }
-}
-@media (min-width: 576px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--MinWidth--base: var(--pf-v5-c-toolbar__item--MinWidth-on-sm, var(--pf-v5-c-toolbar__item--MinWidth));
-  }
-}
-@media (min-width: 768px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--MinWidth--base: var(--pf-v5-c-toolbar__item--MinWidth-on-md, var(--pf-v5-c-toolbar__item--MinWidth-on-sm, var(--pf-v5-c-toolbar__item--MinWidth)));
-  }
-}
-@media (min-width: 992px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--MinWidth--base: var(--pf-v5-c-toolbar__item--MinWidth-on-lg, var(--pf-v5-c-toolbar__item--MinWidth-on-md, var(--pf-v5-c-toolbar__item--MinWidth-on-sm, var(--pf-v5-c-toolbar__item--MinWidth))));
-  }
-}
-@media (min-width: 1200px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--MinWidth--base: var(--pf-v5-c-toolbar__item--MinWidth-on-xl, var(--pf-v5-c-toolbar__item--MinWidth-on-lg, var(--pf-v5-c-toolbar__item--MinWidth-on-md, var(--pf-v5-c-toolbar__item--MinWidth-on-sm, var(--pf-v5-c-toolbar__item--MinWidth)))));
-  }
-}
-@media (min-width: 1450px) {
-  .pf-v5-c-toolbar__item {
-    --pf-v5-c-toolbar__item--MinWidth--base: var(--pf-v5-c-toolbar__item--MinWidth-on-2xl, var(--pf-v5-c-toolbar__item--MinWidth-on-xl, var(--pf-v5-c-toolbar__item--MinWidth-on-lg, var(--pf-v5-c-toolbar__item--MinWidth-on-md, var(--pf-v5-c-toolbar__item--MinWidth-on-sm, var(--pf-v5-c-toolbar__item--MinWidth))))));
-  }
-}
-.pf-v5-c-toolbar__item.pf-m-align-items-start {
-  align-items: flex-start;
-}
-.pf-v5-c-toolbar__item.pf-m-align-items-center {
-  align-items: center;
-}
-.pf-v5-c-toolbar__item.pf-m-align-items-baseline {
-  align-items: baseline;
-}
-.pf-v5-c-toolbar__item.pf-m-align-self-start {
-  align-self: flex-start;
-}
-.pf-v5-c-toolbar__item.pf-m-align-self-center {
-  align-self: center;
-}
-.pf-v5-c-toolbar__item.pf-m-align-self-baseline {
-  align-self: baseline;
-}
-.pf-v5-c-toolbar__item.pf-m-overflow-menu {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__item--m-overflow-menu--spacer);
-}
-.pf-v5-c-toolbar__item.pf-m-bulk-select {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__item--m-bulk-select--spacer);
+  row-gap: var(--pf-v5-c-toolbar__item--RowGap, var(--pf-v5-c-toolbar--RowGap));
+  column-gap: var(--pf-v5-c-toolbar__item--ColumnGap);
 }
 .pf-v5-c-toolbar__item.pf-m-expand-all.pf-m-expanded {
   --pf-v5-c-toolbar__expand-all-icon--Rotate: var(--pf-v5-c-toolbar__item--m-expand-all--m-expanded__expand-all-icon--Rotate);
 }
-.pf-v5-c-toolbar__item.pf-m-search-filter {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__item--m-search-filter--spacer);
-}
-.pf-v5-c-toolbar__item.pf-m-chip-group {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__item--m-chip-group--spacer);
-}
 .pf-v5-c-toolbar__item.pf-m-label {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__item--m-label--spacer);
   font-weight: var(--pf-v5-c-toolbar__item--m-label--FontWeight);
-  transform: translateY(var(--pf-v5-c-toolbar__item--m-label--TranslateY));
-}
-.pf-v5-c-toolbar__item.pf-m-form-element {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__item--m-form-element--spacer);
-  font-weight: var(--pf-v5-c-toolbar__item--m-form-element--FontWeight);
-  transform: translateY(var(--pf-v5-c-toolbar__item--m-form-element--TranslateY));
 }
 .pf-v5-c-toolbar__item.pf-m-pagination {
   margin-inline-start: auto;
 }
-.pf-v5-c-toolbar__item.pf-m-pagination .pf-v5-c-pagination {
+.pf-v5-c-toolbar__item.pf-m-pagination.pf-v5-c-pagination {
   flex-wrap: nowrap;
 }
-.pf-v5-c-toolbar__item:last-child {
-  --pf-v5-c-toolbar--spacer: 0;
-}
 
-.pf-v5-c-toolbar__group.pf-m-overflow-container,
-.pf-v5-c-toolbar__item.pf-m-overflow-container {
-  flex: 1;
-  overflow: hidden;
-}
-
-.pf-v5-c-toolbar__expand-all-icon {
-  display: inline-block;
-  transition: var(--pf-v5-c-toolbar__expand-all-icon--Transition);
-  transform: rotate(var(--pf-v5-c-toolbar__expand-all-icon--Rotate));
-}
-
-.pf-v5-c-toolbar__content,
-.pf-v5-c-toolbar__content-section {
-  flex-wrap: wrap;
-}
-
-.pf-v5-c-toolbar__content {
-  --pf-v5-hidden-visible--visible--Display: var(--pf-v5-c-toolbar__content--Display);
-  position: relative;
-  row-gap: var(--pf-v5-c-toolbar__content--RowGap);
-  align-items: var(--pf-v5-c-toolbar__content--AlignItems);
-  padding-inline-start: var(--pf-v5-c-toolbar__content--PaddingLeft);
-  padding-inline-end: var(--pf-v5-c-toolbar__content--PaddingRight);
+.pf-v5-c-toolbar__group {
+  row-gap: var(--pf-v5-c-toolbar__group--RowGap, var(--pf-v5-c-toolbar--RowGap));
+  column-gap: var(--pf-v5-c-toolbar__group--ColumnGap, var(--pf-v5-c-toolbar--ColumnGap));
+  align-items: baseline;
 }
-
-.pf-v5-c-toolbar__content-section {
-  --pf-v5-hidden-visible--visible--Display: var(--pf-v5-c-toolbar__content-section--Display);
-  row-gap: var(--pf-v5-c-toolbar__content-section--RowGap);
-  align-items: var(--pf-v5-c-toolbar__content-section--AlignItems);
-  width: 100%;
+.pf-v5-c-toolbar__group.pf-m-icon-button-group {
+  column-gap: var(--pf-v5-c-toolbar__group--m-icon-button-group--ColumnGap, 0);
 }
-.pf-v5-c-toolbar__content-section.pf-m-align-items-start {
-  align-items: flex-start;
+.pf-v5-c-toolbar__group.pf-m-filter-group {
+  column-gap: var(--pf-v5-c-toolbar__group--m-filter-group--ColumnGap);
 }
-.pf-v5-c-toolbar__content-section.pf-m-align-items-center {
-  --pf-v5-c-toolbar__content-section--AlignItems: var(--pf-v5-c-toolbar--m-align-items-center--AlignItems);
+.pf-v5-c-toolbar__group.pf-m-filter-group, .pf-v5-c-toolbar__group.pf-m-chip-group-container {
+  flex-wrap: nowrap;
 }
-.pf-v5-c-toolbar__content-section.pf-m-align-items-baseline {
-  align-items: baseline;
+.pf-v5-c-toolbar__group.pf-m-chip-group {
+  flex: 1;
 }
 
 .pf-v5-c-toolbar__expandable-content {
   position: absolute;
-  inset-block-start: calc(100% + var(--pf-v5-c-toolbar__content--RowGap));
-  inset-inline-start: 0;
-  inset-inline-end: 0;
+  inset-block-start: 100%;
   z-index: var(--pf-v5-c-toolbar__expandable-content--ZIndex);
   display: none;
   width: 100%;
-  padding-block-start: var(--pf-v5-c-toolbar__expandable-content--PaddingTop);
-  padding-block-end: var(--pf-v5-c-toolbar__expandable-content--PaddingBottom);
-  padding-inline-start: var(--pf-v5-c-toolbar__expandable-content--PaddingLeft);
-  padding-inline-end: var(--pf-v5-c-toolbar__expandable-content--PaddingRight);
   background-color: var(--pf-v5-c-toolbar__expandable-content--BackgroundColor);
   box-shadow: var(--pf-v5-c-toolbar__expandable-content--BoxShadow);
 }
 @media screen and (min-width: 992px) {
   .pf-v5-c-toolbar__expandable-content {
     position: static;
+    padding: 0;
     box-shadow: none;
   }
 }
-.pf-v5-c-toolbar__expandable-content.pf-m-expanded {
-  display: grid;
-  grid-row-gap: var(--pf-v5-c-toolbar__expandable-content--m-expanded--GridRowGap);
-}
-.pf-v5-c-toolbar__expandable-content .pf-v5-c-toolbar__group,
-.pf-v5-c-toolbar__expandable-content .pf-v5-c-toolbar__item {
-  --pf-v5-c-toolbar--spacer: 0;
-}
+.pf-v5-c-toolbar__expandable-content.pf-m-expanded,
 .pf-v5-c-toolbar__expandable-content .pf-v5-c-toolbar__group {
   display: grid;
-  grid-row-gap: var(--pf-v5-c-toolbar__expandable-content--m-expanded--GridRowGap);
 }
-.pf-v5-c-toolbar__expandable-content .pf-v5-c-toolbar__item.pf-m-label {
-  margin-block-end: var(--pf-v5-c-toolbar__expandable-content__item--m-label--MarginBottom);
-  font-size: var(--pf-v5-c-toolbar__expandable-content__item--m-label--FontSize);
+.pf-v5-c-toolbar__expandable-content .pf-v5-c-toolbar__item > * {
+  flex-basis: 100%;
 }
 
-.pf-v5-c-toolbar__content.pf-m-chip-container,
-.pf-v5-c-toolbar__group.pf-m-chip-container {
-  display: flex;
-  flex-wrap: wrap;
-  grid-row-gap: 0;
-  align-items: baseline;
-  margin-block-start: var(--pf-v5-c-toolbar__group--m-chip-container--MarginTop);
-}
-.pf-v5-c-toolbar__content.pf-m-chip-container .pf-v5-c-toolbar__item,
-.pf-v5-c-toolbar__group.pf-m-chip-container .pf-v5-c-toolbar__item {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__item--spacer);
-  --pf-v5-c-toolbar__item--AlignSelf: auto;
-  margin-block-start: var(--pf-v5-c-toolbar__group--m-chip-container__item--MarginTop);
-}
-.pf-v5-c-toolbar__content.pf-m-chip-container .pf-v5-c-toolbar__group,
-.pf-v5-c-toolbar__group.pf-m-chip-container .pf-v5-c-toolbar__group {
-  --pf-v5-c-toolbar__group--AlignItems: center;
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--spacer);
-  display: flex;
-  flex-wrap: wrap;
-  grid-row-gap: 0;
+.pf-v5-c-toolbar__expand-all-icon {
+  display: inline-block;
+  transition: var(--pf-v5-c-toolbar__expand-all-icon--Transition);
+  transform: rotate(var(--pf-v5-c-toolbar__expand-all-icon--Rotate));
 }
-.pf-v5-c-toolbar__content.pf-m-chip-container .pf-v5-c-toolbar__group:last-child,
-.pf-v5-c-toolbar__content.pf-m-chip-container .pf-v5-c-toolbar__item:last-child,
-.pf-v5-c-toolbar__group.pf-m-chip-container .pf-v5-c-toolbar__group:last-child,
-.pf-v5-c-toolbar__group.pf-m-chip-container .pf-v5-c-toolbar__item:last-child {
-  --pf-v5-c-toolbar--spacer: 0;
+:where(.pf-v5-m-dir-rtl, [dir=rtl]) .pf-v5-c-toolbar__expand-all-icon {
+  scale: -1 1;
 }
 
-.pf-v5-c-toolbar .pf-v5-c-chip-group:last-child {
-  --pf-v5-c-chip-group--MarginRight: 0;
+.pf-v5-c-toolbar__group,
+.pf-v5-c-toolbar__item {
+  align-self: baseline;
 }
-
-.pf-v5-c-toolbar .pf-v5-c-chip-group li:last-child {
-  --pf-v5-c-chip-group__li--m-toolbar--MarginRight: 0;
+.pf-v5-c-toolbar__group.pf-m-overflow-container,
+.pf-v5-c-toolbar__item.pf-m-overflow-container {
+  flex: 1;
+  overflow: auto;
 }
 
-.pf-v5-c-toolbar__toggle.pf-m-expanded .pf-v5-c-button.pf-m-plain {
-  color: var(--pf-v5-c-toolbar__toggle--m-expanded__c-button--m-plain--Color);
+.pf-v5-c-toolbar__group.pf-m-align-start,
+.pf-v5-c-toolbar__item.pf-m-align-start {
+  margin-inline-start: 0;
 }
-
-.pf-m-toggle-group.pf-m-show {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-toggle-group--m-show--spacer);
+.pf-v5-c-toolbar__group.pf-m-align-center,
+.pf-v5-c-toolbar__item.pf-m-align-center {
+  margin-inline-start: auto;
+  margin-inline-end: auto;
 }
-.pf-m-toggle-group.pf-m-show .pf-v5-c-toolbar__group,
-.pf-m-toggle-group.pf-m-show .pf-v5-c-toolbar__item {
-  display: flex;
-  flex: 0 1 auto;
+.pf-v5-c-toolbar__group.pf-m-align-end,
+.pf-v5-c-toolbar__item.pf-m-align-end {
+  margin-inline-start: auto;
 }
-.pf-m-toggle-group.pf-m-show .pf-v5-c-toolbar__toggle {
-  display: none;
+.pf-v5-c-toolbar__group.pf-m-flex-grow,
+.pf-v5-c-toolbar__item.pf-m-flex-grow {
+  flex-grow: 1;
+}
+.pf-v5-c-toolbar__group.pf-m-align-self-stretch,
+.pf-v5-c-toolbar__item.pf-m-align-self-stretch {
+  align-self: stretch;
+}
+.pf-v5-c-toolbar__group.pf-m-align-self-baseline,
+.pf-v5-c-toolbar__item.pf-m-align-self-baseline {
+  align-self: baseline;
+}
+.pf-v5-c-toolbar__group.pf-m-align-self-start,
+.pf-v5-c-toolbar__item.pf-m-align-self-start {
+  align-self: start;
+}
+.pf-v5-c-toolbar__group.pf-m-align-self-center,
+.pf-v5-c-toolbar__item.pf-m-align-self-center {
+  align-self: center;
+}
+.pf-v5-c-toolbar__group.pf-m-align-self-end,
+.pf-v5-c-toolbar__item.pf-m-align-self-end {
+  align-self: end;
 }
 
-@media (min-width: 576px) {
-  .pf-m-toggle-group.pf-m-show-on-sm {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-toggle-group--m-show--spacer);
-  }
-  .pf-m-toggle-group.pf-m-show-on-sm .pf-v5-c-toolbar__group,
-  .pf-m-toggle-group.pf-m-show-on-sm .pf-v5-c-toolbar__item {
-    display: flex;
-    flex: 0 1 auto;
-  }
-  .pf-m-toggle-group.pf-m-show-on-sm .pf-v5-c-toolbar__toggle {
-    display: none;
-  }
+.pf-v5-c-toolbar.pf-m-inset-none,
+.pf-v5-c-toolbar__content.pf-m-inset-none,
+.pf-v5-c-toolbar__content-section.pf-m-inset-none {
+  --pf-v5-c-toolbar__content--PaddingInline: 0;
+}
+.pf-v5-c-toolbar.pf-m-inset-xs,
+.pf-v5-c-toolbar__content.pf-m-inset-xs,
+.pf-v5-c-toolbar__content-section.pf-m-inset-xs {
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xs);
+}
+.pf-v5-c-toolbar.pf-m-inset-sm,
+.pf-v5-c-toolbar__content.pf-m-inset-sm,
+.pf-v5-c-toolbar__content-section.pf-m-inset-sm {
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--sm);
+}
+.pf-v5-c-toolbar.pf-m-inset-md,
+.pf-v5-c-toolbar__content.pf-m-inset-md,
+.pf-v5-c-toolbar__content-section.pf-m-inset-md {
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--md);
+}
+.pf-v5-c-toolbar.pf-m-inset-lg,
+.pf-v5-c-toolbar__content.pf-m-inset-lg,
+.pf-v5-c-toolbar__content-section.pf-m-inset-lg {
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--lg);
+}
+.pf-v5-c-toolbar.pf-m-inset-xl,
+.pf-v5-c-toolbar__content.pf-m-inset-xl,
+.pf-v5-c-toolbar__content-section.pf-m-inset-xl {
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xl);
+}
+.pf-v5-c-toolbar.pf-m-inset-2xl,
+.pf-v5-c-toolbar__content.pf-m-inset-2xl,
+.pf-v5-c-toolbar__content-section.pf-m-inset-2xl {
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--2xl);
+}
+.pf-v5-c-toolbar.pf-m-inset-3xl,
+.pf-v5-c-toolbar__content.pf-m-inset-3xl,
+.pf-v5-c-toolbar__content-section.pf-m-inset-3xl {
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--3xl);
+}
+.pf-v5-c-toolbar.pf-m-inset-4xl,
+.pf-v5-c-toolbar__content.pf-m-inset-4xl,
+.pf-v5-c-toolbar__content-section.pf-m-inset-4xl {
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--4xl);
+}
+
+.pf-v5-c-toolbar__group.pf-m-wrap,
+.pf-v5-c-toolbar__item.pf-m-wrap,
+.pf-v5-c-toolbar__content.pf-m-wrap,
+.pf-v5-c-toolbar__content-section.pf-m-wrap {
+  flex-wrap: wrap;
 }
-@media (min-width: 768px) {
-  .pf-m-toggle-group.pf-m-show-on-md {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-toggle-group--m-show--spacer);
-  }
-  .pf-m-toggle-group.pf-m-show-on-md .pf-v5-c-toolbar__group,
-  .pf-m-toggle-group.pf-m-show-on-md .pf-v5-c-toolbar__item {
-    display: flex;
-    flex: 0 1 auto;
-  }
-  .pf-m-toggle-group.pf-m-show-on-md .pf-v5-c-toolbar__toggle {
-    display: none;
-  }
+.pf-v5-c-toolbar__group.pf-m-nowrap,
+.pf-v5-c-toolbar__item.pf-m-nowrap,
+.pf-v5-c-toolbar__content.pf-m-nowrap,
+.pf-v5-c-toolbar__content-section.pf-m-nowrap {
+  flex-wrap: nowrap;
 }
-@media (min-width: 992px) {
-  .pf-m-toggle-group.pf-m-show-on-lg {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-toggle-group--m-show--spacer);
-  }
-  .pf-m-toggle-group.pf-m-show-on-lg .pf-v5-c-toolbar__group,
-  .pf-m-toggle-group.pf-m-show-on-lg .pf-v5-c-toolbar__item {
-    display: flex;
-    flex: 0 1 auto;
-  }
-  .pf-m-toggle-group.pf-m-show-on-lg .pf-v5-c-toolbar__toggle {
-    display: none;
-  }
+.pf-v5-c-toolbar__group.pf-m-align-items-stretch,
+.pf-v5-c-toolbar__item.pf-m-align-items-stretch,
+.pf-v5-c-toolbar__content.pf-m-align-items-stretch,
+.pf-v5-c-toolbar__content-section.pf-m-align-items-stretch {
+  align-items: stretch;
 }
-@media (min-width: 1200px) {
-  .pf-m-toggle-group.pf-m-show-on-xl {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-toggle-group--m-show--spacer);
-  }
-  .pf-m-toggle-group.pf-m-show-on-xl .pf-v5-c-toolbar__group,
-  .pf-m-toggle-group.pf-m-show-on-xl .pf-v5-c-toolbar__item {
-    display: flex;
-    flex: 0 1 auto;
-  }
-  .pf-m-toggle-group.pf-m-show-on-xl .pf-v5-c-toolbar__toggle {
-    display: none;
-  }
+.pf-v5-c-toolbar__group.pf-m-align-items-baseline,
+.pf-v5-c-toolbar__item.pf-m-align-items-baseline,
+.pf-v5-c-toolbar__content.pf-m-align-items-baseline,
+.pf-v5-c-toolbar__content-section.pf-m-align-items-baseline {
+  align-items: baseline;
 }
-@media (min-width: 1450px) {
-  .pf-m-toggle-group.pf-m-show-on-2xl {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-c-toolbar__group--m-toggle-group--m-show--spacer);
-  }
-  .pf-m-toggle-group.pf-m-show-on-2xl .pf-v5-c-toolbar__group,
-  .pf-m-toggle-group.pf-m-show-on-2xl .pf-v5-c-toolbar__item {
-    display: flex;
-    flex: 0 1 auto;
-  }
-  .pf-m-toggle-group.pf-m-show-on-2xl .pf-v5-c-toolbar__toggle {
-    display: none;
-  }
+.pf-v5-c-toolbar__group.pf-m-align-items-start,
+.pf-v5-c-toolbar__item.pf-m-align-items-start,
+.pf-v5-c-toolbar__content.pf-m-align-items-start,
+.pf-v5-c-toolbar__content-section.pf-m-align-items-start {
+  align-items: start;
 }
-.pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right,
-.pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right {
-  margin-inline-start: auto;
+.pf-v5-c-toolbar__group.pf-m-align-items-center,
+.pf-v5-c-toolbar__item.pf-m-align-items-center,
+.pf-v5-c-toolbar__content.pf-m-align-items-center,
+.pf-v5-c-toolbar__content-section.pf-m-align-items-center {
+  align-items: center;
 }
-.pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right ~ .pf-m-pagination,
-.pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right ~ .pf-m-pagination {
-  margin-inline-start: 0;
+.pf-v5-c-toolbar__group.pf-m-align-items-end,
+.pf-v5-c-toolbar__item.pf-m-align-items-end,
+.pf-v5-c-toolbar__content.pf-m-align-items-end,
+.pf-v5-c-toolbar__content-section.pf-m-align-items-end {
+  align-items: end;
 }
-.pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left,
-.pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left {
+.pf-v5-c-toolbar__group.pf-m-gap-none,
+.pf-v5-c-toolbar__item.pf-m-gap-none,
+.pf-v5-c-toolbar__content.pf-m-gap-none,
+.pf-v5-c-toolbar__content-section.pf-m-gap-none {
+  column-gap: 0;
+}
+.pf-v5-c-toolbar__group.pf-m-gap-xs,
+.pf-v5-c-toolbar__item.pf-m-gap-xs,
+.pf-v5-c-toolbar__content.pf-m-gap-xs,
+.pf-v5-c-toolbar__content-section.pf-m-gap-xs {
+  column-gap: var(--pf-v5-global--spacer--xs);
+}
+.pf-v5-c-toolbar__group.pf-m-gap-sm,
+.pf-v5-c-toolbar__item.pf-m-gap-sm,
+.pf-v5-c-toolbar__content.pf-m-gap-sm,
+.pf-v5-c-toolbar__content-section.pf-m-gap-sm {
+  column-gap: var(--pf-v5-global--spacer--sm);
+}
+.pf-v5-c-toolbar__group.pf-m-gap-md,
+.pf-v5-c-toolbar__item.pf-m-gap-md,
+.pf-v5-c-toolbar__content.pf-m-gap-md,
+.pf-v5-c-toolbar__content-section.pf-m-gap-md {
+  column-gap: var(--pf-v5-global--spacer--md);
+}
+.pf-v5-c-toolbar__group.pf-m-gap-lg,
+.pf-v5-c-toolbar__item.pf-m-gap-lg,
+.pf-v5-c-toolbar__content.pf-m-gap-lg,
+.pf-v5-c-toolbar__content-section.pf-m-gap-lg {
+  column-gap: var(--pf-v5-global--spacer--lg);
+}
+.pf-v5-c-toolbar__group.pf-m-gap-xl,
+.pf-v5-c-toolbar__item.pf-m-gap-xl,
+.pf-v5-c-toolbar__content.pf-m-gap-xl,
+.pf-v5-c-toolbar__content-section.pf-m-gap-xl {
+  column-gap: var(--pf-v5-global--spacer--xl);
+}
+.pf-v5-c-toolbar__group.pf-m-gap-2xl,
+.pf-v5-c-toolbar__item.pf-m-gap-2xl,
+.pf-v5-c-toolbar__content.pf-m-gap-2xl,
+.pf-v5-c-toolbar__content-section.pf-m-gap-2xl {
+  column-gap: var(--pf-v5-global--spacer--2xl);
+}
+.pf-v5-c-toolbar__group.pf-m-gap-3xl,
+.pf-v5-c-toolbar__item.pf-m-gap-3xl,
+.pf-v5-c-toolbar__content.pf-m-gap-3xl,
+.pf-v5-c-toolbar__content-section.pf-m-gap-3xl {
+  column-gap: var(--pf-v5-global--spacer--3xl);
+}
+.pf-v5-c-toolbar__group.pf-m-gap-4xl,
+.pf-v5-c-toolbar__item.pf-m-gap-4xl,
+.pf-v5-c-toolbar__content.pf-m-gap-4xl,
+.pf-v5-c-toolbar__content-section.pf-m-gap-4xl {
+  column-gap: var(--pf-v5-global--spacer--4xl);
+}
+.pf-v5-c-toolbar__group.pf-m-column-gap-none,
+.pf-v5-c-toolbar__item.pf-m-column-gap-none,
+.pf-v5-c-toolbar__content.pf-m-column-gap-none,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-none {
+  column-gap: 0;
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-none,
+.pf-v5-c-toolbar__item.pf-m-row-gap-none,
+.pf-v5-c-toolbar__content.pf-m-row-gap-none,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-none {
+  column-gap: 0;
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-startnone,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-startnone,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-startnone,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-startnone {
   margin-inline-start: 0;
 }
-.pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left ~ .pf-m-pagination,
-.pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left ~ .pf-m-pagination {
-  margin-inline-start: auto;
+.pf-v5-c-toolbar__group.pf-m-margin-inline-endnone,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-endnone,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-endnone,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-endnone {
+  margin-inline-end: 0;
 }
-.pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-nowrap,
-.pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-nowrap {
-  flex-wrap: nowrap;
+.pf-v5-c-toolbar__group.pf-m-column-gap-xs,
+.pf-v5-c-toolbar__item.pf-m-column-gap-xs,
+.pf-v5-c-toolbar__content.pf-m-column-gap-xs,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-xs {
+  column-gap: var(--pf-v5-global--spacer--xs);
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-xs,
+.pf-v5-c-toolbar__item.pf-m-row-gap-xs,
+.pf-v5-c-toolbar__content.pf-m-row-gap-xs,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-xs {
+  column-gap: var(--pf-v5-global--spacer--xs);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-startxs,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-startxs,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-startxs,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxs {
+  margin-inline-start: var(--pf-v5-global--spacer--xs);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-endxs,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-endxs,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-endxs,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxs {
+  margin-inline-end: var(--pf-v5-global--spacer--xs);
+}
+.pf-v5-c-toolbar__group.pf-m-column-gap-sm,
+.pf-v5-c-toolbar__item.pf-m-column-gap-sm,
+.pf-v5-c-toolbar__content.pf-m-column-gap-sm,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-sm {
+  column-gap: var(--pf-v5-global--spacer--sm);
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-sm,
+.pf-v5-c-toolbar__item.pf-m-row-gap-sm,
+.pf-v5-c-toolbar__content.pf-m-row-gap-sm,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-sm {
+  column-gap: var(--pf-v5-global--spacer--sm);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-startsm,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-startsm,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-startsm,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-startsm {
+  margin-inline-start: var(--pf-v5-global--spacer--sm);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-endsm,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-endsm,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-endsm,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-endsm {
+  margin-inline-end: var(--pf-v5-global--spacer--sm);
+}
+.pf-v5-c-toolbar__group.pf-m-column-gap-md,
+.pf-v5-c-toolbar__item.pf-m-column-gap-md,
+.pf-v5-c-toolbar__content.pf-m-column-gap-md,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-md {
+  column-gap: var(--pf-v5-global--spacer--md);
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-md,
+.pf-v5-c-toolbar__item.pf-m-row-gap-md,
+.pf-v5-c-toolbar__content.pf-m-row-gap-md,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-md {
+  column-gap: var(--pf-v5-global--spacer--md);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-startmd,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-startmd,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-startmd,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-startmd {
+  margin-inline-start: var(--pf-v5-global--spacer--md);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-endmd,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-endmd,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-endmd,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-endmd {
+  margin-inline-end: var(--pf-v5-global--spacer--md);
+}
+.pf-v5-c-toolbar__group.pf-m-column-gap-lg,
+.pf-v5-c-toolbar__item.pf-m-column-gap-lg,
+.pf-v5-c-toolbar__content.pf-m-column-gap-lg,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-lg {
+  column-gap: var(--pf-v5-global--spacer--lg);
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-lg,
+.pf-v5-c-toolbar__item.pf-m-row-gap-lg,
+.pf-v5-c-toolbar__content.pf-m-row-gap-lg,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-lg {
+  column-gap: var(--pf-v5-global--spacer--lg);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-startlg,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-startlg,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-startlg,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-startlg {
+  margin-inline-start: var(--pf-v5-global--spacer--lg);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-endlg,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-endlg,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-endlg,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-endlg {
+  margin-inline-end: var(--pf-v5-global--spacer--lg);
+}
+.pf-v5-c-toolbar__group.pf-m-column-gap-xl,
+.pf-v5-c-toolbar__item.pf-m-column-gap-xl,
+.pf-v5-c-toolbar__content.pf-m-column-gap-xl,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-xl {
+  column-gap: var(--pf-v5-global--spacer--xl);
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-xl,
+.pf-v5-c-toolbar__item.pf-m-row-gap-xl,
+.pf-v5-c-toolbar__content.pf-m-row-gap-xl,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-xl {
+  column-gap: var(--pf-v5-global--spacer--xl);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-startxl,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-startxl,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-startxl,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxl {
+  margin-inline-start: var(--pf-v5-global--spacer--xl);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-endxl,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-endxl,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-endxl,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxl {
+  margin-inline-end: var(--pf-v5-global--spacer--xl);
+}
+.pf-v5-c-toolbar__group.pf-m-column-gap-2xl,
+.pf-v5-c-toolbar__item.pf-m-column-gap-2xl,
+.pf-v5-c-toolbar__content.pf-m-column-gap-2xl,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-2xl {
+  column-gap: var(--pf-v5-global--spacer--2xl);
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-2xl,
+.pf-v5-c-toolbar__item.pf-m-row-gap-2xl,
+.pf-v5-c-toolbar__content.pf-m-row-gap-2xl,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-2xl {
+  column-gap: var(--pf-v5-global--spacer--2xl);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-start2xl,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-start2xl,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-start2xl,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-start2xl {
+  margin-inline-start: var(--pf-v5-global--spacer--2xl);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-end2xl,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-end2xl,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-end2xl,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-end2xl {
+  margin-inline-end: var(--pf-v5-global--spacer--2xl);
+}
+.pf-v5-c-toolbar__group.pf-m-column-gap-3xl,
+.pf-v5-c-toolbar__item.pf-m-column-gap-3xl,
+.pf-v5-c-toolbar__content.pf-m-column-gap-3xl,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-3xl {
+  column-gap: var(--pf-v5-global--spacer--3xl);
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-3xl,
+.pf-v5-c-toolbar__item.pf-m-row-gap-3xl,
+.pf-v5-c-toolbar__content.pf-m-row-gap-3xl,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-3xl {
+  column-gap: var(--pf-v5-global--spacer--3xl);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-start3xl,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-start3xl,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-start3xl,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-start3xl {
+  margin-inline-start: var(--pf-v5-global--spacer--3xl);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-end3xl,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-end3xl,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-end3xl,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-end3xl {
+  margin-inline-end: var(--pf-v5-global--spacer--3xl);
+}
+.pf-v5-c-toolbar__group.pf-m-column-gap-4xl,
+.pf-v5-c-toolbar__item.pf-m-column-gap-4xl,
+.pf-v5-c-toolbar__content.pf-m-column-gap-4xl,
+.pf-v5-c-toolbar__content-section.pf-m-column-gap-4xl {
+  column-gap: var(--pf-v5-global--spacer--4xl);
+}
+.pf-v5-c-toolbar__group.pf-m-row-gap-4xl,
+.pf-v5-c-toolbar__item.pf-m-row-gap-4xl,
+.pf-v5-c-toolbar__content.pf-m-row-gap-4xl,
+.pf-v5-c-toolbar__content-section.pf-m-row-gap-4xl {
+  column-gap: var(--pf-v5-global--spacer--4xl);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-start4xl,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-start4xl,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-start4xl,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-start4xl {
+  margin-inline-start: var(--pf-v5-global--spacer--4xl);
+}
+.pf-v5-c-toolbar__group.pf-m-margin-inline-end4xl,
+.pf-v5-c-toolbar__item.pf-m-margin-inline-end4xl,
+.pf-v5-c-toolbar__content.pf-m-margin-inline-end4xl,
+.pf-v5-c-toolbar__content-section.pf-m-margin-inline-end4xl {
+  margin-inline-end: var(--pf-v5-global--spacer--4xl);
+}
+
+.pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show .pf-v5-c-toolbar__group,
+.pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show .pf-v5-c-toolbar__item {
+  display: flex;
+  flex: 0 1 auto;
 }
-.pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-wrap,
-.pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-wrap {
-  flex-wrap: wrap;
+.pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show .pf-v5-c-toolbar__toggle {
+  display: none;
+}
+.pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__group,
+.pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__item, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide .pf-v5-c-toolbar__group,
+.pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide .pf-v5-c-toolbar__item {
+  display: none;
+}
+.pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__toggle, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide .pf-v5-c-toolbar__toggle {
+  display: inline-block;
 }
+
 @media (min-width: 576px) {
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-sm,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-sm {
-    margin-inline-start: auto;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-sm ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-sm ~ .pf-m-pagination {
-    margin-inline-start: 0;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-sm,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-sm {
+  .pf-v5-c-toolbar__group.pf-m-align-start-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-start-on-sm {
     margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-sm ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-sm ~ .pf-m-pagination {
-    margin-inline-start: auto;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-sm,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-nowrap-on-sm {
-    flex-wrap: nowrap;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-wrap-on-sm,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-wrap-on-sm {
-    flex-wrap: wrap;
-  }
-}
-@media (min-width: 768px) {
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-md,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-md {
+  .pf-v5-c-toolbar__group.pf-m-align-center-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-center-on-sm {
     margin-inline-start: auto;
+    margin-inline-end: auto;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-md ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-md ~ .pf-m-pagination {
-    margin-inline-start: 0;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-md,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-md {
-    margin-inline-start: 0;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-md ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-md ~ .pf-m-pagination {
+  .pf-v5-c-toolbar__group.pf-m-align-end-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-end-on-sm {
     margin-inline-start: auto;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-md,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-nowrap-on-md {
-    flex-wrap: nowrap;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-wrap-on-md,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-wrap-on-md {
-    flex-wrap: wrap;
-  }
-}
-@media (min-width: 992px) {
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-lg,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-lg {
-    margin-inline-start: auto;
+  .pf-v5-c-toolbar__group.pf-m-flex-grow-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-flex-grow-on-sm {
+    flex-grow: 1;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-lg ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-lg ~ .pf-m-pagination {
-    margin-inline-start: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-stretch-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-self-stretch-on-sm {
+    align-self: stretch;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-lg,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-lg {
-    margin-inline-start: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-baseline-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-self-baseline-on-sm {
+    align-self: baseline;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-lg ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-lg ~ .pf-m-pagination {
-    margin-inline-start: auto;
+  .pf-v5-c-toolbar__group.pf-m-align-self-start-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-self-start-on-sm {
+    align-self: start;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-lg,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-nowrap-on-lg {
-    flex-wrap: nowrap;
+  .pf-v5-c-toolbar__group.pf-m-align-self-center-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-self-center-on-sm {
+    align-self: center;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-wrap-on-lg,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-wrap-on-lg {
+  .pf-v5-c-toolbar__group.pf-m-align-self-end-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-self-end-on-sm {
+    align-self: end;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-none-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-none-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-none-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: 0;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xs-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-xs-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xs-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-sm-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-sm-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-sm-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-md-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-md-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-md-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-lg-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-lg-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-lg-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xl-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-2xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-2xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-2xl-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-3xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-3xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-3xl-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-4xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-inset-4xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-4xl-on-sm {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-wrap-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-wrap-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-wrap-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-wrap-on-sm {
     flex-wrap: wrap;
   }
-}
-@media (min-width: 1200px) {
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-xl,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-xl {
-    margin-inline-start: auto;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-xl ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-xl ~ .pf-m-pagination {
-    margin-inline-start: 0;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-xl,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-xl {
-    margin-inline-start: 0;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-xl ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-xl ~ .pf-m-pagination {
-    margin-inline-start: auto;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-xl,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-nowrap-on-xl {
+  .pf-v5-c-toolbar__group.pf-m-nowrap-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-nowrap-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-nowrap-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-sm {
     flex-wrap: nowrap;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-wrap-on-xl,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-wrap-on-xl {
-    flex-wrap: wrap;
-  }
-}
-@media (min-width: 1450px) {
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-2xl,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-2xl {
-    margin-inline-start: auto;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-right-on-2xl ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-right-on-2xl ~ .pf-m-pagination {
-    margin-inline-start: 0;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-2xl,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-2xl {
-    margin-inline-start: 0;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__item.pf-m-align-left-on-2xl ~ .pf-m-pagination,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-align-left-on-2xl ~ .pf-m-pagination {
-    margin-inline-start: auto;
-  }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-2xl,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-nowrap-on-2xl {
-    flex-wrap: nowrap;
+  .pf-v5-c-toolbar__group.pf-m-align-items-stretch-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-items-stretch-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-align-items-stretch-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-stretch-on-sm {
+    align-items: stretch;
   }
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__content-section.pf-m-wrap-on-2xl,
-  .pf-v5-c-toolbar .pf-v5-c-toolbar__group.pf-m-wrap-on-2xl {
-    flex-wrap: wrap;
+  .pf-v5-c-toolbar__group.pf-m-align-items-baseline-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-items-baseline-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-align-items-baseline-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-baseline-on-sm {
+    align-items: baseline;
   }
-}
-.pf-v5-c-toolbar .pf-m-space-items-none > * {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-.pf-v5-c-toolbar .pf-m-space-items-none > :last-child {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-.pf-v5-c-toolbar .pf-m-space-items-sm > * {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
-}
-.pf-v5-c-toolbar .pf-m-space-items-sm > :last-child {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-.pf-v5-c-toolbar .pf-m-space-items-md > * {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
-}
-.pf-v5-c-toolbar .pf-m-space-items-md > :last-child {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-.pf-v5-c-toolbar .pf-m-space-items-lg > * {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
-}
-.pf-v5-c-toolbar .pf-m-space-items-lg > :last-child {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-@media (min-width: 576px) {
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-sm > * {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-items-start-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-items-start-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-align-items-start-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-start-on-sm {
+    align-items: start;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-sm > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-items-center-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-items-center-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-align-items-center-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-center-on-sm {
+    align-items: center;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-sm > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-items-end-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-align-items-end-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-align-items-end-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-end-on-sm {
+    align-items: end;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-none-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-none-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-none-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-none-on-sm {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xs-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-xs-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-xs-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xs-on-sm {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-sm-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-sm-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-sm-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-sm-on-sm {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-md-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-md-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-md-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-md-on-sm {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-lg-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-lg-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-lg-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-lg-on-sm {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-2xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-3xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-4xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-none-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-none-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-none-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-none-on-sm {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-none-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-none-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-none-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-none-on-sm {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startnone-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startnone-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startnone-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startnone-on-sm {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-sm > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endnone-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endnone-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endnone-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endnone-on-sm {
+    margin-inline-end: 0;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-sm > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xs-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xs-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xs-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xs-on-sm {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xs-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xs-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xs-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xs-on-sm {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxs-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxs-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxs-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxs-on-sm {
+    margin-inline-start: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxs-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxs-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxs-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxs-on-sm {
+    margin-inline-end: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-sm-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-sm-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-sm-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-sm-on-sm {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-sm-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-sm-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-sm-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-sm-on-sm {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startsm-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startsm-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startsm-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startsm-on-sm {
+    margin-inline-start: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endsm-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endsm-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endsm-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endsm-on-sm {
+    margin-inline-end: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-md-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-md-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-md-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-md-on-sm {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-md-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-md-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-md-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-md-on-sm {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startmd-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startmd-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startmd-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startmd-on-sm {
+    margin-inline-start: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endmd-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endmd-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endmd-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endmd-on-sm {
+    margin-inline-end: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-lg-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-lg-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-lg-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-lg-on-sm {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-lg-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-lg-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-lg-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-lg-on-sm {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startlg-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startlg-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startlg-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startlg-on-sm {
+    margin-inline-start: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endlg-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endlg-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endlg-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endlg-on-sm {
+    margin-inline-end: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxl-on-sm {
+    margin-inline-start: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxl-on-sm {
+    margin-inline-end: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-2xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-2xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-2xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start2xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start2xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start2xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-sm {
+    margin-inline-start: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end2xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end2xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end2xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-sm {
+    margin-inline-end: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-3xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-3xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-3xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start3xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start3xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start3xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-sm {
+    margin-inline-start: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end3xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end3xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end3xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-sm {
+    margin-inline-end: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-4xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-4xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-4xl-on-sm {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start4xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start4xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start4xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-sm {
+    margin-inline-start: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end4xl-on-sm,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end4xl-on-sm,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end4xl-on-sm,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-sm {
+    margin-inline-end: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-sm .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-sm .pf-v5-c-toolbar__item {
+    display: flex;
+    flex: 0 1 auto;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-sm > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-sm .pf-v5-c-toolbar__toggle {
+    display: none;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-sm > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__item, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-sm .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-sm .pf-v5-c-toolbar__item {
+    display: none;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-sm > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__toggle, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-sm .pf-v5-c-toolbar__toggle {
+    display: inline-block;
   }
 }
 @media (min-width: 768px) {
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-md > * {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-md > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-md > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-md > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-md > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-md > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-md > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-md > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-}
-@media (min-width: 992px) {
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-lg > * {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-lg > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-lg > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-lg > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-lg > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-align-start-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-start-on-md {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-lg > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-center-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-center-on-md {
+    margin-inline-start: auto;
+    margin-inline-end: auto;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-lg > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-end-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-end-on-md {
+    margin-inline-start: auto;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-lg > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-flex-grow-on-md,
+  .pf-v5-c-toolbar__item.pf-m-flex-grow-on-md {
+    flex-grow: 1;
   }
-}
-@media (min-width: 1200px) {
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-xl > * {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-stretch-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-self-stretch-on-md {
+    align-self: stretch;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-xl > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-baseline-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-self-baseline-on-md {
+    align-self: baseline;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-xl > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-self-start-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-self-start-on-md {
+    align-self: start;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-xl > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-center-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-self-center-on-md {
+    align-self: center;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-xl > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-align-self-end-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-self-end-on-md {
+    align-self: end;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-none-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-none-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-none-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: 0;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xs-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-xs-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xs-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-sm-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-sm-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-sm-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-md-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-md-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-md-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-lg-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-lg-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-lg-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xl-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-2xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-2xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-2xl-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-3xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-3xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-3xl-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-4xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-inset-4xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-4xl-on-md {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-wrap-on-md,
+  .pf-v5-c-toolbar__item.pf-m-wrap-on-md,
+  .pf-v5-c-toolbar__content.pf-m-wrap-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-wrap-on-md {
+    flex-wrap: wrap;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-xl > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-nowrap-on-md,
+  .pf-v5-c-toolbar__item.pf-m-nowrap-on-md,
+  .pf-v5-c-toolbar__content.pf-m-nowrap-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-md {
+    flex-wrap: nowrap;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-xl > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-items-stretch-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-items-stretch-on-md,
+  .pf-v5-c-toolbar__content.pf-m-align-items-stretch-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-stretch-on-md {
+    align-items: stretch;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-xl > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-items-baseline-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-items-baseline-on-md,
+  .pf-v5-c-toolbar__content.pf-m-align-items-baseline-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-baseline-on-md {
+    align-items: baseline;
   }
-}
-@media (min-width: 1450px) {
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-2xl > * {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-items-start-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-items-start-on-md,
+  .pf-v5-c-toolbar__content.pf-m-align-items-start-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-start-on-md {
+    align-items: start;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-none-on-2xl > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-items-center-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-items-center-on-md,
+  .pf-v5-c-toolbar__content.pf-m-align-items-center-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-center-on-md {
+    align-items: center;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-2xl > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-items-end-on-md,
+  .pf-v5-c-toolbar__item.pf-m-align-items-end-on-md,
+  .pf-v5-c-toolbar__content.pf-m-align-items-end-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-end-on-md {
+    align-items: end;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-none-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-none-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-none-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-none-on-md {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xs-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-xs-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-xs-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xs-on-md {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-sm-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-sm-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-sm-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-sm-on-md {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-md-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-md-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-md-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-md-on-md {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-lg-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-lg-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-lg-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-lg-on-md {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-2xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-2xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-2xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-2xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-3xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-3xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-3xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-3xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-4xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-gap-4xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-gap-4xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-4xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-none-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-none-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-none-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-none-on-md {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-none-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-none-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-none-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-none-on-md {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startnone-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startnone-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startnone-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startnone-on-md {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-sm-on-2xl > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endnone-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endnone-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endnone-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endnone-on-md {
+    margin-inline-end: 0;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-2xl > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xs-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xs-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xs-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xs-on-md {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xs-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xs-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xs-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xs-on-md {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxs-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxs-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxs-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxs-on-md {
+    margin-inline-start: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxs-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxs-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxs-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxs-on-md {
+    margin-inline-end: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-sm-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-sm-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-sm-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-sm-on-md {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-sm-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-sm-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-sm-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-sm-on-md {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startsm-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startsm-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startsm-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startsm-on-md {
+    margin-inline-start: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endsm-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endsm-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endsm-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endsm-on-md {
+    margin-inline-end: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-md-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-md-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-md-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-md-on-md {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-md-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-md-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-md-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-md-on-md {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startmd-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startmd-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startmd-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startmd-on-md {
+    margin-inline-start: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endmd-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endmd-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endmd-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endmd-on-md {
+    margin-inline-end: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-lg-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-lg-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-lg-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-lg-on-md {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-lg-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-lg-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-lg-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-lg-on-md {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startlg-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startlg-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startlg-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startlg-on-md {
+    margin-inline-start: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endlg-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endlg-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endlg-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endlg-on-md {
+    margin-inline-end: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxl-on-md {
+    margin-inline-start: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxl-on-md {
+    margin-inline-end: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-2xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-2xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-2xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-2xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-2xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-2xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-2xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-2xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start2xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start2xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start2xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-md {
+    margin-inline-start: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end2xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end2xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end2xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-md {
+    margin-inline-end: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-3xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-3xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-3xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-3xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-3xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-3xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-3xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-3xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start3xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start3xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start3xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-md {
+    margin-inline-start: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end3xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end3xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end3xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-md {
+    margin-inline-end: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-4xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-4xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-4xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-4xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-4xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-4xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-4xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-4xl-on-md {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start4xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start4xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start4xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-md {
+    margin-inline-start: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end4xl-on-md,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end4xl-on-md,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end4xl-on-md,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-md {
+    margin-inline-end: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-md .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-md .pf-v5-c-toolbar__item {
+    display: flex;
+    flex: 0 1 auto;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-md-on-2xl > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-md .pf-v5-c-toolbar__toggle {
+    display: none;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-2xl > * {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__item, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-md .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-md .pf-v5-c-toolbar__item {
+    display: none;
   }
-  .pf-v5-c-toolbar .pf-m-space-items-lg-on-2xl > :last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__toggle, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-md .pf-v5-c-toolbar__toggle {
+    display: inline-block;
   }
 }
-.pf-v5-c-toolbar .pf-m-spacer-none {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-.pf-v5-c-toolbar .pf-m-spacer-none:last-child {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-.pf-v5-c-toolbar .pf-m-spacer-sm {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
-}
-.pf-v5-c-toolbar .pf-m-spacer-sm:last-child {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
-}
-.pf-v5-c-toolbar .pf-m-spacer-md {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
-}
-.pf-v5-c-toolbar .pf-m-spacer-md:last-child {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
-}
-.pf-v5-c-toolbar .pf-m-spacer-lg {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
-}
-.pf-v5-c-toolbar .pf-m-spacer-lg:last-child {
-  --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
-}
-@media (min-width: 576px) {
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-sm {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-sm:last-child {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-sm {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
-  }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-sm:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
-  }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-sm {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+@media (min-width: 992px) {
+  .pf-v5-c-toolbar__group.pf-m-align-start-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-start-on-lg {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-sm:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-align-center-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-center-on-lg {
+    margin-inline-start: auto;
+    margin-inline-end: auto;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-sm {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-end-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-end-on-lg {
+    margin-inline-start: auto;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-sm:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-flex-grow-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-flex-grow-on-lg {
+    flex-grow: 1;
   }
-}
-@media (min-width: 768px) {
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-md {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-stretch-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-self-stretch-on-lg {
+    align-self: stretch;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-md:last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-baseline-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-self-baseline-on-lg {
+    align-self: baseline;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-md {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-self-start-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-self-start-on-lg {
+    align-self: start;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-md:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-self-center-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-self-center-on-lg {
+    align-self: center;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-md {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-align-self-end-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-self-end-on-lg {
+    align-self: end;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-none-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-none-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-none-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: 0;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xs-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-xs-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xs-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-sm-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-sm-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-sm-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-md-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-md-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-md-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-lg-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-lg-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-lg-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xl-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-2xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-2xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-2xl-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-3xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-3xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-3xl-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-4xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-inset-4xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-4xl-on-lg {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-wrap-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-wrap-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-wrap-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-wrap-on-lg {
+    flex-wrap: wrap;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-md:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-nowrap-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-nowrap-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-nowrap-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-lg {
+    flex-wrap: nowrap;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-md {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-items-stretch-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-items-stretch-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-align-items-stretch-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-stretch-on-lg {
+    align-items: stretch;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-md:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-items-baseline-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-items-baseline-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-align-items-baseline-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-baseline-on-lg {
+    align-items: baseline;
   }
-}
-@media (min-width: 992px) {
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-lg {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-items-start-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-items-start-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-align-items-start-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-start-on-lg {
+    align-items: start;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-lg:last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-items-center-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-items-center-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-align-items-center-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-center-on-lg {
+    align-items: center;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-lg {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-items-end-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-align-items-end-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-align-items-end-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-end-on-lg {
+    align-items: end;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-none-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-none-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-none-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-none-on-lg {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xs-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-xs-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-xs-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xs-on-lg {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-sm-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-sm-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-sm-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-sm-on-lg {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-md-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-md-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-md-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-md-on-lg {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-lg-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-lg-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-lg-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-lg-on-lg {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-2xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-3xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-4xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-none-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-none-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-none-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-none-on-lg {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-none-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-none-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-none-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-none-on-lg {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startnone-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startnone-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startnone-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startnone-on-lg {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-lg:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endnone-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endnone-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endnone-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endnone-on-lg {
+    margin-inline-end: 0;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-lg {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xs-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xs-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xs-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xs-on-lg {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xs-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xs-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xs-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xs-on-lg {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxs-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxs-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxs-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxs-on-lg {
+    margin-inline-start: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxs-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxs-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxs-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxs-on-lg {
+    margin-inline-end: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-sm-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-sm-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-sm-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-sm-on-lg {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-sm-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-sm-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-sm-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-sm-on-lg {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startsm-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startsm-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startsm-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startsm-on-lg {
+    margin-inline-start: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endsm-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endsm-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endsm-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endsm-on-lg {
+    margin-inline-end: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-md-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-md-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-md-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-md-on-lg {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-md-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-md-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-md-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-md-on-lg {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startmd-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startmd-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startmd-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startmd-on-lg {
+    margin-inline-start: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endmd-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endmd-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endmd-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endmd-on-lg {
+    margin-inline-end: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-lg-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-lg-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-lg-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-lg-on-lg {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-lg-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-lg-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-lg-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-lg-on-lg {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startlg-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startlg-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startlg-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startlg-on-lg {
+    margin-inline-start: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endlg-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endlg-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endlg-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endlg-on-lg {
+    margin-inline-end: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxl-on-lg {
+    margin-inline-start: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxl-on-lg {
+    margin-inline-end: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-2xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-2xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-2xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start2xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start2xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start2xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-lg {
+    margin-inline-start: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end2xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end2xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end2xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-lg {
+    margin-inline-end: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-3xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-3xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-3xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start3xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start3xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start3xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-lg {
+    margin-inline-start: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end3xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end3xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end3xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-lg {
+    margin-inline-end: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-4xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-4xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-4xl-on-lg {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start4xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start4xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start4xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-lg {
+    margin-inline-start: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end4xl-on-lg,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end4xl-on-lg,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end4xl-on-lg,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-lg {
+    margin-inline-end: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-lg .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-lg .pf-v5-c-toolbar__item {
+    display: flex;
+    flex: 0 1 auto;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-lg:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-lg .pf-v5-c-toolbar__toggle {
+    display: none;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-lg {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__item, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-lg .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-lg .pf-v5-c-toolbar__item {
+    display: none;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-lg:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__toggle, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-lg .pf-v5-c-toolbar__toggle {
+    display: inline-block;
   }
 }
 @media (min-width: 1200px) {
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-xl {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-xl:last-child {
-    --pf-v5-c-toolbar--spacer: 0;
-  }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-xl {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-start-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-start-on-xl {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-xl:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-center-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-center-on-xl {
+    margin-inline-start: auto;
+    margin-inline-end: auto;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-xl {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-align-end-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-end-on-xl {
+    margin-inline-start: auto;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-xl:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-flex-grow-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-flex-grow-on-xl {
+    flex-grow: 1;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-xl {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-self-stretch-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-stretch-on-xl {
+    align-self: stretch;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-xl:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-self-baseline-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-baseline-on-xl {
+    align-self: baseline;
   }
-}
-@media (min-width: 1450px) {
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-2xl {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-start-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-start-on-xl {
+    align-self: start;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-none-on-2xl:last-child {
-    --pf-v5-c-toolbar--spacer: 0;
+  .pf-v5-c-toolbar__group.pf-m-align-self-center-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-center-on-xl {
+    align-self: center;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-2xl {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-align-self-end-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-end-on-xl {
+    align-self: end;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-none-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-none-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-none-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: 0;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xs-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-xs-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xs-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-sm-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-sm-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-sm-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-md-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-md-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-md-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-lg-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-lg-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-lg-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xl-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-2xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-2xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-2xl-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-3xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-3xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-3xl-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-4xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-4xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-4xl-on-xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-wrap-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-wrap-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-wrap-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-wrap-on-xl {
+    flex-wrap: wrap;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-sm-on-2xl:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--sm);
+  .pf-v5-c-toolbar__group.pf-m-nowrap-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-nowrap-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-nowrap-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-xl {
+    flex-wrap: nowrap;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-2xl {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-align-items-stretch-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-stretch-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-stretch-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-stretch-on-xl {
+    align-items: stretch;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-md-on-2xl:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--md);
+  .pf-v5-c-toolbar__group.pf-m-align-items-baseline-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-baseline-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-baseline-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-baseline-on-xl {
+    align-items: baseline;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-2xl {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-items-start-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-start-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-start-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-start-on-xl {
+    align-items: start;
   }
-  .pf-v5-c-toolbar .pf-m-spacer-lg-on-2xl:last-child {
-    --pf-v5-c-toolbar--spacer: var(--pf-v5-global--spacer--lg);
+  .pf-v5-c-toolbar__group.pf-m-align-items-center-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-center-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-center-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-center-on-xl {
+    align-items: center;
   }
-}
-.pf-v5-c-toolbar.pf-m-inset-none {
-  --pf-v5-c-toolbar--inset: 0;
-  --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-  --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-}
-.pf-v5-c-toolbar.pf-m-inset-sm {
-  --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--sm);
-  --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-  --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-}
-.pf-v5-c-toolbar.pf-m-inset-md {
-  --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-  --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-}
-.pf-v5-c-toolbar.pf-m-inset-lg {
-  --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--lg);
-  --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-  --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-}
-.pf-v5-c-toolbar.pf-m-inset-xl {
-  --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--xl);
-  --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-  --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-}
-.pf-v5-c-toolbar.pf-m-inset-2xl {
-  --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--2xl);
-  --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-  --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-}
-@media (min-width: 576px) {
-  .pf-v5-c-toolbar.pf-m-inset-none-on-sm {
-    --pf-v5-c-toolbar--inset: 0;
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-items-end-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-end-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-end-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-end-on-xl {
+    align-items: end;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-none-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-none-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-none-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-none-on-xl {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xs-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-xs-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-xs-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xs-on-xl {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-sm-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-sm-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-sm-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-sm-on-xl {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-md-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-md-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-md-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-md-on-xl {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-lg-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-lg-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-lg-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-lg-on-xl {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-2xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-3xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-4xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-none-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-none-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-none-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-none-on-xl {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-none-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-none-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-none-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-none-on-xl {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startnone-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startnone-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startnone-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startnone-on-xl {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar.pf-m-inset-sm-on-sm {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--sm);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endnone-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endnone-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endnone-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endnone-on-xl {
+    margin-inline-end: 0;
   }
-  .pf-v5-c-toolbar.pf-m-inset-md-on-sm {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--md);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xs-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xs-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xs-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xs-on-xl {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xs-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xs-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xs-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xs-on-xl {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxs-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxs-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxs-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxs-on-xl {
+    margin-inline-start: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxs-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxs-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxs-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxs-on-xl {
+    margin-inline-end: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-sm-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-sm-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-sm-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-sm-on-xl {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-sm-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-sm-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-sm-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-sm-on-xl {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startsm-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startsm-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startsm-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startsm-on-xl {
+    margin-inline-start: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endsm-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endsm-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endsm-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endsm-on-xl {
+    margin-inline-end: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-md-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-md-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-md-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-md-on-xl {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-md-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-md-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-md-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-md-on-xl {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startmd-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startmd-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startmd-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startmd-on-xl {
+    margin-inline-start: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endmd-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endmd-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endmd-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endmd-on-xl {
+    margin-inline-end: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-lg-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-lg-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-lg-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-lg-on-xl {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-lg-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-lg-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-lg-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-lg-on-xl {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startlg-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startlg-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startlg-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startlg-on-xl {
+    margin-inline-start: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endlg-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endlg-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endlg-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endlg-on-xl {
+    margin-inline-end: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxl-on-xl {
+    margin-inline-start: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxl-on-xl {
+    margin-inline-end: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-2xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-2xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-2xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start2xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start2xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start2xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-xl {
+    margin-inline-start: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end2xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end2xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end2xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-xl {
+    margin-inline-end: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-3xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-3xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-3xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start3xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start3xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start3xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-xl {
+    margin-inline-start: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end3xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end3xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end3xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-xl {
+    margin-inline-end: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-4xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-4xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-4xl-on-xl {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start4xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start4xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start4xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-xl {
+    margin-inline-start: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end4xl-on-xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end4xl-on-xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end4xl-on-xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-xl {
+    margin-inline-end: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-xl .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-xl .pf-v5-c-toolbar__item {
+    display: flex;
+    flex: 0 1 auto;
   }
-  .pf-v5-c-toolbar.pf-m-inset-lg-on-sm {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--lg);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-xl .pf-v5-c-toolbar__toggle {
+    display: none;
   }
-  .pf-v5-c-toolbar.pf-m-inset-xl-on-sm {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__item, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-xl .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-xl .pf-v5-c-toolbar__item {
+    display: none;
   }
-  .pf-v5-c-toolbar.pf-m-inset-2xl-on-sm {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--2xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__toggle, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-xl .pf-v5-c-toolbar__toggle {
+    display: inline-block;
   }
 }
-@media (min-width: 768px) {
-  .pf-v5-c-toolbar.pf-m-inset-none-on-md {
-    --pf-v5-c-toolbar--inset: 0;
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-  }
-  .pf-v5-c-toolbar.pf-m-inset-sm-on-md {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--sm);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-  }
-  .pf-v5-c-toolbar.pf-m-inset-md-on-md {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--md);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-  }
-  .pf-v5-c-toolbar.pf-m-inset-lg-on-md {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--lg);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
-  }
-  .pf-v5-c-toolbar.pf-m-inset-xl-on-md {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+@media (min-width: 1450px) {
+  .pf-v5-c-toolbar__group.pf-m-align-start-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-start-on-2xl {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar.pf-m-inset-2xl-on-md {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--2xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-center-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-center-on-2xl {
+    margin-inline-start: auto;
+    margin-inline-end: auto;
   }
-}
-@media (min-width: 992px) {
-  .pf-v5-c-toolbar.pf-m-inset-none-on-lg {
-    --pf-v5-c-toolbar--inset: 0;
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-end-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-end-on-2xl {
+    margin-inline-start: auto;
   }
-  .pf-v5-c-toolbar.pf-m-inset-sm-on-lg {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--sm);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-flex-grow-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-flex-grow-on-2xl {
+    flex-grow: 1;
   }
-  .pf-v5-c-toolbar.pf-m-inset-md-on-lg {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--md);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-self-stretch-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-stretch-on-2xl {
+    align-self: stretch;
   }
-  .pf-v5-c-toolbar.pf-m-inset-lg-on-lg {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--lg);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-self-baseline-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-baseline-on-2xl {
+    align-self: baseline;
   }
-  .pf-v5-c-toolbar.pf-m-inset-xl-on-lg {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-self-start-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-start-on-2xl {
+    align-self: start;
   }
-  .pf-v5-c-toolbar.pf-m-inset-2xl-on-lg {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--2xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-self-center-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-center-on-2xl {
+    align-self: center;
   }
-}
-@media (min-width: 1200px) {
-  .pf-v5-c-toolbar.pf-m-inset-none-on-xl {
-    --pf-v5-c-toolbar--inset: 0;
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-self-end-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-self-end-on-2xl {
+    align-self: end;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-none-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-none-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-none-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: 0;
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xs-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-xs-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xs-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-sm-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-sm-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-sm-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-md-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-md-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-md-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-lg-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-lg-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-lg-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-xl-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-2xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-2xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-2xl-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-3xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-3xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-3xl-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar.pf-m-inset-4xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-inset-4xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-inset-4xl-on-2xl {
+    --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-wrap-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-wrap-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-wrap-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-wrap-on-2xl {
+    flex-wrap: wrap;
   }
-  .pf-v5-c-toolbar.pf-m-inset-sm-on-xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--sm);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-nowrap-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-nowrap-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-nowrap-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-nowrap-on-2xl {
+    flex-wrap: nowrap;
   }
-  .pf-v5-c-toolbar.pf-m-inset-md-on-xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--md);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-items-stretch-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-stretch-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-stretch-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-stretch-on-2xl {
+    align-items: stretch;
   }
-  .pf-v5-c-toolbar.pf-m-inset-lg-on-xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--lg);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-items-baseline-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-baseline-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-baseline-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-baseline-on-2xl {
+    align-items: baseline;
   }
-  .pf-v5-c-toolbar.pf-m-inset-xl-on-xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-items-start-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-start-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-start-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-start-on-2xl {
+    align-items: start;
   }
-  .pf-v5-c-toolbar.pf-m-inset-2xl-on-xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--2xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-items-center-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-center-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-center-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-center-on-2xl {
+    align-items: center;
   }
-}
-@media (min-width: 1450px) {
-  .pf-v5-c-toolbar.pf-m-inset-none-on-2xl {
-    --pf-v5-c-toolbar--inset: 0;
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-align-items-end-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-align-items-end-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-align-items-end-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-align-items-end-on-2xl {
+    align-items: end;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-none-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-none-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-none-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-none-on-2xl {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xs-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-sm-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-md-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-md-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-md-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-md-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-lg-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-2xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-3xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-gap-4xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-none-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-none-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-none-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-none-on-2xl {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-none-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-none-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-none-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-none-on-2xl {
+    column-gap: 0;
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startnone-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startnone-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startnone-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startnone-on-2xl {
+    margin-inline-start: 0;
   }
-  .pf-v5-c-toolbar.pf-m-inset-sm-on-2xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--sm);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endnone-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endnone-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endnone-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endnone-on-2xl {
+    margin-inline-end: 0;
   }
-  .pf-v5-c-toolbar.pf-m-inset-md-on-2xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--md);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xs-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xs-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xs-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxs-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxs-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxs-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxs-on-2xl {
+    margin-inline-start: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxs-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxs-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxs-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxs-on-2xl {
+    margin-inline-end: var(--pf-v5-global--spacer--xs);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-sm-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-sm-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-sm-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startsm-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startsm-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startsm-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startsm-on-2xl {
+    margin-inline-start: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endsm-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endsm-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endsm-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endsm-on-2xl {
+    margin-inline-end: var(--pf-v5-global--spacer--sm);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-md-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-md-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-md-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-md-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-md-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-md-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-md-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-md-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startmd-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startmd-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startmd-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startmd-on-2xl {
+    margin-inline-start: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endmd-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endmd-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endmd-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endmd-on-2xl {
+    margin-inline-end: var(--pf-v5-global--spacer--md);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-lg-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-lg-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-lg-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startlg-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startlg-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startlg-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startlg-on-2xl {
+    margin-inline-start: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endlg-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endlg-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endlg-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endlg-on-2xl {
+    margin-inline-end: var(--pf-v5-global--spacer--lg);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-startxl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-startxl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-startxl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-startxl-on-2xl {
+    margin-inline-start: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-endxl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-endxl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-endxl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-endxl-on-2xl {
+    margin-inline-end: var(--pf-v5-global--spacer--xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-2xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-2xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-2xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start2xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start2xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start2xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-2xl {
+    margin-inline-start: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end2xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end2xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end2xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-2xl {
+    margin-inline-end: var(--pf-v5-global--spacer--2xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-3xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-3xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-3xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start3xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start3xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start3xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-2xl {
+    margin-inline-start: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end3xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end3xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end3xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-2xl {
+    margin-inline-end: var(--pf-v5-global--spacer--3xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-column-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-column-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-column-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-column-gap-4xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-row-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-row-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-row-gap-4xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-row-gap-4xl-on-2xl {
+    column-gap: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-start4xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-start4xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-start4xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-2xl {
+    margin-inline-start: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group.pf-m-margin-inline-end4xl-on-2xl,
+  .pf-v5-c-toolbar__item.pf-m-margin-inline-end4xl-on-2xl,
+  .pf-v5-c-toolbar__content.pf-m-margin-inline-end4xl-on-2xl,
+  .pf-v5-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-2xl {
+    margin-inline-end: var(--pf-v5-global--spacer--4xl);
+  }
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-2xl .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-2xl .pf-v5-c-toolbar__item {
+    display: flex;
+    flex: 0 1 auto;
   }
-  .pf-v5-c-toolbar.pf-m-inset-lg-on-2xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--lg);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-2xl .pf-v5-c-toolbar__toggle {
+    display: none;
   }
-  .pf-v5-c-toolbar.pf-m-inset-xl-on-2xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__item, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-2xl .pf-v5-c-toolbar__group,
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-2xl .pf-v5-c-toolbar__item {
+    display: none;
   }
-  .pf-v5-c-toolbar.pf-m-inset-2xl-on-2xl {
-    --pf-v5-c-toolbar--inset: var(--pf-v5-global--spacer--2xl);
-    --pf-v5-c-toolbar__content--PaddingRight: var(--pf-v5-c-toolbar--inset);
-    --pf-v5-c-toolbar__content--PaddingLeft: var(--pf-v5-c-toolbar--inset);
+  .pf-v5-c-toolbar__group:where(.pf-m-toggle-group) .pf-v5-c-toolbar__toggle, .pf-v5-c-toolbar__group:where(.pf-m-toggle-group).pf-m-hide-on-2xl .pf-v5-c-toolbar__toggle {
+    display: inline-block;
   }
 }
-
-.pf-v5-c-toolbar__content-section > :last-child {
-  --pf-v5-c-toolbar--spacer: 0;
-}
-
 .pf-v5-c-date-picker {
   --pf-v5-c-date-picker--m-top__calendar--Top: 0;
   --pf-v5-c-date-picker--m-top__calendar--TranslateY: calc(-100% - var(--pf-v5-global--spacer--xs));
@@ -16561,51 +18041,77 @@ label.pf-v5-c-input-group__text {
   --pf-v5-c-button--m-primary--BackgroundColor: var(--pf-v5-global--primary-color--dark-100);
 }
 
-.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > *, .pf-v5-c-page__header-tools-item, .pf-v5-c-page__header-tools-group, .pf-v5-c-menu__group, .pf-v5-c-menu__list-item, .pf-v5-c-menu__list, .pf-v5-c-data-list__item-action, .pf-v5-c-toolbar__group, .pf-v5-c-toolbar__item, .pf-v5-c-toolbar__content, .pf-v5-c-toolbar__content-section, .pf-v5-c-divider {
+.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > *, .pf-v5-c-page__header-tools-item, .pf-v5-c-page__header-tools-group, .pf-v5-c-menu__group, .pf-v5-c-menu__list-item, .pf-v5-c-menu__list, .pf-v5-c-data-list__item-action, .pf-v5-c-toolbar__content-section,
+.pf-v5-c-toolbar__group,
+.pf-v5-c-toolbar__item,
+.pf-v5-c-toolbar__group.pf-m-chip-group-container,
+.pf-v5-c-toolbar__group.pf-m-chip-group, .pf-v5-c-divider {
   --pf-v5-hidden-visible--hidden--Display: none;
   --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   display: var(--pf-v5-hidden-visible--Display);
 }
-.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden, .pf-m-hidden.pf-v5-c-page__header-tools-item, .pf-m-hidden.pf-v5-c-page__header-tools-group, .pf-m-hidden.pf-v5-c-menu__group, .pf-m-hidden.pf-v5-c-menu__list-item, .pf-m-hidden.pf-v5-c-menu__list, .pf-m-hidden.pf-v5-c-data-list__item-action, .pf-m-hidden.pf-v5-c-toolbar__group, .pf-m-hidden.pf-v5-c-toolbar__item, .pf-m-hidden.pf-v5-c-toolbar__content, .pf-m-hidden.pf-v5-c-toolbar__content-section, .pf-m-hidden.pf-v5-c-divider {
+.pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden, .pf-m-hidden.pf-v5-c-page__header-tools-item, .pf-m-hidden.pf-v5-c-page__header-tools-group, .pf-m-hidden.pf-v5-c-menu__group, .pf-m-hidden.pf-v5-c-menu__list-item, .pf-m-hidden.pf-v5-c-menu__list, .pf-m-hidden.pf-v5-c-data-list__item-action, .pf-m-hidden.pf-v5-c-toolbar__content-section,
+.pf-m-hidden.pf-v5-c-toolbar__group,
+.pf-m-hidden.pf-v5-c-toolbar__item, .pf-m-hidden.pf-v5-c-divider {
   --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
 }
 @media screen and (min-width: 576px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-sm, .pf-m-hidden-on-sm.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-sm.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-sm.pf-v5-c-menu__group, .pf-m-hidden-on-sm.pf-v5-c-menu__list-item, .pf-m-hidden-on-sm.pf-v5-c-menu__list, .pf-m-hidden-on-sm.pf-v5-c-data-list__item-action, .pf-m-hidden-on-sm.pf-v5-c-toolbar__group, .pf-m-hidden-on-sm.pf-v5-c-toolbar__item, .pf-m-hidden-on-sm.pf-v5-c-toolbar__content, .pf-m-hidden-on-sm.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-sm.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-sm, .pf-m-hidden-on-sm.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-sm.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-sm.pf-v5-c-menu__group, .pf-m-hidden-on-sm.pf-v5-c-menu__list-item, .pf-m-hidden-on-sm.pf-v5-c-menu__list, .pf-m-hidden-on-sm.pf-v5-c-data-list__item-action, .pf-m-hidden-on-sm.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-sm.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-sm.pf-v5-c-toolbar__item, .pf-m-hidden-on-sm.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-sm, .pf-m-visible-on-sm.pf-v5-c-page__header-tools-item, .pf-m-visible-on-sm.pf-v5-c-page__header-tools-group, .pf-m-visible-on-sm.pf-v5-c-menu__group, .pf-m-visible-on-sm.pf-v5-c-menu__list-item, .pf-m-visible-on-sm.pf-v5-c-menu__list, .pf-m-visible-on-sm.pf-v5-c-data-list__item-action, .pf-m-visible-on-sm.pf-v5-c-toolbar__group, .pf-m-visible-on-sm.pf-v5-c-toolbar__item, .pf-m-visible-on-sm.pf-v5-c-toolbar__content, .pf-m-visible-on-sm.pf-v5-c-toolbar__content-section, .pf-m-visible-on-sm.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-sm, .pf-m-visible-on-sm.pf-v5-c-page__header-tools-item, .pf-m-visible-on-sm.pf-v5-c-page__header-tools-group, .pf-m-visible-on-sm.pf-v5-c-menu__group, .pf-m-visible-on-sm.pf-v5-c-menu__list-item, .pf-m-visible-on-sm.pf-v5-c-menu__list, .pf-m-visible-on-sm.pf-v5-c-data-list__item-action, .pf-m-visible-on-sm.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-sm.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-sm.pf-v5-c-toolbar__item, .pf-m-visible-on-sm.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 768px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-md, .pf-m-hidden-on-md.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-md.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-md.pf-v5-c-menu__group, .pf-m-hidden-on-md.pf-v5-c-menu__list-item, .pf-m-hidden-on-md.pf-v5-c-menu__list, .pf-m-hidden-on-md.pf-v5-c-data-list__item-action, .pf-m-hidden-on-md.pf-v5-c-toolbar__group, .pf-m-hidden-on-md.pf-v5-c-toolbar__item, .pf-m-hidden-on-md.pf-v5-c-toolbar__content, .pf-m-hidden-on-md.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-md.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-md, .pf-m-hidden-on-md.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-md.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-md.pf-v5-c-menu__group, .pf-m-hidden-on-md.pf-v5-c-menu__list-item, .pf-m-hidden-on-md.pf-v5-c-menu__list, .pf-m-hidden-on-md.pf-v5-c-data-list__item-action, .pf-m-hidden-on-md.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-md.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-md.pf-v5-c-toolbar__item, .pf-m-hidden-on-md.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-md, .pf-m-visible-on-md.pf-v5-c-page__header-tools-item, .pf-m-visible-on-md.pf-v5-c-page__header-tools-group, .pf-m-visible-on-md.pf-v5-c-menu__group, .pf-m-visible-on-md.pf-v5-c-menu__list-item, .pf-m-visible-on-md.pf-v5-c-menu__list, .pf-m-visible-on-md.pf-v5-c-data-list__item-action, .pf-m-visible-on-md.pf-v5-c-toolbar__group, .pf-m-visible-on-md.pf-v5-c-toolbar__item, .pf-m-visible-on-md.pf-v5-c-toolbar__content, .pf-m-visible-on-md.pf-v5-c-toolbar__content-section, .pf-m-visible-on-md.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-md, .pf-m-visible-on-md.pf-v5-c-page__header-tools-item, .pf-m-visible-on-md.pf-v5-c-page__header-tools-group, .pf-m-visible-on-md.pf-v5-c-menu__group, .pf-m-visible-on-md.pf-v5-c-menu__list-item, .pf-m-visible-on-md.pf-v5-c-menu__list, .pf-m-visible-on-md.pf-v5-c-data-list__item-action, .pf-m-visible-on-md.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-md.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-md.pf-v5-c-toolbar__item, .pf-m-visible-on-md.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 992px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-lg, .pf-m-hidden-on-lg.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-lg.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-lg.pf-v5-c-menu__group, .pf-m-hidden-on-lg.pf-v5-c-menu__list-item, .pf-m-hidden-on-lg.pf-v5-c-menu__list, .pf-m-hidden-on-lg.pf-v5-c-data-list__item-action, .pf-m-hidden-on-lg.pf-v5-c-toolbar__group, .pf-m-hidden-on-lg.pf-v5-c-toolbar__item, .pf-m-hidden-on-lg.pf-v5-c-toolbar__content, .pf-m-hidden-on-lg.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-lg.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-lg, .pf-m-hidden-on-lg.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-lg.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-lg.pf-v5-c-menu__group, .pf-m-hidden-on-lg.pf-v5-c-menu__list-item, .pf-m-hidden-on-lg.pf-v5-c-menu__list, .pf-m-hidden-on-lg.pf-v5-c-data-list__item-action, .pf-m-hidden-on-lg.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-lg.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-lg.pf-v5-c-toolbar__item, .pf-m-hidden-on-lg.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-lg, .pf-m-visible-on-lg.pf-v5-c-page__header-tools-item, .pf-m-visible-on-lg.pf-v5-c-page__header-tools-group, .pf-m-visible-on-lg.pf-v5-c-menu__group, .pf-m-visible-on-lg.pf-v5-c-menu__list-item, .pf-m-visible-on-lg.pf-v5-c-menu__list, .pf-m-visible-on-lg.pf-v5-c-data-list__item-action, .pf-m-visible-on-lg.pf-v5-c-toolbar__group, .pf-m-visible-on-lg.pf-v5-c-toolbar__item, .pf-m-visible-on-lg.pf-v5-c-toolbar__content, .pf-m-visible-on-lg.pf-v5-c-toolbar__content-section, .pf-m-visible-on-lg.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-lg, .pf-m-visible-on-lg.pf-v5-c-page__header-tools-item, .pf-m-visible-on-lg.pf-v5-c-page__header-tools-group, .pf-m-visible-on-lg.pf-v5-c-menu__group, .pf-m-visible-on-lg.pf-v5-c-menu__list-item, .pf-m-visible-on-lg.pf-v5-c-menu__list, .pf-m-visible-on-lg.pf-v5-c-data-list__item-action, .pf-m-visible-on-lg.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-lg.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-lg.pf-v5-c-toolbar__item, .pf-m-visible-on-lg.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 1200px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-xl, .pf-m-hidden-on-xl.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-xl.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-xl.pf-v5-c-menu__group, .pf-m-hidden-on-xl.pf-v5-c-menu__list-item, .pf-m-hidden-on-xl.pf-v5-c-menu__list, .pf-m-hidden-on-xl.pf-v5-c-data-list__item-action, .pf-m-hidden-on-xl.pf-v5-c-toolbar__group, .pf-m-hidden-on-xl.pf-v5-c-toolbar__item, .pf-m-hidden-on-xl.pf-v5-c-toolbar__content, .pf-m-hidden-on-xl.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-xl.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-xl, .pf-m-hidden-on-xl.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-xl.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-xl.pf-v5-c-menu__group, .pf-m-hidden-on-xl.pf-v5-c-menu__list-item, .pf-m-hidden-on-xl.pf-v5-c-menu__list, .pf-m-hidden-on-xl.pf-v5-c-data-list__item-action, .pf-m-hidden-on-xl.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-xl.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-xl.pf-v5-c-toolbar__item, .pf-m-hidden-on-xl.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-xl, .pf-m-visible-on-xl.pf-v5-c-page__header-tools-item, .pf-m-visible-on-xl.pf-v5-c-page__header-tools-group, .pf-m-visible-on-xl.pf-v5-c-menu__group, .pf-m-visible-on-xl.pf-v5-c-menu__list-item, .pf-m-visible-on-xl.pf-v5-c-menu__list, .pf-m-visible-on-xl.pf-v5-c-data-list__item-action, .pf-m-visible-on-xl.pf-v5-c-toolbar__group, .pf-m-visible-on-xl.pf-v5-c-toolbar__item, .pf-m-visible-on-xl.pf-v5-c-toolbar__content, .pf-m-visible-on-xl.pf-v5-c-toolbar__content-section, .pf-m-visible-on-xl.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-xl, .pf-m-visible-on-xl.pf-v5-c-page__header-tools-item, .pf-m-visible-on-xl.pf-v5-c-page__header-tools-group, .pf-m-visible-on-xl.pf-v5-c-menu__group, .pf-m-visible-on-xl.pf-v5-c-menu__list-item, .pf-m-visible-on-xl.pf-v5-c-menu__list, .pf-m-visible-on-xl.pf-v5-c-data-list__item-action, .pf-m-visible-on-xl.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-xl.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-xl.pf-v5-c-toolbar__item, .pf-m-visible-on-xl.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 1450px) {
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-2xl, .pf-m-hidden-on-2xl.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-2xl.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-2xl.pf-v5-c-menu__group, .pf-m-hidden-on-2xl.pf-v5-c-menu__list-item, .pf-m-hidden-on-2xl.pf-v5-c-menu__list, .pf-m-hidden-on-2xl.pf-v5-c-data-list__item-action, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__group, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__item, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__content, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__content-section, .pf-m-hidden-on-2xl.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-hidden-on-2xl, .pf-m-hidden-on-2xl.pf-v5-c-page__header-tools-item, .pf-m-hidden-on-2xl.pf-v5-c-page__header-tools-group, .pf-m-hidden-on-2xl.pf-v5-c-menu__group, .pf-m-hidden-on-2xl.pf-v5-c-menu__list-item, .pf-m-hidden-on-2xl.pf-v5-c-menu__list, .pf-m-hidden-on-2xl.pf-v5-c-data-list__item-action, .pf-m-hidden-on-2xl.pf-v5-c-toolbar__content-section,
+  .pf-m-hidden-on-2xl.pf-v5-c-toolbar__group,
+  .pf-m-hidden-on-2xl.pf-v5-c-toolbar__item, .pf-m-hidden-on-2xl.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--hidden--Display);
   }
-  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-2xl, .pf-m-visible-on-2xl.pf-v5-c-page__header-tools-item, .pf-m-visible-on-2xl.pf-v5-c-page__header-tools-group, .pf-m-visible-on-2xl.pf-v5-c-menu__group, .pf-m-visible-on-2xl.pf-v5-c-menu__list-item, .pf-m-visible-on-2xl.pf-v5-c-menu__list, .pf-m-visible-on-2xl.pf-v5-c-data-list__item-action, .pf-m-visible-on-2xl.pf-v5-c-toolbar__group, .pf-m-visible-on-2xl.pf-v5-c-toolbar__item, .pf-m-visible-on-2xl.pf-v5-c-toolbar__content, .pf-m-visible-on-2xl.pf-v5-c-toolbar__content-section, .pf-m-visible-on-2xl.pf-v5-c-divider {
+  .pf-v5-c-table tr:where(.pf-v5-c-table__tr) > .pf-m-visible-on-2xl, .pf-m-visible-on-2xl.pf-v5-c-page__header-tools-item, .pf-m-visible-on-2xl.pf-v5-c-page__header-tools-group, .pf-m-visible-on-2xl.pf-v5-c-menu__group, .pf-m-visible-on-2xl.pf-v5-c-menu__list-item, .pf-m-visible-on-2xl.pf-v5-c-menu__list, .pf-m-visible-on-2xl.pf-v5-c-data-list__item-action, .pf-m-visible-on-2xl.pf-v5-c-toolbar__content-section,
+  .pf-m-visible-on-2xl.pf-v5-c-toolbar__group,
+  .pf-m-visible-on-2xl.pf-v5-c-toolbar__item, .pf-m-visible-on-2xl.pf-v5-c-divider {
     --pf-v5-hidden-visible--Display: var(--pf-v5-hidden-visible--visible--Display);
   }
 }
@@ -17647,17 +19153,12 @@ ul.pf-v5-c-list {
 }
 
 :root,
-:where(.pf-v5-c-masthead) {
-  --pf-v5-c-masthead--inset: var(--pf-t--global--spacer--lg);
-  --pf-v5-c-masthead--PaddingBlockStart: var(--pf-t--global--spacer--md);
-  --pf-v5-c-masthead--PaddingBlockEnd: var(--pf-t--global--spacer--md);
-  --pf-v5-c-masthead--PaddingInlineStart: var(--pf-v5-c-masthead--inset);
-  --pf-v5-c-masthead--PaddingInlineEnd: var(--pf-v5-c-masthead--inset);
-  --pf-v5-c-masthead--AlignItems: start;
+[data-theme=pf-v5-c-masthead] {
   --pf-v5-c-masthead--RowGap: var(--pf-t--global--spacer--sm);
   --pf-v5-c-masthead--ColumnGap: var(--pf-t--global--spacer--md);
-  --pf-v5-c-masthead--BackgroundColor: var(--pf-t--global--background--color--secondary--default);
   --pf-v5-c-masthead--BorderWidth: var(--pf-t--global--border--width--divider--default);
+  --pf-v5-c-masthead--PaddingBlock: var(--pf-t--global--spacer--md);
+  --pf-v5-c-masthead--PaddingInline: var(--pf-t--global--spacer--lg);
   --pf-v5-c-masthead--BorderColor: var(--pf-t--global--border--color--default);
   --pf-v5-c-masthead__brand--MarginInlineEnd: var(--pf-t--global--spacer--md);
   --pf-v5-c-masthead__brand--MaxHeight: 2.375rem;
@@ -17678,21 +19179,15 @@ ul.pf-v5-c-list {
   --pf-v5-c-masthead--m-display-inline__content--Order: 0;
   --pf-v5-c-masthead__expandable-content--BoxShadow: var(--pf-t--global--box-shadow--md--bottom);
   --pf-v5-c-masthead__expandable-content--BorderBlockStart: var(--pf-v5-c-masthead--BorderWidth) solid var(--pf-v5-c-masthead--BorderColor);
+  --pf-v5-c-masthead--pf-v5-c-toolbar--Width: 100%;
+  --pf-v5-c-masthead--pf-v5-c-toolbar--PaddingBlock: 0;
+  --pf-v5-c-masthead--pf-v5-c-toolbar--PaddingInline: 0;
 }
 
 .pf-v5-c-masthead {
-  --pf-v5-c-toolbar--PaddingTop: 0;
-  --pf-v5-c-toolbar--PaddingBottom: 0;
-  --pf-v5-c-toolbar__content--PaddingRight: 0;
-  --pf-v5-c-toolbar__content--PaddingLeft: 0;
-  --pf-v5-c-toolbar__expandable-content--PaddingTop: var(--pf-t--global--spacer--md);
-  --pf-v5-c-toolbar__expandable-content--PaddingRight: var(--pf-v5-c-masthead--inset);
-  --pf-v5-c-toolbar__expandable-content--PaddingBottom: var(--pf-t--global--spacer--md);
-  --pf-v5-c-toolbar__expandable-content--PaddingLeft: var(--pf-v5-c-masthead--inset);
-  --pf-v5-c-toolbar__expandable-content--BackgroundColor: var(--pf-v5-c-masthead--BackgroundColor);
-  --pf-v5-c-toolbar__expandable-content--lg--PaddingRight: var(--pf-v5-c-masthead--PaddingInlineStart);
-  --pf-v5-c-toolbar__expandable-content--lg--PaddingBottom: var(--pf-t--global--spacer--md);
-  --pf-v5-c-toolbar__expandable-content--lg--PaddingLeft: var(--pf-v5-c-masthead--PaddingInlineEnd);
+  --pf-v5-c-toolbar--Width: var(--pf-v5-c-masthead--pf-v5-c-toolbar--Width);
+  --pf-v5-c-toolbar__content--PaddingBlock: var(--pf-v5-c-masthead--pf-v5-c-toolbar--PaddingBlock);
+  --pf-v5-c-toolbar__content--PaddingInline: var(--pf-v5-c-masthead--pf-v5-c-toolbar--PaddingInline);
   --pf-v5-c-masthead--GridTemplateColumns: var(--pf-v5-c-masthead--m-display-stack--GridTemplateColumns);
   --pf-v5-c-masthead__main--GridColumn: var(--pf-v5-c-masthead--m-display-stack__main--GridColumn);
   --pf-v5-c-masthead__main--Order: var(--pf-v5-c-masthead--m-display-stack__main--Order);
@@ -17704,13 +19199,13 @@ ul.pf-v5-c-list {
   grid-template-columns: var(--pf-v5-c-masthead--GridTemplateColumns);
   row-gap: var(--pf-v5-c-masthead--RowGap);
   column-gap: var(--pf-v5-c-masthead--ColumnGap);
-  align-items: var(--pf-v5-c-masthead--AlignItems);
+  align-items: start;
   min-width: 0;
-  padding-block-start: var(--pf-v5-c-masthead--PaddingBlockStart);
-  padding-block-end: var(--pf-v5-c-masthead--PaddingBlockEnd);
-  padding-inline-start: var(--pf-v5-c-masthead--inset);
-  padding-inline-end: var(--pf-v5-c-masthead--inset);
-  background-color: var(--pf-v5-c-masthead--BackgroundColor);
+  padding-block-start: var(--pf-v5-c-masthead--PaddingBlockStart, var(--pf-v5-c-masthead--PaddingBlock));
+  padding-block-end: var(--pf-v5-c-masthead--PaddingBlockEnd, var(--pf-v5-c-masthead--PaddingBlock));
+  padding-inline-start: var(--pf-v5-c-masthead--PaddingInlineStart, var(--pf-v5-c-masthead--PaddingInline));
+  padding-inline-end: var(--pf-v5-c-masthead--PaddingInlineEnd, var(--pf-v5-c-masthead--PaddingInline));
+  background-color: var(--pf-v5-c-masthead--BackgroundColor, var(--pf-t--global--background--color--secondary--default));
 }
 @media screen and (min-width: 768px) {
   :where(:not(.pf-m-resize-observer)) .pf-v5-c-masthead {
@@ -17723,9 +19218,6 @@ ul.pf-v5-c-list {
     --pf-v5-c-masthead__content--Order: var(--pf-v5-c-masthead--m-display-inline__content--Order);
   }
 }
-.pf-v5-c-masthead .pf-v5-c-toolbar {
-  width: 100%;
-}
 .pf-v5-c-masthead .pf-v5-c-toolbar__expandable-content {
   inset-block-start: 100%;
   border-block-start: var(--pf-v5-c-masthead__expandable-content--BorderBlockStart);
@@ -20473,71 +21965,41 @@ label.pf-v5-c-menu__item:where(:not([disabled], .pf-m-disabled, .pf-m-aria-disab
   background: transparent;
 }
 
+:root {
+  --pf-v5-c-overflow-menu--ColumnGap: var(--pf-t--global--spacer--md);
+  --pf-v5-c-overflow-menu__group--ColumnGap: var(--pf-t--global--spacer--md);
+  --pf-v5-c-overflow-menu__group--m-button-group--ColumnGap: var(--pf-t--global--spacer--sm);
+  --pf-v5-c-overflow-menu__group--m-icon-button-group--ColumnGap: var(--pf-t--global--spacer--xs);
+}
+
 .pf-v5-c-overflow-menu {
-  --pf-v5-c-overflow-menu--spacer--base: var(--pf-v5-global--spacer--md);
-  --pf-v5-c-overflow-menu--spacer: var(--pf-v5-global--spacer--sm);
-  --pf-v5-c-overflow-menu__group--spacer: var(--pf-v5-c-overflow-menu--spacer--base);
-  --pf-v5-c-overflow-menu__item--spacer: var(--pf-v5-c-overflow-menu--spacer--base);
-  --pf-v5-c-overflow-menu--c-divider--m-vertical--spacer: var(--pf-v5-c-overflow-menu--spacer--base);
-  --pf-v5-c-overflow-menu__group--m-button-group--spacer: var(--pf-v5-c-overflow-menu--spacer--base);
-  --pf-v5-c-overflow-menu__group--m-button-group--space-items: var(--pf-v5-global--spacer--sm);
-  --pf-v5-c-overflow-menu__group--m-icon-button-group--spacer: var(--pf-v5-c-overflow-menu--spacer--base);
-  --pf-v5-c-overflow-menu__group--m-icon-button-group--space-items: 0;
   display: inline-flex;
-  align-items: center;
+  column-gap: var(--pf-v5-c-overflow-menu--ColumnGap);
 }
 
-.pf-v5-c-overflow-menu__content {
+.pf-v5-c-overflow-menu__content,
+.pf-v5-c-overflow-menu__group {
   display: flex;
-  align-items: center;
+  align-items: start;
 }
 
 .pf-v5-c-overflow-menu__group {
-  --pf-v5-c-overflow-menu--spacer: var(--pf-v5-c-overflow-menu__group--spacer);
-  display: flex;
-  align-items: center;
+  column-gap: var(--pf-v5-c-overflow-menu__group--ColumnGap);
 }
 .pf-v5-c-overflow-menu__group.pf-m-button-group {
-  --pf-v5-c-overflow-menu--spacer: var(--pf-v5-c-overflow-menu__group--m-button-group--spacer);
-}
-.pf-v5-c-overflow-menu__group.pf-m-button-group > * {
-  --pf-v5-c-overflow-menu--spacer: var(--pf-v5-c-overflow-menu__group--m-button-group--space-items);
+  column-gap: var(--pf-v5-c-overflow-menu__group--m-button-group--ColumnGap);
 }
 .pf-v5-c-overflow-menu__group.pf-m-icon-button-group {
-  --pf-v5-c-overflow-menu--spacer: var(--pf-v5-c-overflow-menu__group--m-icon-button-group--spacer);
-}
-.pf-v5-c-overflow-menu__group.pf-m-icon-button-group > * {
-  --pf-v5-c-overflow-menu--spacer: var(--pf-v5-c-overflow-menu__group--m-icon-button-group--space-items);
+  column-gap: var(--pf-v5-c-overflow-menu__group--m-icon-button-group--ColumnGap);
 }
 
 .pf-v5-c-overflow-menu__item {
-  --pf-v5-c-overflow-menu--spacer: var(--pf-v5-c-overflow-menu__item--spacer);
+  column-gap: var(--pf-v5-c-overflow-menu__item--ColumnGap, var(--pf-v5-c-overflow-menu--ColumnGap));
 }
 
 .pf-v5-c-overflow-menu__content,
-.pf-v5-c-overflow-menu__control,
-.pf-v5-c-overflow-menu__group,
-.pf-v5-c-overflow-menu__item {
-  margin-inline-end: var(--pf-v5-c-overflow-menu--spacer);
-}
-.pf-v5-c-overflow-menu__content:last-child,
-.pf-v5-c-overflow-menu__control:last-child,
-.pf-v5-c-overflow-menu__group:last-child,
-.pf-v5-c-overflow-menu__item:last-child {
-  --pf-v5-c-overflow-menu--spacer: 0;
-}
-
-.pf-v5-c-overflow-menu > .pf-v5-c-divider,
-.pf-v5-c-overflow-menu__group > .pf-v5-c-divider {
-  --pf-v5-c-overflow-menu--spacer: var(--pf-v5-c-overflow-menu--c-divider--m-vertical--spacer);
-}
-.pf-v5-c-overflow-menu > .pf-v5-c-divider.pf-m-vertical,
-.pf-v5-c-overflow-menu__group > .pf-v5-c-divider.pf-m-vertical {
-  margin-inline-end: var(--pf-v5-c-overflow-menu--spacer);
-}
-.pf-v5-c-overflow-menu > .pf-v5-c-divider.pf-m-vertical:last-child,
-.pf-v5-c-overflow-menu__group > .pf-v5-c-divider.pf-m-vertical:last-child {
-  --pf-v5-c-overflow-menu--spacer: 0;
+.pf-v5-c-overflow-menu__control {
+  column-gap: var(--pf-v5-c-overflow-menu--ColumnGap);
 }
 
 :root {
@@ -21440,7 +22902,8 @@ label.pf-v5-c-menu__item:where(:not([disabled], .pf-m-disabled, .pf-m-aria-disab
   flex: 1 0 auto;
 }
 
-:root {
+:where(:root),
+:where(.pf-v5-c-pagination) {
   --pf-v5-c-pagination--inset: 0;
   --pf-v5-c-pagination--ColumnGap: var(--pf-t--global--spacer--lg);
   --pf-v5-c-pagination--m-page-insets--inset: var(--pf-t--global--spacer--md);
@@ -21480,7 +22943,8 @@ label.pf-v5-c-menu__item:where(:not([disabled], .pf-m-disabled, .pf-m-aria-disab
   --pf-v5-c-pagination--m-display-full__page-menu--Display: inline-flex;
 }
 @media screen and (min-width: 768px) {
-  :root {
+  :where(:root),
+  :where(.pf-v5-c-pagination) {
     --pf-v5-c-pagination--m-bottom--BoxShadow: none;
     --pf-v5-c-pagination__page-menu--Display: inline-flex;
     --pf-v5-c-pagination__nav--Display: inline-flex;
@@ -21488,7 +22952,8 @@ label.pf-v5-c-menu__item:where(:not([disabled], .pf-m-disabled, .pf-m-aria-disab
   }
 }
 @media screen and (min-width: 1200px) {
-  :root {
+  :where(:root),
+  :where(.pf-v5-c-pagination) {
     --pf-v5-c-pagination--m-bottom--PaddingRight: var(--pf-v5-c-pagination--m-bottom--xl--PaddingRight);
     --pf-v5-c-pagination--m-bottom--PaddingLeft: var(--pf-v5-c-pagination--m-bottom--xl--PaddingLeft);
     --pf-v5-c-pagination__scroll-button--Width: var(--pf-v5-c-pagination__scroll-button--xl--Width);