diff --git a/components/lib/themes/primeone/base/toolbar/index.js b/components/lib/themes/primeone/base/toolbar/index.js
index cd29eeffb..12797336b 100644
--- a/components/lib/themes/primeone/base/toolbar/index.js
+++ b/components/lib/themes/primeone/base/toolbar/index.js
@@ -13,15 +13,11 @@ export default {
     gap: 0.5rem;
 }
 
-.p-toolbar-group-start,
-.p-toolbar-group-center,
-.p-toolbar-group-end {
+.p-toolbar-start,
+.p-toolbar-center,
+.p-toolbar-end {
     display: flex;
     align-items: center;
 }
-
-.p-toolbar-separator {
-    margin: 0 0.5rem;
-}
 `
 };
diff --git a/components/lib/toolbar/style/ToolbarStyle.js b/components/lib/toolbar/style/ToolbarStyle.js
index 8de328135..a99d55696 100644
--- a/components/lib/toolbar/style/ToolbarStyle.js
+++ b/components/lib/toolbar/style/ToolbarStyle.js
@@ -2,9 +2,9 @@ import BaseStyle from 'primevue/base/style';
 
 const classes = {
     root: 'p-toolbar p-component',
-    start: 'p-toolbar-group-start p-toolbar-group-left',
-    center: 'p-toolbar-group-center',
-    end: 'p-toolbar-group-end p-toolbar-group-right'
+    start: 'p-toolbar-start',
+    center: 'p-toolbar-center',
+    end: 'p-toolbar-end'
 };
 
 export default BaseStyle.extend({