diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index ee3579477..01d483e25 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -122,10 +122,8 @@ export class HomePage implements OnInit {
         SessionStore.setUrlBeforeInactivity(pathname)
 
         if (this.platform.is('mobileweb')) {
-          // this.router.navigate(['/inactivity']);
           window.location.pathname = '/inactivity'
         } else {
-          // this.router.navigate(['/']);
           window.location.pathname = '/'
         }
       }
@@ -135,7 +133,6 @@ export class HomePage implements OnInit {
   }
 
   goto(url) {
-    // this.router.navigateByUrl('/home/events', { replaceUrl: true });
     this.router.navigate([url], { replaceUrl: true })
   }
 
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 73fb88bde..c8247a6b8 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -186,7 +186,6 @@ export class CreateProcessPage implements OnInit {
   }
 
   close() {
-    //this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
 
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index da0b3d1ad..add641971 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -270,7 +270,7 @@
             </ion-row>
 
             <div style="padding-right: 50px" class=" text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' ">
-              Todos
+              Todas
             </div>
             <div style="padding-right: 50px" class=" text-black align-center cursor-pointer"  (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
               Pessoais
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 3529efba7..ed8137bc1 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -64,7 +64,7 @@
               <div class="schedule-header">
                 <div class="title">
                   <ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
-                  <div class="text">A sua Agenda</div>
+                  <div class="text">A sua agenda do dia</div>
                 </div>
                 <button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']">
                   <ion-icon
@@ -188,7 +188,7 @@
         <div class="schedule-header">
           <div class="title">
             <ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
-            <div class="text">A sua Agenda</div>
+            <div class="text">A sua agenda do dia</div>
           </div>
           <button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']">
             <ion-icon
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index ab3b55b6b..0a6febcc9 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -22,6 +22,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { environment } from 'src/environments/environment';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -75,7 +76,8 @@ export class DespachosPrPage implements OnInit {
     private backgroundservice: BackgroundService,
     private sortService: SortService,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
 
     this.profile = 'mdgpr';
@@ -289,7 +291,7 @@ export class DespachosPrPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
 }
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index d6c239621..76d9e4000 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -29,15 +29,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -45,7 +45,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
           </mat-select>
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index e3bcd05f5..c7dfecc4a 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { DespachoStore } from 'src/app/store/despacho-store.service';
-
+import { RouteService } from 'src/app/services/route.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { Platform } from '@ionic/angular';
 import { BackgroundService } from 'src/app/services/background.service';
@@ -32,7 +32,8 @@ export class DespachosPage implements OnInit {
     private platform: Platform,
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {}
 
   ngOnInit() {
@@ -139,11 +140,7 @@ export class DespachosPage implements OnInit {
 
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
-  }
-
-  goToList() {
-    this.router.navigate(['/home/gabinete-digital/despachos']);
+    this.RouteService.goBack();
   }
 
 }
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index fa0fcdfb3..ae8227857 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -23,15 +23,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
           <mat-option value="OverdueTasks">
@@ -39,7 +39,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
         </mat-select>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 315199465..f3e34cba5 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -9,6 +9,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -41,7 +42,8 @@ export class DiplomasAssinarPage implements OnInit {
    private router: Router,
    private sortService: SortService,
   public ThemeService: ThemeService,
-  public TaskService: TaskService) {
+  public TaskService: TaskService,
+  private RouteService: RouteService,) {
    }
 
   ngOnInit() {
@@ -126,8 +128,9 @@ export class DiplomasAssinarPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    // this.router.navigate(['/home/gabinete-digital']);
     // window.history.back()
+    this.RouteService.goBack();
   }
 
 }
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
index 5cba0c112..ae44aaf40 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
@@ -9,7 +9,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { TaskService } from 'src/app/services/task.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-diplomas-gerars',
   templateUrl: './diplomas-gerar.page.html',
@@ -42,7 +42,8 @@ export class DiplomasGerarPage implements OnInit {
     private router: Router,
     private sortService: SortService,
    public ThemeService: ThemeService,
-   public TaskService: TaskService) {
+   public TaskService: TaskService,
+   private RouteService: RouteService,) {
     }
  
    ngOnInit() {
@@ -139,7 +140,7 @@ export class DiplomasGerarPage implements OnInit {
    }
  
    goBack() {
-     this.router.navigate(['/home/gabinete-digital']);
+     this.RouteService.goBack();
      // window.history.back()
    }
 }
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 27e794373..5abacecb0 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -85,31 +85,7 @@ export class DiplomaPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    /* if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-      if (window.innerWidth < 801) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-              "pendentes": true,
-            }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else{
-      if (window.innerWidth < 801) {
-        this.router.navigate(['/home/gabinete-digital/diplomas']);
-      } else {
-        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/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index f3ae56a5d..382b48638 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -11,6 +11,7 @@ import { PermissionService } from 'src/app/services/permission.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-diplomas',
@@ -46,7 +47,8 @@ export class DiplomasPage implements OnInit, OnDestroy {
     private sortService: SortService,
     public ThemeService: ThemeService,
     public p: PermissionService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
     //Inicializar segment
 
@@ -223,8 +225,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
-    // window.history.back()
+    this.RouteService.goBack();
   }
 
 }
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 79fd8c148..b3dc8b439 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,6 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   close(){
-    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
     this.modalController.dismiss(null);
   }
 
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 622aa4572..b78ca9a62 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
@@ -95,16 +95,6 @@ export class ApproveEventPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    /* let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "eventos": true,
-      }
-    };
-    if( window.innerWidth < 801) {
-      this.router.navigate(['/home',this.caller, 'event-list']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    } */
 
   }
 
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 997903b69..ff6de0e92 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -31,15 +31,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não Lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
 
@@ -49,7 +49,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
         </mat-select>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 764ca5962..efbe75d89 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -25,6 +25,8 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { RouteService } from 'src/app/services/route.service';
+
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -113,6 +115,7 @@ export class ExpedientTaskModalPage implements OnInit {
     public ThemeService: ThemeService,
     public p: PermissionService,
     private httpErroHandle: HttpErrorHandle,
+    private RouteService: RouteService,
     ) {
 
       this.loggeduser = SessionStore.user;
@@ -178,7 +181,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   close() {
-    this.router.navigate(['/home/gabinete-digital/expediente']);
+    this.RouteService.goBack();
     this.modalController.dismiss(null);
   }
 
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index a64246c97..7d8702a87 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -32,15 +32,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
 
@@ -49,7 +49,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
           
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 2f66821ce..d6e4b4cae 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -13,7 +13,7 @@ import { Storage } from '@ionic/storage';
 import { EventTrigger } from 'src/app/services/eventTrigger.service';
 import { TaskDeadlineService } from 'src/app/services/task-deadline.service'
 import { TaskService } from 'src/app/services/task.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-expediente',
   templateUrl: './expediente.page.html',
@@ -51,7 +51,8 @@ export class ExpedientePage implements OnInit {
     private storage: Storage,
     private eventTriger: EventTrigger,
     public TaskDeadlineService: TaskDeadlineService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) { 
 
     this.eventTriger.getObservable().subscribe((event) => {
@@ -158,7 +159,7 @@ export class ExpedientePage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
   goToExpediente(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 b1764468d..40c2d715d 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
@@ -101,41 +101,6 @@ export class ExpedientePrPage implements OnInit {
   goBack() {
     this.TaskService.loadExpedientes()
     this.RouteService.goBack();
-    /* if(this.task.Status == "Pending" && this.caller != 'events'){
-      if (window.innerWidth <= 800) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-              "pendentes": true,
-            }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else{
-      this.activatedRoute.paramMap.subscribe(params => {
-        switch (params["params"].caller) {
-          case 'events':
-            this.router.navigate(['/home',params["params"].caller]);
-            break;
-
-          case 'gabinete-digital':
-            let navigationExtras: NavigationExtras = {
-              queryParams: {
-                "expedientes-pr": true,
-              }
-            }
-            if( window.innerWidth < 801) {
-              this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
-            } else {
-              this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-            }
-            break;
-        }
-      });
-    } */
   }
 
   sendExpedienteToPending() {
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 825db5219..370b8bd98 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
@@ -143,7 +143,6 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   goToExpediente({SerialNumber}){
-    //this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
     this.router.navigate(['/home/gabinete-digital/expediente', SerialNumber, 'gabinete-digital']);
   }
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 36d503ebd..c74dd8ef6 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -22,15 +22,15 @@
                   </mat-option>
         
                   <mat-option value="Novos" >
-                    Novos
+                    Novas
                   </mat-option>
         
                   <mat-option value="Lidos" >
-                    Lidos
+                    Lidas
                   </mat-option>
         
                   <mat-option value="Não lidos" >
-                    Não lidos
+                    Não lidas
                   </mat-option>
         
                   <mat-option value="OverdueTasks">
@@ -38,7 +38,7 @@
                   </mat-option>
       
                   <mat-option value="Todos" >
-                    Todos
+                    Todas
                   </mat-option>
         
                 </mat-select>
@@ -121,15 +121,15 @@
                 </mat-option>
       
                 <mat-option value="Novos" >
-                  Novos
+                  Novas
                 </mat-option>
       
                 <mat-option value="Lidos" >
-                  Lidos
+                  Lidas
                 </mat-option>
       
                 <mat-option value="Não lidos" >
-                  Não lidos
+                  Não lidas
                 </mat-option>
       
                 <mat-option value="OverdueTasks">
@@ -137,7 +137,7 @@
                 </mat-option>
     
                 <mat-option value="Todos" >
-                  Todos
+                  Todas
                 </mat-option>
       
               </mat-select>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index a170efe1c..dda119482 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -262,6 +262,7 @@ export class GabineteDigitalPage implements OnInit {
       }
     });
 
+    this.checkRoutes()
     this.hideRefreshButton();
 
     // console.log(' this.scroll',  this.scroll)
@@ -390,9 +391,12 @@ export class GabineteDigitalPage implements OnInit {
 
   checkRoutes() {
     this.closeAllDesktopComponents();
-    if (this.router.url == 'processes=true') {
+    
+    // console.log(this.router.url, this.router.url.includes('processes=true'))
+    // alert('hello')
+    if (this.router.url.includes('processes=true')) {
       this.openAllProcessesPage();
-      this.selectedElement = 'allProcessesTag';
+      this.checkUser()
     }
     if (this.router.url == '/home/gabinete-digital?eventos=true') {
       this.openEventsToApprovePage();
@@ -514,7 +518,7 @@ export class GabineteDigitalPage implements OnInit {
       this.router.navigate(['/home/gabinete-digital']);
     }
     else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showAllProcesses = true;
       this.selectedElement = "allProcessesTag";
     }
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 19eb02b1c..ce10e8c7d 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -608,40 +608,6 @@ export class PedidoPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    // if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-    //   if (window.innerWidth <= 700) {
-    //     this.router.navigate(['/home/gabinete-digital/pendentes']);
-    //   }
-    //   else {
-
-    //     let navigationExtras: NavigationExtras;
-
-    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
-    //       navigationExtras= { queryParams: {"deferimento": true,}};
-    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
-    //       navigationExtras = { queryParams: {"parecer": true,}};
-    //     }
-
-    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    //   }
-    // }
-    // else {
-    //   if (window.innerWidth <= 700) {
-    //     this.router.navigate(['/home/gabinete-digital/pedidos']);
-    //   }
-    //   else {
-
-    //     let navigationExtras: NavigationExtras;
-
-    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
-    //       navigationExtras= { queryParams: {"deferimento": true,}};
-    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
-
-    //       navigationExtras = { queryParams: {"parecer": true,}};
-    //     }
-    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    //   }
-    // }
   }
 
 }
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 1d38c3df8..c9b6d129f 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -34,15 +34,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
           <mat-option value="OverdueTasks">
@@ -51,7 +51,7 @@
 
           
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 5e05adac6..73371f0e7 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -14,6 +14,9 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { TaskService } from 'src/app/services/task.service'
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { RouteService } from 'src/app/services/route.service';
+
+
 @Component({
   selector: 'app-pedidos',
   templateUrl: './pedidos.page.html',
@@ -62,7 +65,8 @@ export class PedidosPage implements OnInit {
     private backgroundservice: BackgroundService,
     private platform: Platform,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
     this.segment = 'parecer';
 
@@ -138,23 +142,9 @@ export class PedidosPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
-  /* segmentChanged(ev: any) {
-
-    let navigationExtras: NavigationExtras;
-
-    if (this.segment == 'deferimento') {
-      navigationExtras= { queryParams: {"deferimento": true,}};
-    } else if (this.segment == 'parecer') {
-      navigationExtras = { queryParams: {"parecer": true,}};
-    }
-
-    this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras);
-
-    // this.LoadList();
-  } */
 
   goToPedido(serialNumber: any) {
     this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index c8b4544c0..75f7be69f 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -19,7 +19,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { TaskService } from 'src/app/services/task.service'
 import { ThemeService } from 'src/app/services/theme.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-pendentes',
   templateUrl: './pendentes.page.html',
@@ -62,6 +62,7 @@ export class PendentesPage implements OnInit {
     private httpErroHandle: HttpErrorHandle,
     public TaskService: TaskService,
     public ThemeService: ThemeService,
+    private RouteService: RouteService,
   ) {
     this.loggeduser = SessionStore.user;
     this.profile = 'mdgpr';
@@ -128,7 +129,7 @@ export class PendentesPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
   notImplemented() {
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 6a1e5a38a..4ebb5785a 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -61,15 +61,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -77,7 +77,7 @@
             </mat-option>
 
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
           </mat-select>
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index 64c81ab00..052e53e4f 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -58,15 +58,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -75,7 +75,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 724cef891..4ffe2b678 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -54,15 +54,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -71,7 +71,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
index d28d787ce..2e6f1ece1 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -23,15 +23,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
 
@@ -41,7 +41,7 @@
 
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
         </mat-select>
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index 70dea4fa3..192e3c429 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -52,15 +52,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -69,7 +69,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index 3fdb025b4..a95b3f439 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -57,15 +57,15 @@
               </mat-option>
     
               <mat-option value="Novos" >
-                Novos
+                Novas
               </mat-option>
     
               <mat-option value="Lidos" >
-                Lidos
+                Lidas
               </mat-option>
     
               <mat-option value="Não lidos" >
-                Não lidos
+                Não lidas
               </mat-option>
     
     
@@ -74,7 +74,7 @@
               </mat-option>
     
               <mat-option value="Todos" >
-                Todos
+                Todas
               </mat-option>
     
     
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 01a19e823..fef1aad23 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -55,15 +55,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -72,7 +72,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index ba3b6afe3..2dbd25a70 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -56,15 +56,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -72,7 +72,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   
diff --git a/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html
index 1a5f9a34c..7b62fbc6a 100644
--- a/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html
+++ b/src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html
@@ -60,15 +60,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -76,7 +76,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
           </mat-select>
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 4d264fbcc..14bd190d1 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -56,15 +56,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -73,7 +73,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index facc07f2e..b124f2e04 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
@@ -55,15 +55,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -72,7 +72,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 254d1fd54..9a7902888 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -87,54 +87,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   goBack() {
-    if(this.task.Status == "Pending" && this.caller != 'events') {
-      if (window.innerWidth <= 800) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-            "pendentes": true,
-          }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else {
-      this.RouteService.goBack()
-
-
-      /* this.activatedRoute.paramMap.subscribe(params => {
-        
-        
-
-
-        switch (params["params"].caller) {
-          case 'events':
-            
-
-            this.router.navigate(['/home',params["params"].caller]);
-            break;
-
-          case 'gabinete-digital':
-            
-            let navigationExtras: NavigationExtras = {
-              queryParams: {
-                "expedientes": true,
-              }
-            }
-            if( window.innerWidth < 801) {
-              this.router.navigate(['/home/gabinete-digital/expediente']);
-              
-
-            } else {
-              this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-            }
-            break;
-
-        }
-      }); */
-    }
+    this.RouteService.goBack()
   }
 
   attachDocument(){
diff --git a/version/git-version.ts b/version/git-version.ts
index 36148a320..6139f00cc 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "04b5373ea",
-  "SHA": "04b5373eaa358edf7036441f15eb88461a1242a3",
+  "shortSHA": "2f6588c16",
+  "SHA": "2f6588c16488e7ab520cdacaa354abf1760b7506",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sat Jun 10 14:17:41 2023 +0100'",
-  "lastCommitMessage": "remove limites",
-  "lastCommitNumber": "4962",
+  "lastCommitTime": "'Sat Jun 10 14:44:42 2023 +0100'",
+  "lastCommitMessage": "update details un upload file",
+  "lastCommitNumber": "4963",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file