diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 45ba3236a..995227bf3 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -131,16 +131,16 @@ export class CreateProcessPage implements OnInit {
   }
   async saveTask(){
 
-    if(this.postData.Priority=='99999861'){
+    if(this.postData.Priority=='99999861') {
       this.dispatchFolder.DeadlineType = 'Normal';
     }
-    else if(this.postData.Priority=='99999862'){
+    else if(this.postData.Priority=='99999862') {
       this.dispatchFolder.DeadlineType = 'Urgente';
     }
-    else if(this.postData.Priority=='99999863'){
+    else if(this.postData.Priority=='99999863') {
       this.dispatchFolder.DeadlineType = 'Muito Urgente';
     }
-    else if(this.postData.Priority=='99999864'){
+    else if(this.postData.Priority=='99999864') {
       this.dispatchFolder.DeadlineType = 'Urgentíssimo';
     }
     
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts
index f4f72c86f..6686e6550 100644
--- a/src/app/modals/delegar/delegar.page.ts
+++ b/src/app/modals/delegar/delegar.page.ts
@@ -72,14 +72,12 @@ export class DelegarPage implements OnInit {
     
   }
 
-  close(){
+  close() {
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
-  goBack() {
-    window.history.back()
-  }
-  cancelTask(){
+
+  cancelTask() {
     this.modalController.dismiss(null);
   }
 
@@ -104,7 +102,6 @@ export class DelegarPage implements OnInit {
       (error)=>{
         this.badRequest("Processo não delegado")
       });
-      this.goBack();
     }
   }
 
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 65f574f11..4c32025ef 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -226,7 +226,7 @@
                   <div *ngFor="let event of events.value" >
                     
 
-                    <div class="d-flex content-{{event.Profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" *ngIf="eventListVisible(event.start)">
+                    <div class="d-flex content-{{event.Profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" >
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
 
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 845b4642b..ef7b51433 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -328,7 +328,8 @@ export class EventsPage implements OnInit {
   goToExpediente(serialNumber:any){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "serialNumber": serialNumber,
+        "serialNumber": serialNumber,
+        "from": "inicio"
       }
     };
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 7e7ac3a5a..62522bc4d 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -83,14 +83,14 @@ export class DespachoPrPage implements OnInit {
   }
 
   goBack(){
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "despachospr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "despachospr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
 
-    window.history.back()
   }
 
 
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 4f0324211..7b74ef63d 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -85,7 +85,17 @@ export class DespachoPage implements OnInit {
   }
 
   goBack() {
-    window.history.back()
+    // window.history.back()
+
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        // "serialNumber": serialNumber,
+        'despachos': true
+      }
+    }
+
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
   }
 
 
@@ -231,7 +241,7 @@ export class DespachoPage implements OnInit {
 
   }
 
-  sendExpedienteToPending(){
+  async sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);
       this.close();
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
index 20819984e..5fd18a7c0 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
@@ -54,7 +54,13 @@ export class DiplomaAssinarPage implements OnInit {
   }
 
   goBack(){
-    window.history.back()
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "diplomas": true,
+      }
+    }
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
   }
 
   async openOptions(taskAction?: any) {
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index a4288a3cf..8fe4186b0 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -55,14 +55,15 @@ export class DiplomaPage implements OnInit {
   }
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "diplomas": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back()
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "diplomas": true,
+      }
+    }
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
   }
 
   async openOptions(taskAction?: any) {
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index 29e725312..fd2415699 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -71,7 +71,8 @@ export class ApproveEventModalPage implements OnInit {
     this.modalController.dismiss(null);
   }
 
-  getTask(){
+  getTask() {
+
     this.processes.GetTask(this.serialNumber).subscribe(res => {
       console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res);
       this.loadedEvent = res;
@@ -83,6 +84,7 @@ export class ApproveEventModalPage implements OnInit {
       this.getAttachments()
 
     })
+    
   }
 
   viewDocument(docId:string, applicationId:string){
@@ -94,11 +96,11 @@ export class ApproveEventModalPage implements OnInit {
     });
   }
   
-  async approveTask(serialNumber:string){
+  async approveTask(serialNumber:string) {
     console.log('approveTask SERIALNUMBER: ', serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
-    try {  
+    try {
       await this.processes.PostTaskAction(body).toPromise()
       this.router.navigate(['/home/gabinete-digital/event-list']);
       this.modalController.dismiss(null);
@@ -107,7 +109,6 @@ export class ApproveEventModalPage implements OnInit {
       this.badRequest('Evento não aprovado')
     }
 
-
   }
 
   emendTask(serialNumber:string){
@@ -119,9 +120,8 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   async rejectTask(serialNumber:string) {
-    // console.log('rejectTask: ',serialNumber)
+
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
-    // console.log(body);
     
     try { 
       await  this.processes.PostTaskAction(body).toPromise()
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 7ec04fb42..2ae73326f 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -63,7 +63,15 @@ export class ApproveEventPage implements OnInit {
   }
 
   goBack() {
-    window.history.back();
+
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "eventos": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
+
   }
 
   async getTask(){
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index e5ab28630..e66d08bdb 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -39,6 +39,7 @@ export class ExpedienteDetailPage implements OnInit {
   intervenientes: any;
   cc: any = [];
 
+
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
     private iab: InAppBrowser,
@@ -79,16 +80,43 @@ export class ExpedienteDetailPage implements OnInit {
     this.LoadRelatedEvents(this.serialnumber);
   }
 
-  close(){
+  close() {
     this.modalController.dismiss();
   }
 
-  showToast(){
+  showToast() {
     this.toastService.presentToast('Não foi possível fazer login"');
   }
 
   goBack() {
-    window.history.back()
+
+
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["from"] == "inicio") {
+
+        this.router.navigate(['/home/events']);
+
+      } else {
+
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+            "expedientes": true
+          }
+        };
+
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      
+      }
+
+      if (params["type"] == 'pendentes') {
+
+      }
+
+    });
+    
+
+    
+
   }
 
   /* goBack(){
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 7625f3fef..17abd9faa 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -91,17 +91,24 @@ export class ExpedientePage implements OnInit {
     }, 2000);
   }
 
-  goBack(){
+  goBack() {
+    
     this.router.navigate(['/home/gabinete-digital']);
+  
   }
 
-  goToExpediente(serialNumber:any){
+  goToExpediente(serialNumber:any) {
+    
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "serialNumber": serialNumber,
+        "serialNumber": serialNumber,
+        "from": "gabinete",
+        "type": "pendentes"
       }
-    };
+    }
+
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+  
   }
 
   async viewExpedientDetail(serialNumber:any) {
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index 871509efd..175689850 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -88,14 +88,14 @@ export class ExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "expedientes-pr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "expedientes-pr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back();
+  
 
   }
 
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index de2056806..1605ddb95 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -150,14 +150,14 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "expedientes-pr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "expedientes-pr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back();
+    // window.history.back();
 
   }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 1d2ab36f0..687c215b4 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -407,12 +407,16 @@ export class PedidoPage implements OnInit {
   }
   
   goBack() {
-
-    window.history.back();
+    
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "pedidos": true,
+      }
+    }
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
   }
-
-
   
   async successMessage(message?: string) {
     
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index f9dcf01cb..76b958419 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -54,8 +54,16 @@ export class PendentesPage implements OnInit {
   }
 
   goBack() {
+    
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "pedidos": true,
+      }
+    }
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back();
+    // window.history.back();
   }
  
   notImplemented(){
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index ba409c126..5675bae7f 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -101,6 +101,7 @@ export class ExpedientsPage implements OnInit {
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
+        "from": "gabinete"
       }
     };
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 12fff9c1f..086a26e98 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -172,11 +172,14 @@ export class PendentesPage implements OnInit {
    }
 
    goToExpediente(serialNumber:any){
+    
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
+        "from": "gabinete"
       }
     };
+
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
   }
 
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index de1ad1877..d0392f587 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -365,14 +365,14 @@ export class DespachosOptionsPage implements OnInit {
 
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "despachospr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "despachospr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back()
+    // window.history.back()
   }
 
 }
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index d45ba4bd0..1d53ce904 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -366,14 +366,15 @@ export class DespachosPrOptionsPage implements OnInit {
 
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "despachospr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back()
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "despachospr": true,
+      }
+    };
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
   }
 
 
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index 90c92fb02..63f013b88 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { User } from 'src/app/models/user.model';
@@ -42,7 +42,9 @@ export class OptsExpedientePrPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private userAuth: AuthService,
     private navParams: NavParams,
-    private animationController: AnimationController
+    private animationController: AnimationController,
+    private router: Router
+    
   ) {
 
     this.task = this.navParams.get('task');
@@ -275,14 +277,14 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "expedientes-pr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "expedientes-pr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back();
+    // window.history.back();
 
   }