diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index dc8d86de1..5b42af6c3 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -88,7 +88,6 @@
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' "> <div>Responder ao PR</div> </div>
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' ">Reencaminhar para Área jurídica</div>
-        <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' " >Outras opções</div>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <div class="solid"></div>
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.html b/src/app/shared/popover/despachos-options/despachos-options.page.html
index 2ac3f2577..8cfe192df 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.html
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.html
@@ -14,11 +14,11 @@
         <button class="btn-cancel desk" shape="round"> Reencaminhar para Área jurídica </button>
         <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel width-100" shape="round" >Gerar Diploma</button>
         <button class="btn-cancel desk" shape="round"> Outras opções </button>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel width-100" shape="round" >Efetuar Despacho</button>
+        <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel width-100" shape="round" >Efetuar Despacho</button>
       </div>
       <div class="flex-grow-1 width-50 pl-10">
-        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel width-100" shape="round" >Solicitar Parecer</button>
-        <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel width-100" shape="round" >Pedido de Deferimento</button>
+        <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel width-100" shape="round" >Solicitar Parecer</button>
+        <button (click)="openTaskProcessModal('2',fulltask)" class="btn-cancel width-100" shape="round" >Pedido de Deferimento</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel width-100" shape="round" >Delegar</button>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel width-100" shape="round"  >Enviar para pendentes</button>
       </div>
@@ -36,7 +36,7 @@
     <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>
 
-  <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && && task.WorkflowName != 'Despacho do Presidente da República' ">
+  <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName != 'Despacho do Presidente da República' ">
     <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
     <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
     <div class="solid"></div>