diff --git a/components/lib/listbox/Listbox.vue b/components/lib/listbox/Listbox.vue
index 8e4097919..0ddc11d9b 100755
--- a/components/lib/listbox/Listbox.vue
+++ b/components/lib/listbox/Listbox.vue
@@ -11,7 +11,9 @@
             :data-p-hidden-accessible="true"
             :data-p-hidden-focusable="true"
         ></span>
-        <slot name="header" :value="modelValue" :options="visibleOptions"></slot>
+        <div :class="cx('header')">
+            <slot name="header" :value="modelValue" :options="visibleOptions"></slot>
+        </div>
         <div v-if="filter" :class="cx('header')" v-bind="ptm('header')">
             <div :class="cx('filterContainer')" v-bind="ptm('filterContainer')">
                 <InputText
diff --git a/components/lib/orderlist/OrderList.d.ts b/components/lib/orderlist/OrderList.d.ts
index d0afa09a2..fde23461b 100755
--- a/components/lib/orderlist/OrderList.d.ts
+++ b/components/lib/orderlist/OrderList.d.ts
@@ -133,10 +133,6 @@ export interface OrderListPassThroughOptions {
      * Used to pass attributes to the container's DOM element.
      */
     container?: OrderListPassThroughOptionType;
-    /**
-     * Used to pass attributes to the header's DOM element.
-     */
-    header?: OrderListPassThroughOptionType;
     /**
      * Used to pass attributes to the Listbox component.
      * @see {@link ListboxPassThroughOptions}
diff --git a/components/lib/orderlist/OrderList.vue b/components/lib/orderlist/OrderList.vue
index 716e9f8cd..cfd6b6514 100755
--- a/components/lib/orderlist/OrderList.vue
+++ b/components/lib/orderlist/OrderList.vue
@@ -55,9 +55,7 @@
             @change="onChangeSelection"
         >
             <template v-if="$slots.header" #header>
-                <div :class="cx('header')" v-bind="ptm('header')">
-                    <slot name="header"></slot>
-                </div>
+                <slot name="header"></slot>
             </template>
             <template #option="{ option, index }">
                 <slot name="item" :item="option" :index="index" />
diff --git a/components/lib/orderlist/style/OrderListStyle.js b/components/lib/orderlist/style/OrderListStyle.js
index fe272699d..07d6808c0 100644
--- a/components/lib/orderlist/style/OrderListStyle.js
+++ b/components/lib/orderlist/style/OrderListStyle.js
@@ -4,7 +4,6 @@ const classes = {
     root: 'p-orderlist p-component',
     controls: 'p-orderlist-controls',
     container: 'p-orderlist-list-container',
-    header: 'p-orderlist-header',
     list: 'p-orderlist-list',
     item: 'p-orderlist-item'
 };
diff --git a/components/lib/picklist/PickList.d.ts b/components/lib/picklist/PickList.d.ts
index 09c0aee09..77f550582 100755
--- a/components/lib/picklist/PickList.d.ts
+++ b/components/lib/picklist/PickList.d.ts
@@ -172,10 +172,6 @@ export interface PickListPassThroughOptions {
      * Used to pass attributes to the source wrapper's DOM element.
      */
     sourceWrapper?: PickListPassThroughOptionType;
-    /**
-     * Used to pass attributes to the source header's DOM element.
-     */
-    sourceHeader?: PickListPassThroughOptionType;
     /**
      * Used to pass attributes to the source list's DOM element.
      */
@@ -204,10 +200,6 @@ export interface PickListPassThroughOptions {
      * Used to pass attributes to the target wrapper's DOM element.
      */
     targetWrapper?: PickListPassThroughOptionType;
-    /**
-     * Used to pass attributes to the target header's DOM element.
-     */
-    targetHeader?: PickListPassThroughOptionType;
     /**
      * Used to pass attributes to the target list's DOM element.
      */
diff --git a/components/lib/picklist/PickList.vue b/components/lib/picklist/PickList.vue
index 76102f40d..b3f81b97d 100755
--- a/components/lib/picklist/PickList.vue
+++ b/components/lib/picklist/PickList.vue
@@ -56,9 +56,7 @@
                 data-pc-group-section="list"
             >
                 <template v-if="$slots.sourceheader" #header>
-                    <div :class="cx('sourceHeader')" v-bind="ptm('sourceHeader')" data-pc-group-section="header">
-                        <slot name="sourceheader"></slot>
-                    </div>
+                    <slot name="sourceheader"></slot>
                 </template>
                 <template #option="{ option, index }">
                     <slot name="item" :item="option" :index="index" />
@@ -121,9 +119,7 @@
                 data-pc-group-section="list"
             >
                 <template v-if="$slots.targetheader" #header>
-                    <div :class="cx('targetheader')" v-bind="ptm('targetheader')" data-pc-group-section="header">
-                        <slot name="targetheader"></slot>
-                    </div>
+                    <slot name="targetheader"></slot>
                 </template>
                 <template #option="{ option, index }">
                     <slot name="item" :item="option" :index="index" />
diff --git a/components/lib/picklist/style/PickListStyle.js b/components/lib/picklist/style/PickListStyle.js
index ed4043f6c..d10c4b941 100644
--- a/components/lib/picklist/style/PickListStyle.js
+++ b/components/lib/picklist/style/PickListStyle.js
@@ -4,11 +4,9 @@ const classes = {
     root: 'p-picklist p-component',
     sourceControls: 'p-picklist-buttons p-picklist-source-controls',
     sourceWrapper: 'p-picklist-list-wrapper p-picklist-source-wrapper',
-    sourceHeader: 'p-picklist-header',
     sourceList: 'p-picklist-list p-picklist-source-list',
     buttons: 'p-picklist-buttons p-picklist-transfer-buttons',
     targetWrapper: 'p-picklist-list-wrapper p-picklist-target-wrapper',
-    targetHeader: 'p-picklist-header',
     targetList: 'p-picklist-list p-picklist-target',
     item: 'p-picklist-item',
     targetControls: 'p-picklist-buttons p-picklist-target-controls'