diff --git a/packages/primeng/src/panel/panel.ts b/packages/primeng/src/panel/panel.ts
index 17cbb70f8b..59a174ea67 100755
--- a/packages/primeng/src/panel/panel.ts
+++ b/packages/primeng/src/panel/panel.ts
@@ -94,19 +94,21 @@ export interface PanelHeaderIconsTemplateContext {
                         (keydown)="onKeyDown($event)"
                         [buttonProps]="toggleButtonProps"
                     >
-                        <ng-container *ngIf="!headerIconsTemplate && !_headerIconsTemplate && !toggleButtonProps?.icon">
-                            <ng-container *ngIf="!collapsed">
-                                <span *ngIf="expandIcon" [class]="expandIcon"></span>
-                                <MinusIcon *ngIf="!expandIcon" />
+                        <ng-template #icon>
+                            <ng-container *ngIf="!headerIconsTemplate && !_headerIconsTemplate && !toggleButtonProps?.icon">
+                                <ng-container *ngIf="!collapsed">
+                                    <span *ngIf="expandIcon" [class]="expandIcon"></span>
+                                    <MinusIcon *ngIf="!expandIcon" />
+                                </ng-container>
+
+                                <ng-container *ngIf="collapsed">
+                                    <span *ngIf="collapseIcon" [class]="collapseIcon"></span>
+                                    <PlusIcon *ngIf="!collapseIcon" />
+                                </ng-container>
                             </ng-container>
 
-                            <ng-container *ngIf="collapsed">
-                                <span *ngIf="collapseIcon" [class]="collapseIcon"></span>
-                                <PlusIcon *ngIf="!collapseIcon" />
-                            </ng-container>
-                        </ng-container>
-
-                        <ng-template *ngTemplateOutlet="headerIconsTemplate || _headerIconsTemplate; context: { $implicit: collapsed }"></ng-template>
+                            <ng-template *ngTemplateOutlet="headerIconsTemplate || _headerIconsTemplate; context: { $implicit: collapsed }"></ng-template>
+                        </ng-template>
                     </p-button>
                 </div>
             </div>