diff --git a/projects/ui/src/lib/components/po-button/po-button-base.component.ts b/projects/ui/src/lib/components/po-button/po-button-base.component.ts
index f88ccb951..eb2f7804d 100644
--- a/projects/ui/src/lib/components/po-button/po-button-base.component.ts
+++ b/projects/ui/src/lib/components/po-button/po-button-base.component.ts
@@ -95,11 +95,12 @@ export class PoButtonBaseComponent {
    * @description
    * Ícone exibido ao lado esquerdo do label do botão.
    *
-   * É possível usar qualquer um dos ícones da [Biblioteca de ícones](https://po-ui.io/icons). conforme exemplo abaixo:
+   * É possível usar qualquer um dos ícones da [Biblioteca de ícones](https://po-ui.io/icons), conforme exemplo:
    * ```
    * <po-button p-icon="an an-user" p-label="PO button"></po-button>
    * ```
-   * Também é possível utilizar outras fontes de ícones, por exemplo a biblioteca *Font Awesome*, da seguinte forma:
+   * Também é possível utilizar outras fontes de ícones, por exemplo a biblioteca *Font Awesome*, desde que a biblioteca
+   * esteja carregada no projeto:
    * ```
    * <po-button p-icon="fa fa-podcast" p-label="PO button"></po-button>
    * ```
diff --git a/projects/ui/src/lib/components/po-icon/po-icon-dictionary.ts b/projects/ui/src/lib/components/po-icon/po-icon-dictionary.ts
index d4998e983..f5e103618 100644
--- a/projects/ui/src/lib/components/po-icon/po-icon-dictionary.ts
+++ b/projects/ui/src/lib/components/po-icon/po-icon-dictionary.ts
@@ -187,10 +187,13 @@ export const AnimaliaIconDictionary: { [key: string]: string } = {
   ICON_ALIGN_JUSTIFY: 'an an-text-align-justify',
   ICON_ALIGN_LEFT: 'an an-text-align-left',
   ICON_ALIGN_RIGHT: 'an an-text-align-right',
+  ICON_ARROW_ARC_LEFT: 'an an-arrow-arc-left',
   ICON_ARROW_DOWN: 'an an-caret-down',
+  ICON_OTHER_ARROW_DOWN: 'an an-arrow-down',
   ICON_ARROW_LEFT: 'an an-caret-left',
   ICON_ARROW_RIGHT: 'an an-caret-right',
   ICON_ARROW_UP: 'an an-caret-up',
+  ICON_OTHER_ARROW_UP: 'an an-arrow-up',
   ICON_CALENDAR: 'an an-calendar-blank',
   ICON_CLEAR_CONTENT: 'an an-x-circle',
   ICON_CLOCK: 'an an-clock',
@@ -204,6 +207,7 @@ export const AnimaliaIconDictionary: { [key: string]: string } = {
   ICON_EYE: 'an an-eye',
   ICON_EYE_OFF: 'an an-eye-closed',
   ICON_FILTER: 'an an-funnel',
+  ICON_FUNNEL: 'an an-funnel-simple',
   ICON_HELP: 'an an-question',
   ICON_INFO: 'an an-info',
   ICON_LAST_PAGE: 'an an-caret-double-right',
@@ -223,14 +227,16 @@ export const AnimaliaIconDictionary: { [key: string]: string } = {
   ICON_PARAMETERS: 'an an-sliders-horizontal',
   ICON_PICTURE: 'an an-image',
   ICON_PICTURE_BROKEN: 'an an-image-broken',
+  ICON_PLUS: 'an an-plus',
+  ICON_PROHIBIT: 'an an-prohibit',
   ICON_PUSH_PIN: 'an an-push-pin',
   ICON_PUSH_PIN_SLASH: 'an an-push-pin-slash',
   ICON_REFRESH: 'an an-arrow-clockwise',
   ICON_SEARCH: 'an an-magnifying-glass',
   ICON_SETTINGS: 'an an-gear-six',
-  ICON_SORT: 'an an-caret-up-down ',
-  ICON_SORT_ASC: 'an an-caret-up',
-  ICON_SORT_DESC: 'an an-caret-down',
+  ICON_SORT: 'an an-arrows-down-up',
+  ICON_SORT_ASC: 'an an-arrow-up',
+  ICON_SORT_DESC: 'an an-arrow-down',
   ICON_STAR: 'an an-star',
   ICON_TELEPHONE: 'an an-phone',
   ICON_TEXT_BOLD: 'an an-text-b',
diff --git a/projects/ui/src/lib/components/po-icon/po-icon.component.html b/projects/ui/src/lib/components/po-icon/po-icon.component.html
index b73f048dc..085f16067 100644
--- a/projects/ui/src/lib/components/po-icon/po-icon.component.html
+++ b/projects/ui/src/lib/components/po-icon/po-icon.component.html
@@ -1,5 +1,5 @@
 @if (class) {
-  <i [class]="class" aria-hidden="true">
+  <i #iconElement [class]="class" aria-hidden="true">
     <ng-content></ng-content>
   </i>
 } @else {
diff --git a/projects/ui/src/lib/components/po-icon/po-icon.component.ts b/projects/ui/src/lib/components/po-icon/po-icon.component.ts
index 35ec59955..54b9b7521 100644
--- a/projects/ui/src/lib/components/po-icon/po-icon.component.ts
+++ b/projects/ui/src/lib/components/po-icon/po-icon.component.ts
@@ -1,4 +1,13 @@
-import { ChangeDetectionStrategy, Component, Inject, Input, Optional, TemplateRef } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  Inject,
+  Input,
+  Optional,
+  TemplateRef,
+  ViewChild
+} from '@angular/core';
 import { ICONS_DICTIONARY, AnimaliaIconDictionary } from './po-icon-dictionary';
 /**
  * @docsPrivate
@@ -16,6 +25,7 @@ import { ICONS_DICTIONARY, AnimaliaIconDictionary } from './po-icon-dictionary';
   standalone: false
 })
 export class PoIconComponent {
+  @ViewChild('iconElement', { static: false }) iconElement: ElementRef;
   class: string;
   private _icon: string | TemplateRef<void>;
   private _iconToken: { [key: string]: string };
diff --git a/projects/ui/src/lib/components/po-listbox/po-item-list/po-item-list-base.component.ts b/projects/ui/src/lib/components/po-listbox/po-item-list/po-item-list-base.component.ts
index f98f84454..f94d37481 100644
--- a/projects/ui/src/lib/components/po-listbox/po-item-list/po-item-list-base.component.ts
+++ b/projects/ui/src/lib/components/po-listbox/po-item-list/po-item-list-base.component.ts
@@ -120,6 +120,15 @@ export class PoItemListBaseComponent {
    */
   @Input('p-icon') icon: string | TemplateRef<void>;
 
+  /**
+   * @optional
+   *
+   * @description
+   *
+   * Define se deve ser exibido o ícone indicando subnível.
+   */
+  @Input('p-icon-arrow-right') iconArrowRight: string;
+
   // Define a posição do ícone: 'left' (padrão) ou 'right'.
   @Input('p-icon-position') iconPosition: 'left' | 'right' = 'left';
 
diff --git a/projects/ui/src/lib/components/po-listbox/po-item-list/po-item-list.component.html b/projects/ui/src/lib/components/po-listbox/po-item-list/po-item-list.component.html
index b78bfb54b..3c51513be 100644
--- a/projects/ui/src/lib/components/po-listbox/po-item-list/po-item-list.component.html
+++ b/projects/ui/src/lib/components/po-listbox/po-item-list/po-item-list.component.html
@@ -12,7 +12,7 @@
         [class.po-item-list__danger]="danger"
         class="po-item-list po-item-list__action"
       >
-        @if (icon && iconPosition === 'left') {
+        @if (icon) {
           <po-icon
             class="po-popup-icon-item po-field-icon"
             [class.po-field-icon-aa]="size === 'small'"
@@ -21,8 +21,8 @@
         }
         <span class="po-item-list-label">{{ label }}</span>
 
-        @if (icon && iconPosition === 'right') {
-          <po-icon class="po-popup-icon-item-right po-field-icon" [p-icon]="icon"></po-icon>
+        @if (iconArrowRight) {
+          <po-icon class="po-popup-icon-item-right po-field-icon" [p-icon]="iconArrowRight"></po-icon>
         }
       </div>
     }
diff --git a/projects/ui/src/lib/components/po-listbox/po-listbox.component.html b/projects/ui/src/lib/components/po-listbox/po-listbox.component.html
index 7d0c2a3a6..a717c8c61 100644
--- a/projects/ui/src/lib/components/po-listbox/po-listbox.component.html
+++ b/projects/ui/src/lib/components/po-listbox/po-listbox.component.html
@@ -142,13 +142,14 @@
             (click)="onSelectItem(item, $event)"
             (keydown)="onKeyDown(item, $event)"
           >
-            @if (item.subItems?.length) {
+            @if (item.subItems?.length || item.$subItemTemplate) {
               <po-item-list
                 [p-label]="item.label"
                 [p-item]="item"
                 [p-separator]="item.separator || separator"
-                [p-icon]="'po-icon-arrow-right'"
-                [p-icon-position]="'right'"
+                [p-icon]="item.icon"
+                [p-icon-arrow-right]="'po-icon-arrow-right'"
+                [p-selected]="isSelectedItem(item) || item.selected"
               >
               </po-item-list>
             } @else if (!item.subItems?.length && returnBooleanValue(item, 'visible') !== false) {
@@ -176,47 +177,55 @@
           [cdkOption]="'back-option'"
           [attr.aria-label]="literals?.backToPreviousGroup"
           (click)="goBack($event)"
-          (keydown)="onKeydownGoBack($event)"
+          (keydown)="onKeydownGoBack($event, currentGroup)"
         >
           <po-icon class="po-field-icon" [p-icon]="'po-icon-arrow-left'"></po-icon>
           <po-tag [p-value]="currentGroup.label"></po-tag>
         </li>
 
-        @for (subItem of currentItems; track subItem.label) {
-          @if (subItem.subItems?.length) {
-            <li
-              [cdkOption]="subItem[fieldLabel]"
-              (click)="onSelectItem(subItem, $event)"
-              (keydown)="onKeyDown(subItem, $event)"
-            >
-              <po-item-list
-                [p-label]="subItem.label"
-                [p-item]="subItem"
-                [p-separator]="subItem.separator || separator"
-                [p-icon]="'po-icon-arrow-right'"
-                [p-icon-position]="'right'"
+        @if (currentGroup.$subItemTemplate) {
+          <div (click)="$event.stopPropagation()" (keydown)="onKeydownTemplate($event)">
+            <ng-container
+              *ngTemplateOutlet="currentGroup.$subItemTemplate; context: { $implicit: currentGroup }"
+            ></ng-container>
+          </div>
+        } @else {
+          @for (subItem of currentItems; track subItem.label) {
+            @if (subItem.subItems?.length) {
+              <li
+                [cdkOption]="subItem[fieldLabel]"
+                (click)="onSelectItem(subItem, $event)"
+                (keydown)="onKeyDown(subItem, $event)"
               >
-              </po-item-list>
-            </li>
-          } @else if (!subItem.subItems?.length && returnBooleanValue(subItem, 'visible') !== false) {
-            <li
-              [cdkOption]="subItem[fieldLabel]"
-              (click)="onSelectItem(subItem, $event)"
-              (keydown)="onKeyDown(subItem, $event)"
-            >
-              <po-item-list
-                class="po-listbox-item-sub"
-                [p-disabled]="returnBooleanValue(subItem, 'disabled')"
-                [p-visible]="returnBooleanValue(subItem, 'visible')"
-                [p-label]="subItem[fieldLabel]"
-                [p-item]="subItem"
-                [p-icon]="subItem.icon"
-                [p-separator]="subItem.separator || separator"
-                [p-danger]="subItem.type === 'danger'"
-                [p-selected]="isSelectedItem(subItem) || subItem.selected"
+                <po-item-list
+                  [p-label]="subItem.label"
+                  [p-item]="subItem"
+                  [p-separator]="subItem.separator || separator"
+                  [p-icon]="'po-icon-arrow-right'"
+                  [p-icon-position]="'right'"
+                >
+                </po-item-list>
+              </li>
+            } @else if (!subItem.subItems?.length && returnBooleanValue(subItem, 'visible') !== false) {
+              <li
+                [cdkOption]="subItem[fieldLabel]"
+                (click)="onSelectItem(subItem, $event)"
+                (keydown)="onKeyDown(subItem, $event)"
               >
-              </po-item-list>
-            </li>
+                <po-item-list
+                  class="po-listbox-item-sub"
+                  [p-disabled]="returnBooleanValue(subItem, 'disabled')"
+                  [p-visible]="returnBooleanValue(subItem, 'visible')"
+                  [p-label]="subItem[fieldLabel]"
+                  [p-item]="subItem"
+                  [p-icon]="subItem.icon"
+                  [p-separator]="subItem.separator || separator"
+                  [p-danger]="subItem.type === 'danger'"
+                  [p-selected]="isSelectedItem(subItem) || subItem.selected"
+                >
+                </po-item-list>
+              </li>
+            }
           }
         }
       }
diff --git a/projects/ui/src/lib/components/po-listbox/po-listbox.component.spec.ts b/projects/ui/src/lib/components/po-listbox/po-listbox.component.spec.ts
index e0b9d5b3f..c18187400 100644
--- a/projects/ui/src/lib/components/po-listbox/po-listbox.component.spec.ts
+++ b/projects/ui/src/lib/components/po-listbox/po-listbox.component.spec.ts
@@ -520,6 +520,56 @@ describe('PoListBoxComponent', () => {
         expect((component as any).navigationStack.length).toBe(2);
       });
 
+      it('onKeydownTemplate: should emit closeEvent if press Tab out .po-listbox-dropdown', () => {
+        const emitSpy = spyOn(component.closeEvent, 'emit');
+        const stopSpy = jasmine.createSpy('stopPropagation');
+
+        const event = {
+          code: 'Tab',
+          target: document.createElement('div'),
+          stopPropagation: stopSpy
+        } as unknown as KeyboardEvent;
+
+        component['onKeydownTemplate'](event);
+
+        expect(stopSpy).not.toHaveBeenCalled();
+        expect(emitSpy).toHaveBeenCalled();
+      });
+
+      it('onKeydownTemplate: should call stopPropagation and not emit closeEvent when press Tab in .po-listbox-dropdown', () => {
+        const emitSpy = spyOn(component.closeEvent, 'emit');
+        const stopSpy = jasmine.createSpy('stopPropagation');
+
+        const dropdown = document.createElement('div');
+        dropdown.classList.add('po-listbox-dropdown');
+
+        const child = document.createElement('div');
+        dropdown.appendChild(child);
+        document.body.appendChild(dropdown);
+
+        const event = {
+          code: 'Tab',
+          target: child,
+          stopPropagation: stopSpy
+        } as unknown as KeyboardEvent;
+
+        component['onKeydownTemplate'](event);
+
+        expect(stopSpy).toHaveBeenCalled();
+        expect(emitSpy).not.toHaveBeenCalled();
+
+        dropdown.remove();
+      });
+
+      it('onKeydownGoBack: should not emit closeEvent if subItemTemplate is true', () => {
+        const eventTab = new KeyboardEvent('keydown', { code: 'Tab' });
+
+        spyOn(component.closeEvent, 'emit');
+
+        component.onKeydownGoBack(eventTab, { label: 'item', $subItemTemplate: true as any });
+        expect(component.closeEvent.emit).not.toHaveBeenCalled();
+      });
+
       it('onKeydownGoBack should call goBack on Enter, emit closeEvent on Escape or Tab', () => {
         const eventEnter = new KeyboardEvent('keydown', { key: 'Enter' });
         const eventEscape = new KeyboardEvent('keydown', { code: 'Escape' });
diff --git a/projects/ui/src/lib/components/po-listbox/po-listbox.component.ts b/projects/ui/src/lib/components/po-listbox/po-listbox.component.ts
index 17ea63391..53e5aed1c 100644
--- a/projects/ui/src/lib/components/po-listbox/po-listbox.component.ts
+++ b/projects/ui/src/lib/components/po-listbox/po-listbox.component.ts
@@ -148,12 +148,25 @@ export class PoListBoxComponent extends PoListBoxBaseComponent implements OnInit
     });
   }
 
-  public onKeydownGoBack(event: KeyboardEvent): void {
+  public onKeydownGoBack(event: KeyboardEvent, currentGroup?: PoDropdownAction): void {
     if (event.key === 'Enter') {
       this.goBack(event);
     }
 
     if (event?.code === 'Escape' || event.code === 'Tab') {
+      if (event.code === 'Tab' && !event.shiftKey && currentGroup?.$subItemTemplate) {
+        return;
+      }
+      this.closeEvent.emit();
+    }
+  }
+
+  protected onKeydownTemplate(event: KeyboardEvent): void {
+    if (event.code === 'Tab') {
+      if ((event.target as HTMLElement)?.closest('.po-listbox-dropdown')) {
+        event.stopPropagation();
+        return;
+      }
       this.closeEvent.emit();
     }
   }
@@ -184,7 +197,7 @@ export class PoListBoxComponent extends PoListBoxBaseComponent implements OnInit
       return this.openUrl(itemListAction.url);
     }
 
-    if (itemListAction?.subItems?.length) {
+    if (itemListAction?.subItems?.length || itemListAction?.$subItemTemplate) {
       this.openGroup(itemListAction, event);
     } else if (this.listboxSubitems) {
       this.closeEvent.emit();
diff --git a/projects/ui/src/lib/components/po-modal/po-modal-action.interface.ts b/projects/ui/src/lib/components/po-modal/po-modal-action.interface.ts
index d312f7852..ab13cbbf6 100644
--- a/projects/ui/src/lib/components/po-modal/po-modal-action.interface.ts
+++ b/projects/ui/src/lib/components/po-modal/po-modal-action.interface.ts
@@ -1,3 +1,5 @@
+import { TemplateRef } from '@angular/core';
+
 /**
  * @usedBy PoModalComponent
  *
@@ -19,6 +21,50 @@ export interface PoModalAction {
   /** Desabilita o botão impossibilitando que sua ação seja executada. */
   disabled?: boolean;
 
+  /**
+   * Ícone exibido ao lado esquerdo do label do botão.
+   *
+   * É possível usar qualquer um dos ícones da [Biblioteca de ícones](https://po-ui.io/icons), conforme exemplo:
+   * ```
+   * modalAction: PoModalAction = {
+   *   action: () => {},
+   *   label: 'Botão com ícone PO',
+   *   icon: 'an an-user'
+   * };
+   * ```
+   * Também é possível utilizar outras fontes de ícones, por exemplo a biblioteca *Font Awesome*, desde que a biblioteca
+   * esteja carregada no projeto:
+   * ```
+   * modalAction: PoModalAction = {
+   *   action: () => {},
+   *   label: 'Botão com ícone Font Awesome',
+   *   icon: 'fa fa-user'
+   * };
+   * ```
+   * Outra opção seria a customização do ícone através do `TemplateRef`, conforme exemplo abaixo:
+   * ```
+   * // Template HTML
+   * <ng-template #customIcon>
+   *   <span class="fa fa-user"></span>
+   * </ng-template>
+   *
+   * // Componente TypeScript
+   * @ViewChild('customIcon', { static: true }) customIcon: TemplateRef<void>;
+   *
+   * modalAction: PoModalAction = {
+   *   action: () => {},
+   *   label: 'Botão com ícone customizado',
+   * };
+   *
+   * // Atribuição do TemplateRef à propriedade icon após a inicialização da view
+   * ngAfterViewInit() {
+   *   this.modalAction.icon = this.customIcon;
+   * }
+   * ```
+   * > Para o ícone enquadrar corretamente, deve-se utilizar `font-size: inherit` caso o ícone utilizado não aplique-o.
+   */
+  icon?: string | TemplateRef<void>;
+
   /** Rótulo do botão. */
   label: string;
 
diff --git a/projects/ui/src/lib/components/po-modal/po-modal.component.html b/projects/ui/src/lib/components/po-modal/po-modal.component.html
index 471f0e685..2bb8bfecb 100644
--- a/projects/ui/src/lib/components/po-modal/po-modal.component.html
+++ b/projects/ui/src/lib/components/po-modal/po-modal.component.html
@@ -36,6 +36,7 @@
                   <po-button
                     [p-danger]="getSecondaryActionButtonDanger()"
                     [p-disabled]="secondaryAction.disabled"
+                    [p-icon]="secondaryAction.icon"
                     [p-label]="secondaryAction.label"
                     [p-loading]="secondaryAction.loading"
                     p-kind="secondary"
@@ -48,6 +49,7 @@
                   class="po-button-modal-first-action"
                   [p-danger]="primaryAction.danger"
                   [p-disabled]="primaryAction.disabled"
+                  [p-icon]="primaryAction.icon"
                   [p-label]="primaryAction.label"
                   [p-loading]="primaryAction.loading"
                   p-kind="primary"
diff --git a/projects/ui/src/lib/components/po-modal/samples/sample-po-modal-labs/sample-po-modal-labs.component.html b/projects/ui/src/lib/components/po-modal/samples/sample-po-modal-labs/sample-po-modal-labs.component.html
index 11ce40e38..06ae15f96 100644
--- a/projects/ui/src/lib/components/po-modal/samples/sample-po-modal-labs/sample-po-modal-labs.component.html
+++ b/projects/ui/src/lib/components/po-modal/samples/sample-po-modal-labs/sample-po-modal-labs.component.html
@@ -27,7 +27,7 @@
       [p-options]="iconOptions"
     ></po-select>
 
-    <po-input class="po-md-6" name="Content" [(ngModel)]="content" p-clean p-label="Content" p-maxlength="200">
+    <po-input class="po-md-12 po-lg-6" name="Content" [(ngModel)]="content" p-clean p-label="Content" p-maxlength="200">
     </po-input>
 
     <po-input
@@ -36,12 +36,22 @@
       [(ngModel)]="primaryActionLabel"
       p-clean
       p-label="Primary action label"
-      p-maxlength="30"
+      p-maxlength="50"
+    >
+    </po-input>
+
+    <po-input
+      class="po-md-6 po-lg-3"
+      name="primaryActionIcon"
+      [(ngModel)]="primaryActionIcon"
+      p-clean
+      p-label="Primary action icon"
+      p-maxlength="50"
     >
     </po-input>
 
     <po-checkbox-group
-      class="po-md-12 po-lg-9"
+      class="po-md-12 po-lg-6"
       name="primaryActionProperties"
       [(ngModel)]="primaryActionProperties"
       p-columns="3"
@@ -56,12 +66,22 @@
       [(ngModel)]="secondaryActionLabel"
       p-clean
       p-label="Secondary action label"
-      p-maxlength="100"
+      p-maxlength="50"
+    >
+    </po-input>
+
+    <po-input
+      class="po-md-6 po-lg-3"
+      name="secondaryActionIcon"
+      [(ngModel)]="secondaryActionIcon"
+      p-clean
+      p-label="Secondary action icon"
+      p-maxlength="50"
     >
     </po-input>
 
     <po-checkbox-group
-      class="po-md-12 po-lg-9"
+      class="po-md-12 po-lg-6"
       name="secondaryActionProperties"
       [(ngModel)]="secondaryActionProperties"
       p-columns="3"
diff --git a/projects/ui/src/lib/components/po-modal/samples/sample-po-modal-labs/sample-po-modal-labs.component.ts b/projects/ui/src/lib/components/po-modal/samples/sample-po-modal-labs/sample-po-modal-labs.component.ts
index fc24a47f6..07b080ea8 100644
--- a/projects/ui/src/lib/components/po-modal/samples/sample-po-modal-labs/sample-po-modal-labs.component.ts
+++ b/projects/ui/src/lib/components/po-modal/samples/sample-po-modal-labs/sample-po-modal-labs.component.ts
@@ -30,6 +30,7 @@ export class SamplePoModalLabsComponent implements OnInit {
   };
 
   primaryActionLabel: string;
+  primaryActionIcon: string;
   primaryActionProperties: Array<string>;
   primaryActionOptions: Array<PoCheckboxGroupOption> = [
     { value: 'danger', label: 'Danger' },
@@ -56,11 +57,12 @@ export class SamplePoModalLabsComponent implements OnInit {
   };
 
   secondaryActionLabel: string;
+  secondaryActionIcon: string;
   secondaryActionProperties: Array<string>;
   secondaryActionOptions: Array<PoCheckboxGroupOption> = [
+    { value: 'danger', label: 'Danger' },
     { value: 'disabled', label: 'Disabled' },
-    { value: 'loading', label: 'Loading' },
-    { value: 'danger', label: 'Danger' }
+    { value: 'loading', label: 'Loading' }
   ];
 
   propertiesOptions: Array<PoCheckboxGroupOption> = [
@@ -81,11 +83,13 @@ export class SamplePoModalLabsComponent implements OnInit {
   openModal() {
     this.primaryAction.disabled = this.primaryActionProperties.includes('disabled');
     this.primaryAction.label = this.primaryActionLabel;
+    this.primaryAction.icon = this.primaryActionIcon;
     this.primaryAction.loading = this.primaryActionProperties.includes('loading');
     this.primaryAction.danger = this.primaryActionProperties.includes('danger');
 
     this.secondaryAction.disabled = this.secondaryActionProperties.includes('disabled');
     this.secondaryAction.label = this.secondaryActionLabel;
+    this.secondaryAction.icon = this.secondaryActionIcon;
     this.secondaryAction.loading = this.secondaryActionProperties.includes('loading');
     this.secondaryAction.danger = this.secondaryActionProperties.includes('danger');
 
@@ -102,8 +106,10 @@ export class SamplePoModalLabsComponent implements OnInit {
     this.title = 'PO Modal';
     this.properties = [];
     this.primaryActionLabel = undefined;
+    this.primaryActionIcon = undefined;
     this.primaryActionProperties = [];
     this.secondaryActionLabel = undefined;
+    this.secondaryActionIcon = undefined;
     this.secondaryActionProperties = [];
     this.componentsSize = 'medium';
     this.icon = undefined;
diff --git a/projects/ui/src/lib/components/po-popup/po-popup-action.interface.ts b/projects/ui/src/lib/components/po-popup/po-popup-action.interface.ts
index 22029019c..b72273e9d 100644
--- a/projects/ui/src/lib/components/po-popup/po-popup-action.interface.ts
+++ b/projects/ui/src/lib/components/po-popup/po-popup-action.interface.ts
@@ -139,4 +139,7 @@ export interface PoPopupAction {
 
   // id interno
   $id?: string;
+
+  // template interno
+  $subItemTemplate?: TemplateRef<any>;
 }
diff --git a/projects/ui/src/lib/components/po-popup/po-popup-base.component.ts b/projects/ui/src/lib/components/po-popup/po-popup-base.component.ts
index d193a6831..f850899d6 100644
--- a/projects/ui/src/lib/components/po-popup/po-popup-base.component.ts
+++ b/projects/ui/src/lib/components/po-popup/po-popup-base.component.ts
@@ -90,6 +90,9 @@ export class PoPopupBaseComponent {
   // Indica se há um listbox com subitens
   @Input('p-listbox-subitems') listboxSubitems = false;
 
+  // template-icon
+  @Input('p-template-icon') templateIcon = false;
+
   /** Lista de ações que serão exibidas no componente. */
   @Input('p-actions') set actions(value: Array<PoPopupAction>) {
     this._actions = Array.isArray(value) ? value : [];
diff --git a/projects/ui/src/lib/components/po-popup/po-popup.component.spec.ts b/projects/ui/src/lib/components/po-popup/po-popup.component.spec.ts
index 981fc2a7e..e8ba2651b 100644
--- a/projects/ui/src/lib/components/po-popup/po-popup.component.spec.ts
+++ b/projects/ui/src/lib/components/po-popup/po-popup.component.spec.ts
@@ -78,6 +78,18 @@ describe('PoPopupComponent:', () => {
       event = { target: {} };
     });
 
+    it('ngAfterViewInit: should set target if templateIcon is true', () => {
+      component.templateIcon = true;
+      component.target = {
+        iconElement: {
+          nativeElement: 'test'
+        }
+      };
+      component.ngAfterViewInit();
+
+      expect(component.target).toBe('test');
+    });
+
     it('clickoutListener: should call `closePopupOnClickout` on click in document', () => {
       component.open();
       fixture.detectChanges();
diff --git a/projects/ui/src/lib/components/po-popup/po-popup.component.ts b/projects/ui/src/lib/components/po-popup/po-popup.component.ts
index 8742f2d95..29006f0aa 100644
--- a/projects/ui/src/lib/components/po-popup/po-popup.component.ts
+++ b/projects/ui/src/lib/components/po-popup/po-popup.component.ts
@@ -1,16 +1,8 @@
-import {
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Renderer2,
-  ViewChild,
-  ViewContainerRef,
-  inject
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild, inject } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { PoControlPositionService } from '../../services/po-control-position/po-control-position.service';
-import { isExternalLink, isTypeof, openExternalLink } from '../../utils/util';
+import { isExternalLink, isTypeof, openExternalLink, uuid } from '../../utils/util';
 
 import { PoListBoxComponent } from '../po-listbox';
 import { PoPopupAction } from './po-popup-action.interface';
@@ -44,7 +36,8 @@ import { PoPopupBaseComponent } from './po-popup-base.component';
   providers: [PoControlPositionService],
   standalone: false
 })
-export class PoPopupComponent extends PoPopupBaseComponent {
+export class PoPopupComponent extends PoPopupBaseComponent implements AfterViewInit {
+  id = `po-popup[${uuid()}]`;
   private renderer = inject(Renderer2);
   private router = inject(Router);
   private poControlPosition = inject(PoControlPositionService);
@@ -56,6 +49,12 @@ export class PoPopupComponent extends PoPopupBaseComponent {
   //utilizado apenas no theme builder
   @ViewChild('poListBoxRef') poListBoxRef: PoListBoxComponent;
 
+  ngAfterViewInit() {
+    if (this.templateIcon && this.target) {
+      this.target = this.target?.iconElement?.nativeElement;
+    }
+  }
+
   /**
    * Fecha o componente *popup*.
    *
@@ -92,6 +91,7 @@ export class PoPopupComponent extends PoPopupBaseComponent {
     this.param = param;
     this.showPopup = true;
     this.changeDetector.detectChanges();
+
     this.validateInitialContent();
   }
 
@@ -117,7 +117,7 @@ export class PoPopupComponent extends PoPopupBaseComponent {
       this.clickItem.emit(item);
     }
 
-    if (item.subItems || item.goBack) {
+    if (item.subItems || item.$subItemTemplate || item.goBack) {
       this.changeDetector.detectChanges();
       this.validateInitialContent();
     }