@patternfly/react-styles 6.0.0-alpha.27 → 6.0.0-alpha.28

package/css/components/Toolbar/toolbar.css

@@ -34,9 +34,7 @@
 
 .pf-v6-c-toolbar__content-section,
 .pf-v6-c-toolbar__group,
-.pf-v6-c-toolbar__item,
-.pf-v6-c-toolbar__group.pf-m-label-group-container,
-.pf-v6-c-toolbar__group.pf-m-label-group {
+.pf-v6-c-toolbar__item {
   --pf-v6-hidden-visible--visible--Display: flex;
   --pf-v6-hidden-visible--hidden--Display: none;
   --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--visible--Display);
@@ -45,88 +43,66 @@
 }
 .pf-v6-c-toolbar__content-section.pf-m-hidden,
 .pf-v6-c-toolbar__group.pf-m-hidden,
-.pf-v6-c-toolbar__item.pf-m-hidden,
-.pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-hidden,
-.pf-v6-c-toolbar__group.pf-m-label-group.pf-m-hidden {
+.pf-v6-c-toolbar__item.pf-m-hidden {
   --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--hidden--Display);
 }
 @media screen and (min-width: 576px) {
   .pf-v6-c-toolbar__content-section.pf-m-hidden-on-sm,
   .pf-v6-c-toolbar__group.pf-m-hidden-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-hidden-on-sm,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-hidden-on-sm,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-hidden-on-sm {
+  .pf-v6-c-toolbar__item.pf-m-hidden-on-sm {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--hidden--Display);
   }
   .pf-v6-c-toolbar__content-section.pf-m-visible-on-sm,
   .pf-v6-c-toolbar__group.pf-m-visible-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-visible-on-sm,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-visible-on-sm,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-visible-on-sm {
+  .pf-v6-c-toolbar__item.pf-m-visible-on-sm {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 768px) {
   .pf-v6-c-toolbar__content-section.pf-m-hidden-on-md,
   .pf-v6-c-toolbar__group.pf-m-hidden-on-md,
-  .pf-v6-c-toolbar__item.pf-m-hidden-on-md,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-hidden-on-md,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-hidden-on-md {
+  .pf-v6-c-toolbar__item.pf-m-hidden-on-md {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--hidden--Display);
   }
   .pf-v6-c-toolbar__content-section.pf-m-visible-on-md,
   .pf-v6-c-toolbar__group.pf-m-visible-on-md,
-  .pf-v6-c-toolbar__item.pf-m-visible-on-md,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-visible-on-md,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-visible-on-md {
+  .pf-v6-c-toolbar__item.pf-m-visible-on-md {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 992px) {
   .pf-v6-c-toolbar__content-section.pf-m-hidden-on-lg,
   .pf-v6-c-toolbar__group.pf-m-hidden-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-hidden-on-lg,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-hidden-on-lg,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-hidden-on-lg {
+  .pf-v6-c-toolbar__item.pf-m-hidden-on-lg {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--hidden--Display);
   }
   .pf-v6-c-toolbar__content-section.pf-m-visible-on-lg,
   .pf-v6-c-toolbar__group.pf-m-visible-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-visible-on-lg,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-visible-on-lg,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-visible-on-lg {
+  .pf-v6-c-toolbar__item.pf-m-visible-on-lg {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 1200px) {
   .pf-v6-c-toolbar__content-section.pf-m-hidden-on-xl,
   .pf-v6-c-toolbar__group.pf-m-hidden-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-hidden-on-xl,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-hidden-on-xl,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-hidden-on-xl {
+  .pf-v6-c-toolbar__item.pf-m-hidden-on-xl {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--hidden--Display);
   }
   .pf-v6-c-toolbar__content-section.pf-m-visible-on-xl,
   .pf-v6-c-toolbar__group.pf-m-visible-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-visible-on-xl,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-visible-on-xl,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-visible-on-xl {
+  .pf-v6-c-toolbar__item.pf-m-visible-on-xl {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--visible--Display);
   }
 }
 @media screen and (min-width: 1450px) {
   .pf-v6-c-toolbar__content-section.pf-m-hidden-on-2xl,
   .pf-v6-c-toolbar__group.pf-m-hidden-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-hidden-on-2xl,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-hidden-on-2xl,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-hidden-on-2xl {
+  .pf-v6-c-toolbar__item.pf-m-hidden-on-2xl {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--hidden--Display);
   }
   .pf-v6-c-toolbar__content-section.pf-m-visible-on-2xl,
   .pf-v6-c-toolbar__group.pf-m-visible-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-visible-on-2xl,
-  .pf-v6-c-toolbar__group.pf-m-label-group-container.pf-m-visible-on-2xl,
-  .pf-v6-c-toolbar__group.pf-m-label-group.pf-m-visible-on-2xl {
+  .pf-v6-c-toolbar__item.pf-m-visible-on-2xl {
     --pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--visible--Display);
   }
 }
@@ -523,64 +499,55 @@
 .pf-v6-c-toolbar__item.pf-m-gap-none,
 .pf-v6-c-toolbar__content.pf-m-gap-none,
 .pf-v6-c-toolbar__content-section.pf-m-gap-none {
-  row-gap: 0;
-  column-gap: 0;
+  gap: 0;
 }
 .pf-v6-c-toolbar__group.pf-m-gap-xs,
 .pf-v6-c-toolbar__item.pf-m-gap-xs,
 .pf-v6-c-toolbar__content.pf-m-gap-xs,
 .pf-v6-c-toolbar__content-section.pf-m-gap-xs {
-  row-gap: var(--pf-t--global--spacer--xs);
-  column-gap: var(--pf-t--global--spacer--xs);
+  gap: var(--pf-t--global--spacer--xs);
 }
 .pf-v6-c-toolbar__group.pf-m-gap-sm,
 .pf-v6-c-toolbar__item.pf-m-gap-sm,
 .pf-v6-c-toolbar__content.pf-m-gap-sm,
 .pf-v6-c-toolbar__content-section.pf-m-gap-sm {
-  row-gap: var(--pf-t--global--spacer--sm);
-  column-gap: var(--pf-t--global--spacer--sm);
+  gap: var(--pf-t--global--spacer--sm);
 }
 .pf-v6-c-toolbar__group.pf-m-gap-md,
 .pf-v6-c-toolbar__item.pf-m-gap-md,
 .pf-v6-c-toolbar__content.pf-m-gap-md,
 .pf-v6-c-toolbar__content-section.pf-m-gap-md {
-  row-gap: var(--pf-t--global--spacer--md);
-  column-gap: var(--pf-t--global--spacer--md);
+  gap: var(--pf-t--global--spacer--md);
 }
 .pf-v6-c-toolbar__group.pf-m-gap-lg,
 .pf-v6-c-toolbar__item.pf-m-gap-lg,
 .pf-v6-c-toolbar__content.pf-m-gap-lg,
 .pf-v6-c-toolbar__content-section.pf-m-gap-lg {
-  row-gap: var(--pf-t--global--spacer--lg);
-  column-gap: var(--pf-t--global--spacer--lg);
+  gap: var(--pf-t--global--spacer--lg);
 }
 .pf-v6-c-toolbar__group.pf-m-gap-xl,
 .pf-v6-c-toolbar__item.pf-m-gap-xl,
 .pf-v6-c-toolbar__content.pf-m-gap-xl,
 .pf-v6-c-toolbar__content-section.pf-m-gap-xl {
-  row-gap: var(--pf-t--global--spacer--xl);
-  column-gap: var(--pf-t--global--spacer--xl);
+  gap: var(--pf-t--global--spacer--xl);
 }
 .pf-v6-c-toolbar__group.pf-m-gap-2xl,
 .pf-v6-c-toolbar__item.pf-m-gap-2xl,
 .pf-v6-c-toolbar__content.pf-m-gap-2xl,
 .pf-v6-c-toolbar__content-section.pf-m-gap-2xl {
-  row-gap: var(--pf-t--global--spacer--2xl);
-  column-gap: var(--pf-t--global--spacer--2xl);
+  gap: var(--pf-t--global--spacer--2xl);
 }
 .pf-v6-c-toolbar__group.pf-m-gap-3xl,
 .pf-v6-c-toolbar__item.pf-m-gap-3xl,
 .pf-v6-c-toolbar__content.pf-m-gap-3xl,
 .pf-v6-c-toolbar__content-section.pf-m-gap-3xl {
-  row-gap: var(--pf-t--global--spacer--3xl);
-  column-gap: var(--pf-t--global--spacer--3xl);
+  gap: var(--pf-t--global--spacer--3xl);
 }
 .pf-v6-c-toolbar__group.pf-m-gap-4xl,
 .pf-v6-c-toolbar__item.pf-m-gap-4xl,
 .pf-v6-c-toolbar__content.pf-m-gap-4xl,
 .pf-v6-c-toolbar__content-section.pf-m-gap-4xl {
-  row-gap: var(--pf-t--global--spacer--4xl);
-  column-gap: var(--pf-t--global--spacer--4xl);
+  gap: var(--pf-t--global--spacer--4xl);
 }
 .pf-v6-c-toolbar__group.pf-m-column-gap-none,
 .pf-v6-c-toolbar__item.pf-m-column-gap-none,
@@ -594,18 +561,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-none {
   row-gap: 0;
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-startnone,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-startnone,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-startnone,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-startnone {
-  margin-inline-start: 0;
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-endnone,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-endnone,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-endnone,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-endnone {
-  margin-inline-end: 0;
-}
 .pf-v6-c-toolbar__group.pf-m-column-gap-xs,
 .pf-v6-c-toolbar__item.pf-m-column-gap-xs,
 .pf-v6-c-toolbar__content.pf-m-column-gap-xs,
@@ -618,18 +573,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-xs {
   row-gap: var(--pf-t--global--spacer--xs);
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-startxs,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-startxs,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-startxs,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxs {
-  margin-inline-start: var(--pf-t--global--spacer--xs);
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-endxs,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-endxs,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-endxs,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxs {
-  margin-inline-end: var(--pf-t--global--spacer--xs);
-}
 .pf-v6-c-toolbar__group.pf-m-column-gap-sm,
 .pf-v6-c-toolbar__item.pf-m-column-gap-sm,
 .pf-v6-c-toolbar__content.pf-m-column-gap-sm,
@@ -642,18 +585,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-sm {
   row-gap: var(--pf-t--global--spacer--sm);
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-startsm,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-startsm,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-startsm,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-startsm {
-  margin-inline-start: var(--pf-t--global--spacer--sm);
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-endsm,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-endsm,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-endsm,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-endsm {
-  margin-inline-end: var(--pf-t--global--spacer--sm);
-}
 .pf-v6-c-toolbar__group.pf-m-column-gap-md,
 .pf-v6-c-toolbar__item.pf-m-column-gap-md,
 .pf-v6-c-toolbar__content.pf-m-column-gap-md,
@@ -666,18 +597,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-md {
   row-gap: var(--pf-t--global--spacer--md);
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-startmd,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-startmd,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-startmd,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-startmd {
-  margin-inline-start: var(--pf-t--global--spacer--md);
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-endmd,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-endmd,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-endmd,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-endmd {
-  margin-inline-end: var(--pf-t--global--spacer--md);
-}
 .pf-v6-c-toolbar__group.pf-m-column-gap-lg,
 .pf-v6-c-toolbar__item.pf-m-column-gap-lg,
 .pf-v6-c-toolbar__content.pf-m-column-gap-lg,
@@ -690,18 +609,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-lg {
   row-gap: var(--pf-t--global--spacer--lg);
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-startlg,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-startlg,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-startlg,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-startlg {
-  margin-inline-start: var(--pf-t--global--spacer--lg);
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-endlg,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-endlg,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-endlg,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-endlg {
-  margin-inline-end: var(--pf-t--global--spacer--lg);
-}
 .pf-v6-c-toolbar__group.pf-m-column-gap-xl,
 .pf-v6-c-toolbar__item.pf-m-column-gap-xl,
 .pf-v6-c-toolbar__content.pf-m-column-gap-xl,
@@ -714,18 +621,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-xl {
   row-gap: var(--pf-t--global--spacer--xl);
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-startxl,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-startxl,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-startxl,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxl {
-  margin-inline-start: var(--pf-t--global--spacer--xl);
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-endxl,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-endxl,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-endxl,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxl {
-  margin-inline-end: var(--pf-t--global--spacer--xl);
-}
 .pf-v6-c-toolbar__group.pf-m-column-gap-2xl,
 .pf-v6-c-toolbar__item.pf-m-column-gap-2xl,
 .pf-v6-c-toolbar__content.pf-m-column-gap-2xl,
@@ -738,18 +633,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-2xl {
   row-gap: var(--pf-t--global--spacer--2xl);
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-start2xl,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-start2xl,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-start2xl,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-start2xl {
-  margin-inline-start: var(--pf-t--global--spacer--2xl);
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-end2xl,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-end2xl,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-end2xl,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-end2xl {
-  margin-inline-end: var(--pf-t--global--spacer--2xl);
-}
 .pf-v6-c-toolbar__group.pf-m-column-gap-3xl,
 .pf-v6-c-toolbar__item.pf-m-column-gap-3xl,
 .pf-v6-c-toolbar__content.pf-m-column-gap-3xl,
@@ -762,18 +645,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-3xl {
   row-gap: var(--pf-t--global--spacer--3xl);
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-start3xl,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-start3xl,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-start3xl,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-start3xl {
-  margin-inline-start: var(--pf-t--global--spacer--3xl);
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-end3xl,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-end3xl,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-end3xl,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-end3xl {
-  margin-inline-end: var(--pf-t--global--spacer--3xl);
-}
 .pf-v6-c-toolbar__group.pf-m-column-gap-4xl,
 .pf-v6-c-toolbar__item.pf-m-column-gap-4xl,
 .pf-v6-c-toolbar__content.pf-m-column-gap-4xl,
@@ -786,18 +657,6 @@
 .pf-v6-c-toolbar__content-section.pf-m-row-gap-4xl {
   row-gap: var(--pf-t--global--spacer--4xl);
 }
-.pf-v6-c-toolbar__group.pf-m-margin-inline-start4xl,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-start4xl,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-start4xl,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-start4xl {
-  margin-inline-start: var(--pf-t--global--spacer--4xl);
-}
-.pf-v6-c-toolbar__group.pf-m-margin-inline-end4xl,
-.pf-v6-c-toolbar__item.pf-m-margin-inline-end4xl,
-.pf-v6-c-toolbar__content.pf-m-margin-inline-end4xl,
-.pf-v6-c-toolbar__content-section.pf-m-margin-inline-end4xl {
-  margin-inline-end: var(--pf-t--global--spacer--4xl);
-}
 
 .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show .pf-v6-c-toolbar__group,
 .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show .pf-v6-c-toolbar__item {
@@ -945,64 +804,55 @@
   .pf-v6-c-toolbar__item.pf-m-gap-none-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-none-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-none-on-sm {
-    row-gap: 0;
-    column-gap: 0;
+    gap: 0;
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xs-on-sm,
   .pf-v6-c-toolbar__item.pf-m-gap-xs-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-xs-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xs-on-sm {
-    row-gap: var(--pf-t--global--spacer--xs);
-    column-gap: var(--pf-t--global--spacer--xs);
+    gap: var(--pf-t--global--spacer--xs);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-sm-on-sm,
   .pf-v6-c-toolbar__item.pf-m-gap-sm-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-sm-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-sm-on-sm {
-    row-gap: var(--pf-t--global--spacer--sm);
-    column-gap: var(--pf-t--global--spacer--sm);
+    gap: var(--pf-t--global--spacer--sm);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-md-on-sm,
   .pf-v6-c-toolbar__item.pf-m-gap-md-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-md-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-md-on-sm {
-    row-gap: var(--pf-t--global--spacer--md);
-    column-gap: var(--pf-t--global--spacer--md);
+    gap: var(--pf-t--global--spacer--md);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-lg-on-sm,
   .pf-v6-c-toolbar__item.pf-m-gap-lg-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-lg-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-lg-on-sm {
-    row-gap: var(--pf-t--global--spacer--lg);
-    column-gap: var(--pf-t--global--spacer--lg);
+    gap: var(--pf-t--global--spacer--lg);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xl-on-sm,
   .pf-v6-c-toolbar__item.pf-m-gap-xl-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-xl-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xl-on-sm {
-    row-gap: var(--pf-t--global--spacer--xl);
-    column-gap: var(--pf-t--global--spacer--xl);
+    gap: var(--pf-t--global--spacer--xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-2xl-on-sm,
   .pf-v6-c-toolbar__item.pf-m-gap-2xl-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-2xl-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-2xl-on-sm {
-    row-gap: var(--pf-t--global--spacer--2xl);
-    column-gap: var(--pf-t--global--spacer--2xl);
+    gap: var(--pf-t--global--spacer--2xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-3xl-on-sm,
   .pf-v6-c-toolbar__item.pf-m-gap-3xl-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-3xl-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-3xl-on-sm {
-    row-gap: var(--pf-t--global--spacer--3xl);
-    column-gap: var(--pf-t--global--spacer--3xl);
+    gap: var(--pf-t--global--spacer--3xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-4xl-on-sm,
   .pf-v6-c-toolbar__item.pf-m-gap-4xl-on-sm,
   .pf-v6-c-toolbar__content.pf-m-gap-4xl-on-sm,
   .pf-v6-c-toolbar__content-section.pf-m-gap-4xl-on-sm {
-    row-gap: var(--pf-t--global--spacer--4xl);
-    column-gap: var(--pf-t--global--spacer--4xl);
+    gap: var(--pf-t--global--spacer--4xl);
   }
   .pf-v6-c-toolbar__group.pf-m-column-gap-none-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-none-on-sm,
@@ -1016,18 +866,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-none-on-sm {
     row-gap: 0;
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startnone-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startnone-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startnone-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startnone-on-sm {
-    margin-inline-start: 0;
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endnone-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endnone-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endnone-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endnone-on-sm {
-    margin-inline-end: 0;
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xs-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xs-on-sm,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xs-on-sm,
@@ -1040,18 +878,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xs-on-sm {
     row-gap: var(--pf-t--global--spacer--xs);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxs-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxs-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxs-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxs-on-sm {
-    margin-inline-start: var(--pf-t--global--spacer--xs);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxs-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxs-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxs-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxs-on-sm {
-    margin-inline-end: var(--pf-t--global--spacer--xs);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-sm-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-sm-on-sm,
   .pf-v6-c-toolbar__content.pf-m-column-gap-sm-on-sm,
@@ -1064,18 +890,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-sm-on-sm {
     row-gap: var(--pf-t--global--spacer--sm);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startsm-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startsm-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startsm-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startsm-on-sm {
-    margin-inline-start: var(--pf-t--global--spacer--sm);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endsm-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endsm-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endsm-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endsm-on-sm {
-    margin-inline-end: var(--pf-t--global--spacer--sm);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-md-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-md-on-sm,
   .pf-v6-c-toolbar__content.pf-m-column-gap-md-on-sm,
@@ -1088,18 +902,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-md-on-sm {
     row-gap: var(--pf-t--global--spacer--md);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startmd-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startmd-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startmd-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startmd-on-sm {
-    margin-inline-start: var(--pf-t--global--spacer--md);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endmd-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endmd-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endmd-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endmd-on-sm {
-    margin-inline-end: var(--pf-t--global--spacer--md);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-lg-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-lg-on-sm,
   .pf-v6-c-toolbar__content.pf-m-column-gap-lg-on-sm,
@@ -1112,18 +914,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-lg-on-sm {
     row-gap: var(--pf-t--global--spacer--lg);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startlg-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startlg-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startlg-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startlg-on-sm {
-    margin-inline-start: var(--pf-t--global--spacer--lg);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endlg-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endlg-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endlg-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endlg-on-sm {
-    margin-inline-end: var(--pf-t--global--spacer--lg);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xl-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xl-on-sm,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xl-on-sm,
@@ -1136,18 +926,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xl-on-sm {
     row-gap: var(--pf-t--global--spacer--xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxl-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxl-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxl-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxl-on-sm {
-    margin-inline-start: var(--pf-t--global--spacer--xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxl-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxl-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxl-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxl-on-sm {
-    margin-inline-end: var(--pf-t--global--spacer--xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-2xl-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-2xl-on-sm,
   .pf-v6-c-toolbar__content.pf-m-column-gap-2xl-on-sm,
@@ -1160,18 +938,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-2xl-on-sm {
     row-gap: var(--pf-t--global--spacer--2xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start2xl-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start2xl-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start2xl-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-sm {
-    margin-inline-start: var(--pf-t--global--spacer--2xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end2xl-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end2xl-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end2xl-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-sm {
-    margin-inline-end: var(--pf-t--global--spacer--2xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-3xl-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-3xl-on-sm,
   .pf-v6-c-toolbar__content.pf-m-column-gap-3xl-on-sm,
@@ -1184,18 +950,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-3xl-on-sm {
     row-gap: var(--pf-t--global--spacer--3xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start3xl-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start3xl-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start3xl-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-sm {
-    margin-inline-start: var(--pf-t--global--spacer--3xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end3xl-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end3xl-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end3xl-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-sm {
-    margin-inline-end: var(--pf-t--global--spacer--3xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-4xl-on-sm,
   .pf-v6-c-toolbar__item.pf-m-column-gap-4xl-on-sm,
   .pf-v6-c-toolbar__content.pf-m-column-gap-4xl-on-sm,
@@ -1208,18 +962,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-4xl-on-sm {
     row-gap: var(--pf-t--global--spacer--4xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start4xl-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start4xl-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start4xl-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-sm {
-    margin-inline-start: var(--pf-t--global--spacer--4xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end4xl-on-sm,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end4xl-on-sm,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end4xl-on-sm,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-sm {
-    margin-inline-end: var(--pf-t--global--spacer--4xl);
-  }
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-sm .pf-v6-c-toolbar__group,
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-sm .pf-v6-c-toolbar__item {
     display: flex;
@@ -1366,64 +1108,55 @@
   .pf-v6-c-toolbar__item.pf-m-gap-none-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-none-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-none-on-md {
-    row-gap: 0;
-    column-gap: 0;
+    gap: 0;
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xs-on-md,
   .pf-v6-c-toolbar__item.pf-m-gap-xs-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-xs-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xs-on-md {
-    row-gap: var(--pf-t--global--spacer--xs);
-    column-gap: var(--pf-t--global--spacer--xs);
+    gap: var(--pf-t--global--spacer--xs);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-sm-on-md,
   .pf-v6-c-toolbar__item.pf-m-gap-sm-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-sm-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-sm-on-md {
-    row-gap: var(--pf-t--global--spacer--sm);
-    column-gap: var(--pf-t--global--spacer--sm);
+    gap: var(--pf-t--global--spacer--sm);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-md-on-md,
   .pf-v6-c-toolbar__item.pf-m-gap-md-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-md-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-md-on-md {
-    row-gap: var(--pf-t--global--spacer--md);
-    column-gap: var(--pf-t--global--spacer--md);
+    gap: var(--pf-t--global--spacer--md);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-lg-on-md,
   .pf-v6-c-toolbar__item.pf-m-gap-lg-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-lg-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-lg-on-md {
-    row-gap: var(--pf-t--global--spacer--lg);
-    column-gap: var(--pf-t--global--spacer--lg);
+    gap: var(--pf-t--global--spacer--lg);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xl-on-md,
   .pf-v6-c-toolbar__item.pf-m-gap-xl-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-xl-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xl-on-md {
-    row-gap: var(--pf-t--global--spacer--xl);
-    column-gap: var(--pf-t--global--spacer--xl);
+    gap: var(--pf-t--global--spacer--xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-2xl-on-md,
   .pf-v6-c-toolbar__item.pf-m-gap-2xl-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-2xl-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-2xl-on-md {
-    row-gap: var(--pf-t--global--spacer--2xl);
-    column-gap: var(--pf-t--global--spacer--2xl);
+    gap: var(--pf-t--global--spacer--2xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-3xl-on-md,
   .pf-v6-c-toolbar__item.pf-m-gap-3xl-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-3xl-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-3xl-on-md {
-    row-gap: var(--pf-t--global--spacer--3xl);
-    column-gap: var(--pf-t--global--spacer--3xl);
+    gap: var(--pf-t--global--spacer--3xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-4xl-on-md,
   .pf-v6-c-toolbar__item.pf-m-gap-4xl-on-md,
   .pf-v6-c-toolbar__content.pf-m-gap-4xl-on-md,
   .pf-v6-c-toolbar__content-section.pf-m-gap-4xl-on-md {
-    row-gap: var(--pf-t--global--spacer--4xl);
-    column-gap: var(--pf-t--global--spacer--4xl);
+    gap: var(--pf-t--global--spacer--4xl);
   }
   .pf-v6-c-toolbar__group.pf-m-column-gap-none-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-none-on-md,
@@ -1437,18 +1170,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-none-on-md {
     row-gap: 0;
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startnone-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startnone-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startnone-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startnone-on-md {
-    margin-inline-start: 0;
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endnone-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endnone-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endnone-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endnone-on-md {
-    margin-inline-end: 0;
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xs-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xs-on-md,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xs-on-md,
@@ -1461,18 +1182,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xs-on-md {
     row-gap: var(--pf-t--global--spacer--xs);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxs-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxs-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxs-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxs-on-md {
-    margin-inline-start: var(--pf-t--global--spacer--xs);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxs-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxs-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxs-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxs-on-md {
-    margin-inline-end: var(--pf-t--global--spacer--xs);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-sm-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-sm-on-md,
   .pf-v6-c-toolbar__content.pf-m-column-gap-sm-on-md,
@@ -1485,18 +1194,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-sm-on-md {
     row-gap: var(--pf-t--global--spacer--sm);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startsm-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startsm-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startsm-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startsm-on-md {
-    margin-inline-start: var(--pf-t--global--spacer--sm);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endsm-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endsm-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endsm-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endsm-on-md {
-    margin-inline-end: var(--pf-t--global--spacer--sm);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-md-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-md-on-md,
   .pf-v6-c-toolbar__content.pf-m-column-gap-md-on-md,
@@ -1509,18 +1206,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-md-on-md {
     row-gap: var(--pf-t--global--spacer--md);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startmd-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startmd-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startmd-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startmd-on-md {
-    margin-inline-start: var(--pf-t--global--spacer--md);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endmd-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endmd-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endmd-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endmd-on-md {
-    margin-inline-end: var(--pf-t--global--spacer--md);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-lg-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-lg-on-md,
   .pf-v6-c-toolbar__content.pf-m-column-gap-lg-on-md,
@@ -1533,18 +1218,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-lg-on-md {
     row-gap: var(--pf-t--global--spacer--lg);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startlg-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startlg-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startlg-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startlg-on-md {
-    margin-inline-start: var(--pf-t--global--spacer--lg);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endlg-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endlg-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endlg-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endlg-on-md {
-    margin-inline-end: var(--pf-t--global--spacer--lg);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xl-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xl-on-md,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xl-on-md,
@@ -1557,18 +1230,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xl-on-md {
     row-gap: var(--pf-t--global--spacer--xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxl-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxl-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxl-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxl-on-md {
-    margin-inline-start: var(--pf-t--global--spacer--xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxl-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxl-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxl-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxl-on-md {
-    margin-inline-end: var(--pf-t--global--spacer--xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-2xl-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-2xl-on-md,
   .pf-v6-c-toolbar__content.pf-m-column-gap-2xl-on-md,
@@ -1581,18 +1242,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-2xl-on-md {
     row-gap: var(--pf-t--global--spacer--2xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start2xl-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start2xl-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start2xl-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-md {
-    margin-inline-start: var(--pf-t--global--spacer--2xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end2xl-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end2xl-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end2xl-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-md {
-    margin-inline-end: var(--pf-t--global--spacer--2xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-3xl-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-3xl-on-md,
   .pf-v6-c-toolbar__content.pf-m-column-gap-3xl-on-md,
@@ -1605,18 +1254,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-3xl-on-md {
     row-gap: var(--pf-t--global--spacer--3xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start3xl-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start3xl-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start3xl-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-md {
-    margin-inline-start: var(--pf-t--global--spacer--3xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end3xl-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end3xl-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end3xl-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-md {
-    margin-inline-end: var(--pf-t--global--spacer--3xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-4xl-on-md,
   .pf-v6-c-toolbar__item.pf-m-column-gap-4xl-on-md,
   .pf-v6-c-toolbar__content.pf-m-column-gap-4xl-on-md,
@@ -1629,18 +1266,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-4xl-on-md {
     row-gap: var(--pf-t--global--spacer--4xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start4xl-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start4xl-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start4xl-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-md {
-    margin-inline-start: var(--pf-t--global--spacer--4xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end4xl-on-md,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end4xl-on-md,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end4xl-on-md,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-md {
-    margin-inline-end: var(--pf-t--global--spacer--4xl);
-  }
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-md .pf-v6-c-toolbar__group,
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-md .pf-v6-c-toolbar__item {
     display: flex;
@@ -1787,64 +1412,55 @@
   .pf-v6-c-toolbar__item.pf-m-gap-none-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-none-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-none-on-lg {
-    row-gap: 0;
-    column-gap: 0;
+    gap: 0;
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xs-on-lg,
   .pf-v6-c-toolbar__item.pf-m-gap-xs-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-xs-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xs-on-lg {
-    row-gap: var(--pf-t--global--spacer--xs);
-    column-gap: var(--pf-t--global--spacer--xs);
+    gap: var(--pf-t--global--spacer--xs);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-sm-on-lg,
   .pf-v6-c-toolbar__item.pf-m-gap-sm-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-sm-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-sm-on-lg {
-    row-gap: var(--pf-t--global--spacer--sm);
-    column-gap: var(--pf-t--global--spacer--sm);
+    gap: var(--pf-t--global--spacer--sm);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-md-on-lg,
   .pf-v6-c-toolbar__item.pf-m-gap-md-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-md-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-md-on-lg {
-    row-gap: var(--pf-t--global--spacer--md);
-    column-gap: var(--pf-t--global--spacer--md);
+    gap: var(--pf-t--global--spacer--md);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-lg-on-lg,
   .pf-v6-c-toolbar__item.pf-m-gap-lg-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-lg-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-lg-on-lg {
-    row-gap: var(--pf-t--global--spacer--lg);
-    column-gap: var(--pf-t--global--spacer--lg);
+    gap: var(--pf-t--global--spacer--lg);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xl-on-lg,
   .pf-v6-c-toolbar__item.pf-m-gap-xl-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-xl-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xl-on-lg {
-    row-gap: var(--pf-t--global--spacer--xl);
-    column-gap: var(--pf-t--global--spacer--xl);
+    gap: var(--pf-t--global--spacer--xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-2xl-on-lg,
   .pf-v6-c-toolbar__item.pf-m-gap-2xl-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-2xl-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-2xl-on-lg {
-    row-gap: var(--pf-t--global--spacer--2xl);
-    column-gap: var(--pf-t--global--spacer--2xl);
+    gap: var(--pf-t--global--spacer--2xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-3xl-on-lg,
   .pf-v6-c-toolbar__item.pf-m-gap-3xl-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-3xl-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-3xl-on-lg {
-    row-gap: var(--pf-t--global--spacer--3xl);
-    column-gap: var(--pf-t--global--spacer--3xl);
+    gap: var(--pf-t--global--spacer--3xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-4xl-on-lg,
   .pf-v6-c-toolbar__item.pf-m-gap-4xl-on-lg,
   .pf-v6-c-toolbar__content.pf-m-gap-4xl-on-lg,
   .pf-v6-c-toolbar__content-section.pf-m-gap-4xl-on-lg {
-    row-gap: var(--pf-t--global--spacer--4xl);
-    column-gap: var(--pf-t--global--spacer--4xl);
+    gap: var(--pf-t--global--spacer--4xl);
   }
   .pf-v6-c-toolbar__group.pf-m-column-gap-none-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-none-on-lg,
@@ -1858,18 +1474,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-none-on-lg {
     row-gap: 0;
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startnone-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startnone-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startnone-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startnone-on-lg {
-    margin-inline-start: 0;
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endnone-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endnone-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endnone-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endnone-on-lg {
-    margin-inline-end: 0;
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xs-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xs-on-lg,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xs-on-lg,
@@ -1882,18 +1486,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xs-on-lg {
     row-gap: var(--pf-t--global--spacer--xs);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxs-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxs-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxs-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxs-on-lg {
-    margin-inline-start: var(--pf-t--global--spacer--xs);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxs-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxs-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxs-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxs-on-lg {
-    margin-inline-end: var(--pf-t--global--spacer--xs);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-sm-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-sm-on-lg,
   .pf-v6-c-toolbar__content.pf-m-column-gap-sm-on-lg,
@@ -1906,18 +1498,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-sm-on-lg {
     row-gap: var(--pf-t--global--spacer--sm);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startsm-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startsm-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startsm-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startsm-on-lg {
-    margin-inline-start: var(--pf-t--global--spacer--sm);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endsm-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endsm-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endsm-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endsm-on-lg {
-    margin-inline-end: var(--pf-t--global--spacer--sm);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-md-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-md-on-lg,
   .pf-v6-c-toolbar__content.pf-m-column-gap-md-on-lg,
@@ -1930,18 +1510,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-md-on-lg {
     row-gap: var(--pf-t--global--spacer--md);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startmd-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startmd-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startmd-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startmd-on-lg {
-    margin-inline-start: var(--pf-t--global--spacer--md);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endmd-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endmd-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endmd-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endmd-on-lg {
-    margin-inline-end: var(--pf-t--global--spacer--md);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-lg-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-lg-on-lg,
   .pf-v6-c-toolbar__content.pf-m-column-gap-lg-on-lg,
@@ -1954,18 +1522,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-lg-on-lg {
     row-gap: var(--pf-t--global--spacer--lg);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startlg-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startlg-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startlg-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startlg-on-lg {
-    margin-inline-start: var(--pf-t--global--spacer--lg);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endlg-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endlg-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endlg-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endlg-on-lg {
-    margin-inline-end: var(--pf-t--global--spacer--lg);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xl-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xl-on-lg,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xl-on-lg,
@@ -1978,18 +1534,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xl-on-lg {
     row-gap: var(--pf-t--global--spacer--xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxl-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxl-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxl-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxl-on-lg {
-    margin-inline-start: var(--pf-t--global--spacer--xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxl-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxl-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxl-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxl-on-lg {
-    margin-inline-end: var(--pf-t--global--spacer--xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-2xl-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-2xl-on-lg,
   .pf-v6-c-toolbar__content.pf-m-column-gap-2xl-on-lg,
@@ -2002,18 +1546,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-2xl-on-lg {
     row-gap: var(--pf-t--global--spacer--2xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start2xl-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start2xl-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start2xl-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-lg {
-    margin-inline-start: var(--pf-t--global--spacer--2xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end2xl-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end2xl-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end2xl-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-lg {
-    margin-inline-end: var(--pf-t--global--spacer--2xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-3xl-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-3xl-on-lg,
   .pf-v6-c-toolbar__content.pf-m-column-gap-3xl-on-lg,
@@ -2026,18 +1558,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-3xl-on-lg {
     row-gap: var(--pf-t--global--spacer--3xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start3xl-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start3xl-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start3xl-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-lg {
-    margin-inline-start: var(--pf-t--global--spacer--3xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end3xl-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end3xl-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end3xl-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-lg {
-    margin-inline-end: var(--pf-t--global--spacer--3xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-4xl-on-lg,
   .pf-v6-c-toolbar__item.pf-m-column-gap-4xl-on-lg,
   .pf-v6-c-toolbar__content.pf-m-column-gap-4xl-on-lg,
@@ -2050,18 +1570,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-4xl-on-lg {
     row-gap: var(--pf-t--global--spacer--4xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start4xl-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start4xl-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start4xl-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-lg {
-    margin-inline-start: var(--pf-t--global--spacer--4xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end4xl-on-lg,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end4xl-on-lg,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end4xl-on-lg,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-lg {
-    margin-inline-end: var(--pf-t--global--spacer--4xl);
-  }
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-lg .pf-v6-c-toolbar__group,
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-lg .pf-v6-c-toolbar__item {
     display: flex;
@@ -2208,64 +1716,55 @@
   .pf-v6-c-toolbar__item.pf-m-gap-none-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-none-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-none-on-xl {
-    row-gap: 0;
-    column-gap: 0;
+    gap: 0;
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xs-on-xl,
   .pf-v6-c-toolbar__item.pf-m-gap-xs-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-xs-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xs-on-xl {
-    row-gap: var(--pf-t--global--spacer--xs);
-    column-gap: var(--pf-t--global--spacer--xs);
+    gap: var(--pf-t--global--spacer--xs);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-sm-on-xl,
   .pf-v6-c-toolbar__item.pf-m-gap-sm-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-sm-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-sm-on-xl {
-    row-gap: var(--pf-t--global--spacer--sm);
-    column-gap: var(--pf-t--global--spacer--sm);
+    gap: var(--pf-t--global--spacer--sm);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-md-on-xl,
   .pf-v6-c-toolbar__item.pf-m-gap-md-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-md-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-md-on-xl {
-    row-gap: var(--pf-t--global--spacer--md);
-    column-gap: var(--pf-t--global--spacer--md);
+    gap: var(--pf-t--global--spacer--md);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-lg-on-xl,
   .pf-v6-c-toolbar__item.pf-m-gap-lg-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-lg-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-lg-on-xl {
-    row-gap: var(--pf-t--global--spacer--lg);
-    column-gap: var(--pf-t--global--spacer--lg);
+    gap: var(--pf-t--global--spacer--lg);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xl-on-xl,
   .pf-v6-c-toolbar__item.pf-m-gap-xl-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-xl-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xl-on-xl {
-    row-gap: var(--pf-t--global--spacer--xl);
-    column-gap: var(--pf-t--global--spacer--xl);
+    gap: var(--pf-t--global--spacer--xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-2xl-on-xl,
   .pf-v6-c-toolbar__item.pf-m-gap-2xl-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-2xl-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-2xl-on-xl {
-    row-gap: var(--pf-t--global--spacer--2xl);
-    column-gap: var(--pf-t--global--spacer--2xl);
+    gap: var(--pf-t--global--spacer--2xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-3xl-on-xl,
   .pf-v6-c-toolbar__item.pf-m-gap-3xl-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-3xl-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-3xl-on-xl {
-    row-gap: var(--pf-t--global--spacer--3xl);
-    column-gap: var(--pf-t--global--spacer--3xl);
+    gap: var(--pf-t--global--spacer--3xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-4xl-on-xl,
   .pf-v6-c-toolbar__item.pf-m-gap-4xl-on-xl,
   .pf-v6-c-toolbar__content.pf-m-gap-4xl-on-xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-4xl-on-xl {
-    row-gap: var(--pf-t--global--spacer--4xl);
-    column-gap: var(--pf-t--global--spacer--4xl);
+    gap: var(--pf-t--global--spacer--4xl);
   }
   .pf-v6-c-toolbar__group.pf-m-column-gap-none-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-none-on-xl,
@@ -2279,18 +1778,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-none-on-xl {
     row-gap: 0;
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startnone-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startnone-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startnone-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startnone-on-xl {
-    margin-inline-start: 0;
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endnone-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endnone-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endnone-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endnone-on-xl {
-    margin-inline-end: 0;
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xs-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xs-on-xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xs-on-xl,
@@ -2303,18 +1790,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xs-on-xl {
     row-gap: var(--pf-t--global--spacer--xs);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxs-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxs-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxs-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxs-on-xl {
-    margin-inline-start: var(--pf-t--global--spacer--xs);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxs-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxs-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxs-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxs-on-xl {
-    margin-inline-end: var(--pf-t--global--spacer--xs);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-sm-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-sm-on-xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-sm-on-xl,
@@ -2327,18 +1802,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-sm-on-xl {
     row-gap: var(--pf-t--global--spacer--sm);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startsm-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startsm-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startsm-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startsm-on-xl {
-    margin-inline-start: var(--pf-t--global--spacer--sm);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endsm-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endsm-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endsm-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endsm-on-xl {
-    margin-inline-end: var(--pf-t--global--spacer--sm);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-md-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-md-on-xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-md-on-xl,
@@ -2351,18 +1814,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-md-on-xl {
     row-gap: var(--pf-t--global--spacer--md);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startmd-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startmd-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startmd-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startmd-on-xl {
-    margin-inline-start: var(--pf-t--global--spacer--md);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endmd-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endmd-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endmd-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endmd-on-xl {
-    margin-inline-end: var(--pf-t--global--spacer--md);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-lg-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-lg-on-xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-lg-on-xl,
@@ -2375,18 +1826,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-lg-on-xl {
     row-gap: var(--pf-t--global--spacer--lg);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startlg-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startlg-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startlg-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startlg-on-xl {
-    margin-inline-start: var(--pf-t--global--spacer--lg);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endlg-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endlg-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endlg-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endlg-on-xl {
-    margin-inline-end: var(--pf-t--global--spacer--lg);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xl-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xl-on-xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xl-on-xl,
@@ -2399,18 +1838,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xl-on-xl {
     row-gap: var(--pf-t--global--spacer--xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxl-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxl-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxl-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxl-on-xl {
-    margin-inline-start: var(--pf-t--global--spacer--xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxl-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxl-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxl-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxl-on-xl {
-    margin-inline-end: var(--pf-t--global--spacer--xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-2xl-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-2xl-on-xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-2xl-on-xl,
@@ -2423,18 +1850,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-2xl-on-xl {
     row-gap: var(--pf-t--global--spacer--2xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start2xl-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start2xl-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start2xl-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-xl {
-    margin-inline-start: var(--pf-t--global--spacer--2xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end2xl-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end2xl-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end2xl-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-xl {
-    margin-inline-end: var(--pf-t--global--spacer--2xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-3xl-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-3xl-on-xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-3xl-on-xl,
@@ -2447,18 +1862,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-3xl-on-xl {
     row-gap: var(--pf-t--global--spacer--3xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start3xl-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start3xl-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start3xl-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-xl {
-    margin-inline-start: var(--pf-t--global--spacer--3xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end3xl-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end3xl-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end3xl-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-xl {
-    margin-inline-end: var(--pf-t--global--spacer--3xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-4xl-on-xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-4xl-on-xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-4xl-on-xl,
@@ -2471,18 +1874,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-4xl-on-xl {
     row-gap: var(--pf-t--global--spacer--4xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start4xl-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start4xl-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start4xl-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-xl {
-    margin-inline-start: var(--pf-t--global--spacer--4xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end4xl-on-xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end4xl-on-xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end4xl-on-xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-xl {
-    margin-inline-end: var(--pf-t--global--spacer--4xl);
-  }
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-xl .pf-v6-c-toolbar__group,
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-xl .pf-v6-c-toolbar__item {
     display: flex;
@@ -2629,64 +2020,55 @@
   .pf-v6-c-toolbar__item.pf-m-gap-none-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-none-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-none-on-2xl {
-    row-gap: 0;
-    column-gap: 0;
+    gap: 0;
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xs-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-gap-xs-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-xs-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xs-on-2xl {
-    row-gap: var(--pf-t--global--spacer--xs);
-    column-gap: var(--pf-t--global--spacer--xs);
+    gap: var(--pf-t--global--spacer--xs);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-sm-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-gap-sm-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-sm-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-sm-on-2xl {
-    row-gap: var(--pf-t--global--spacer--sm);
-    column-gap: var(--pf-t--global--spacer--sm);
+    gap: var(--pf-t--global--spacer--sm);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-md-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-gap-md-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-md-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-md-on-2xl {
-    row-gap: var(--pf-t--global--spacer--md);
-    column-gap: var(--pf-t--global--spacer--md);
+    gap: var(--pf-t--global--spacer--md);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-lg-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-gap-lg-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-lg-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-lg-on-2xl {
-    row-gap: var(--pf-t--global--spacer--lg);
-    column-gap: var(--pf-t--global--spacer--lg);
+    gap: var(--pf-t--global--spacer--lg);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-xl-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-gap-xl-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-xl-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-xl-on-2xl {
-    row-gap: var(--pf-t--global--spacer--xl);
-    column-gap: var(--pf-t--global--spacer--xl);
+    gap: var(--pf-t--global--spacer--xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-2xl-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-gap-2xl-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-2xl-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-2xl-on-2xl {
-    row-gap: var(--pf-t--global--spacer--2xl);
-    column-gap: var(--pf-t--global--spacer--2xl);
+    gap: var(--pf-t--global--spacer--2xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-3xl-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-gap-3xl-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-3xl-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-3xl-on-2xl {
-    row-gap: var(--pf-t--global--spacer--3xl);
-    column-gap: var(--pf-t--global--spacer--3xl);
+    gap: var(--pf-t--global--spacer--3xl);
   }
   .pf-v6-c-toolbar__group.pf-m-gap-4xl-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-gap-4xl-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-gap-4xl-on-2xl,
   .pf-v6-c-toolbar__content-section.pf-m-gap-4xl-on-2xl {
-    row-gap: var(--pf-t--global--spacer--4xl);
-    column-gap: var(--pf-t--global--spacer--4xl);
+    gap: var(--pf-t--global--spacer--4xl);
   }
   .pf-v6-c-toolbar__group.pf-m-column-gap-none-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-none-on-2xl,
@@ -2700,18 +2082,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-none-on-2xl {
     row-gap: 0;
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startnone-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startnone-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startnone-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startnone-on-2xl {
-    margin-inline-start: 0;
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endnone-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endnone-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endnone-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endnone-on-2xl {
-    margin-inline-end: 0;
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xs-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xs-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xs-on-2xl,
@@ -2724,18 +2094,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xs-on-2xl {
     row-gap: var(--pf-t--global--spacer--xs);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxs-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxs-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxs-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxs-on-2xl {
-    margin-inline-start: var(--pf-t--global--spacer--xs);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxs-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxs-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxs-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxs-on-2xl {
-    margin-inline-end: var(--pf-t--global--spacer--xs);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-sm-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-sm-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-sm-on-2xl,
@@ -2748,18 +2106,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-sm-on-2xl {
     row-gap: var(--pf-t--global--spacer--sm);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startsm-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startsm-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startsm-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startsm-on-2xl {
-    margin-inline-start: var(--pf-t--global--spacer--sm);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endsm-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endsm-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endsm-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endsm-on-2xl {
-    margin-inline-end: var(--pf-t--global--spacer--sm);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-md-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-md-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-md-on-2xl,
@@ -2772,18 +2118,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-md-on-2xl {
     row-gap: var(--pf-t--global--spacer--md);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startmd-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startmd-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startmd-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startmd-on-2xl {
-    margin-inline-start: var(--pf-t--global--spacer--md);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endmd-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endmd-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endmd-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endmd-on-2xl {
-    margin-inline-end: var(--pf-t--global--spacer--md);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-lg-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-lg-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-lg-on-2xl,
@@ -2796,18 +2130,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-lg-on-2xl {
     row-gap: var(--pf-t--global--spacer--lg);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startlg-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startlg-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startlg-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startlg-on-2xl {
-    margin-inline-start: var(--pf-t--global--spacer--lg);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endlg-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endlg-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endlg-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endlg-on-2xl {
-    margin-inline-end: var(--pf-t--global--spacer--lg);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-xl-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-xl-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-xl-on-2xl,
@@ -2820,18 +2142,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-xl-on-2xl {
     row-gap: var(--pf-t--global--spacer--xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-startxl-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-startxl-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-startxl-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-startxl-on-2xl {
-    margin-inline-start: var(--pf-t--global--spacer--xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-endxl-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-endxl-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-endxl-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-endxl-on-2xl {
-    margin-inline-end: var(--pf-t--global--spacer--xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-2xl-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-2xl-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-2xl-on-2xl,
@@ -2844,18 +2154,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-2xl-on-2xl {
     row-gap: var(--pf-t--global--spacer--2xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start2xl-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start2xl-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start2xl-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start2xl-on-2xl {
-    margin-inline-start: var(--pf-t--global--spacer--2xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end2xl-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end2xl-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end2xl-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end2xl-on-2xl {
-    margin-inline-end: var(--pf-t--global--spacer--2xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-3xl-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-3xl-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-3xl-on-2xl,
@@ -2868,18 +2166,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-3xl-on-2xl {
     row-gap: var(--pf-t--global--spacer--3xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start3xl-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start3xl-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start3xl-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start3xl-on-2xl {
-    margin-inline-start: var(--pf-t--global--spacer--3xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end3xl-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end3xl-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end3xl-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end3xl-on-2xl {
-    margin-inline-end: var(--pf-t--global--spacer--3xl);
-  }
   .pf-v6-c-toolbar__group.pf-m-column-gap-4xl-on-2xl,
   .pf-v6-c-toolbar__item.pf-m-column-gap-4xl-on-2xl,
   .pf-v6-c-toolbar__content.pf-m-column-gap-4xl-on-2xl,
@@ -2892,18 +2178,6 @@
   .pf-v6-c-toolbar__content-section.pf-m-row-gap-4xl-on-2xl {
     row-gap: var(--pf-t--global--spacer--4xl);
   }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-start4xl-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-start4xl-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-start4xl-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-start4xl-on-2xl {
-    margin-inline-start: var(--pf-t--global--spacer--4xl);
-  }
-  .pf-v6-c-toolbar__group.pf-m-margin-inline-end4xl-on-2xl,
-  .pf-v6-c-toolbar__item.pf-m-margin-inline-end4xl-on-2xl,
-  .pf-v6-c-toolbar__content.pf-m-margin-inline-end4xl-on-2xl,
-  .pf-v6-c-toolbar__content-section.pf-m-margin-inline-end4xl-on-2xl {
-    margin-inline-end: var(--pf-t--global--spacer--4xl);
-  }
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-2xl .pf-v6-c-toolbar__group,
   .pf-v6-c-toolbar__group:where(.pf-m-toggle-group).pf-m-show-on-2xl .pf-v6-c-toolbar__item {
     display: flex;