diff --git a/components/lib/splitbutton/SplitButton.vue b/components/lib/splitbutton/SplitButton.vue
index 662094d66..0b4cd3f1a 100755
--- a/components/lib/splitbutton/SplitButton.vue
+++ b/components/lib/splitbutton/SplitButton.vue
@@ -2,9 +2,9 @@
     <div :class="containerClass" :style="style">
         <slot>
             <PVSButton type="button" class="p-splitbutton-defaultbutton" :label="label" :disabled="disabled" :aria-label="label" @click="onDefaultButtonClick" v-bind="buttonProps">
-                <template #icon>
+                <template #icon="slotProps">
                     <slot name="icon">
-                        <span :class="icon" />
+                        <span :class="[icon, slotProps.class]" />
                     </slot>
                 </template>
             </PVSButton>
@@ -21,9 +21,9 @@
             @keydown="onDropdownKeydown"
             v-bind="menuButtonProps"
         >
-            <template #icon>
+            <template #icon="slotProps">
                 <slot name="menubuttonicon">
-                    <component :is="menuButtonIcon ? 'span' : 'ChevronDownIcon'" :class="menuButtonIcon" />
+                    <component :is="menuButtonIcon ? 'span' : 'ChevronDownIcon'" :class="[menuButtonIcon, slotProps.class]" />
                 </slot>
             </template>
         </PVSButton>
diff --git a/components/lib/toolbar/Toolbar.d.ts b/components/lib/toolbar/Toolbar.d.ts
index 60b4b2ab9..3b18445b6 100755
--- a/components/lib/toolbar/Toolbar.d.ts
+++ b/components/lib/toolbar/Toolbar.d.ts
@@ -29,17 +29,17 @@ export interface ToolbarPassThroughOptions {
      */
     root?: ToolbarPassThroughOptionType;
     /**
-     * Uses to pass attributes to the groupleft's DOM element.
+     * Uses to pass attributes to the groupstart's DOM element.
      */
-    groupleft?: ToolbarPassThroughOptionType;
+    groupStart?: ToolbarPassThroughOptionType;
     /**
      * Uses to pass attributes to the groupcenter's DOM element.
      */
-    groupcenter?: ToolbarPassThroughOptionType;
+    groupCenter?: ToolbarPassThroughOptionType;
     /**
      * Uses to pass attributes to the groupright's DOM element.
      */
-    groupright?: ToolbarPassThroughOptionType;
+    groupEnd?: ToolbarPassThroughOptionType;
 }
 
 /**
diff --git a/components/lib/toolbar/Toolbar.vue b/components/lib/toolbar/Toolbar.vue
index 8328166a8..3f0b5377c 100755
--- a/components/lib/toolbar/Toolbar.vue
+++ b/components/lib/toolbar/Toolbar.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="p-toolbar p-component" role="toolbar" :aria-labelledby="ariaLabelledby" v-bind="ptm('root')">
-        <div class="p-toolbar-group-start p-toolbar-group-left" v-bind="ptm('groupleft')">
+        <div class="p-toolbar-group-start p-toolbar-group-left" v-bind="ptm('groupstart')">
             <slot name="start"></slot>
         </div>
         <div class="p-toolbar-group-center" v-bind="ptm('groupcenter')">
             <slot name="center"></slot>
         </div>
-        <div class="p-toolbar-group-end p-toolbar-group-right" v-bind="ptm('groupright')">
+        <div class="p-toolbar-group-end p-toolbar-group-right" v-bind="ptm('groupend')">
             <slot name="end"></slot>
         </div>
     </div>
diff --git a/doc/common/apidoc/index.json b/doc/common/apidoc/index.json
index d76d67d24..a9ac2b2d3 100644
--- a/doc/common/apidoc/index.json
+++ b/doc/common/apidoc/index.json
@@ -24892,15 +24892,15 @@
                             "description": "Uses to pass attributes to the root's DOM element."
                         },
                         {
-                            "name": "groupleft",
+                            "name": "groupStart",
                             "optional": true,
                             "readonly": false,
                             "type": "ToolbarPassThroughOptionType",
                             "default": "",
-                            "description": "Uses to pass attributes to the groupleft's DOM element."
+                            "description": "Uses to pass attributes to the groupstart's DOM element."
                         },
                         {
-                            "name": "groupcenter",
+                            "name": "groupCenter",
                             "optional": true,
                             "readonly": false,
                             "type": "ToolbarPassThroughOptionType",
@@ -24908,7 +24908,7 @@
                             "description": "Uses to pass attributes to the groupcenter's DOM element."
                         },
                         {
-                            "name": "groupright",
+                            "name": "groupEnd",
                             "optional": true,
                             "readonly": false,
                             "type": "ToolbarPassThroughOptionType",