diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 40bdf13a5..da0b3d1ad 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -25,6 +25,14 @@
                   <!-- Move back one screen of the slides -->
 
 
+                  <div class="arrow cursor-pointer resize">
+                    <button (click)="back()" class="btn-no-color resize" >
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="icon-only"  src="assets/images/icons-calendar-arrow-left.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="icon-only"  src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  slot="icon-only"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg"></ion-icon>
+                    </button>
+
+                  </div>
 
                   <!-- Move forward one screen of the slides -->
                   <h2 class="capitaliseText d-flex align-center">
@@ -82,15 +90,6 @@
 
                   </div> -->
 
-                  <div class="arrow cursor-pointer resize">
-                    <button (click)="back()" class="btn-no-color resize" >
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="icon-only"  src="assets/images/icons-calendar-arrow-left.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="icon-only"  src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  slot="icon-only"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg"></ion-icon>
-                    </button>
-
-                  </div>
-
                   <div (click)="next()" class="arrow cursor-pointer resize">
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html
index 4158db867..ed4e55190 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.html
+++ b/src/app/pages/chat/messages/contacts/contacts.page.html
@@ -31,7 +31,7 @@
     </ion-refresher>
   <div class="main-content">
 
-    <ion-virtual-scroll [items]="ChatSystemService.users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
+    <ion-virtual-scroll [items]="userList" approxItemHeight="70px" [headerFn]="separateLetter">
 
       <div class="item-divider" *virtualHeader="let header">
         <ion-label>{{header}}</ion-label>
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index 3b3a3d47c..e358d0aec 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -23,7 +23,8 @@ export class ContactsPage implements OnInit {
   room:any;
   dm:any;
   sessionStore = SessionStore
-
+  userList = this.ChatSystemService.users
+  
   constructor(
     private modalController: ModalController,
     private http: HttpClient,
@@ -45,8 +46,16 @@ export class ContactsPage implements OnInit {
     // this.loadUsers();
 
   }
-  onChange(event){
-    this.textSearch = event.detail.value;
+
+  onChange(event) {
+
+    this.textSearch = event.detail.value.toLowerCase();
+
+    this.userList = this.ChatSystemService.users.filter((e) => {
+      const username = e.name.toLowerCase()
+      return username.includes(this.textSearch)
+    })
+    
   }
 
 
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index aa6aeda8e..8c9f4d3a8 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -105,9 +105,9 @@
                       <div></div>
                     </div>
                     <div class="schedule-details">
-                      <div class="location">{{event.Location}}</div>
-                      <div class="description">
-                        <p>{{event.Subject}}</p>
+                      <div class="description">{{event.Subject}}</div>
+                      <div class="location">
+                        <p>{{event.Location}}</p>
                       </div>
                     </div>
                   </div>
@@ -227,9 +227,9 @@
                 <div></div>
               </div>
               <div class="schedule-details">
-                <div class="location">{{event.Location}}</div>
+                <div class="location">{{event.Subject}}</div>
                 <div class="description">
-                  <p>{{event.Subject}}</p>
+                  <p>{{event.Location}}</p>
                 </div>
               </div>
             </div>
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index bf51a65ed..dce9934ea 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -448,7 +448,8 @@ ion-toolbar{
           width: 78%;
           .location{
             font-family: Roboto;
-            font-size: 13px;
+            font-size: 15px;
+            font-weight: bold;
             color: black;
             width: 100%;
 
@@ -456,8 +457,7 @@ ion-toolbar{
           .description{
             width: 100%;
             font-family: Roboto;
-            font-size: 15px;
-            font-weight: bold;
+            font-size: 13px;
             //color: #0d89d1;
             color: var(--title-text-color)
           }
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 8ca659276..8054ab706 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -107,6 +107,7 @@ export class EventsPage implements OnInit {
 
     this.router.events.forEach((event) => {
       if (event instanceof NavigationEnd && event.url == '/home/events') {
+        this.getEventsFromLocalDb()
         this.RefreshEvents();
         setTimeout(() => {
           this.LoadList();
@@ -122,6 +123,9 @@ export class EventsPage implements OnInit {
       this.hideSearch();
     });
 
+
+    // this.getEventsFromLocalDb();
+
   }
 
   hideSearch() {
@@ -169,71 +173,15 @@ export class EventsPage implements OnInit {
         this.totalEvent = onwEvent.length;
       }
 
+      this.storage.set('events', this.listToPresent)
+
     }
 
     this.showLoader = false;
     this.showAgendaLoader = false;
   }
 
-  addEventToDb(list) {
 
-    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-      this.storage.set('events', list).then(() => {
-        // 
-      })
-    } else {
-      if (list.length > 0) {
-        list.forEach(element => {
-          this.sqliteservice.addEvent(element)
-
-          this.sqliteservice.getAllEvents().then((event: any[] = []) => {
-            let todayEvents = new Array()
-            event.forEach((element) => {
-              let eventObject = {
-                AppointmentState: element.AppointmentState,
-                Attachments: element.Attachments,
-                Attendees: element.Attendees,
-                CalendarId: element.CalendarId,
-                CalendarName: element.CalendarName,
-                Category: element.Category,
-                EndDate: element.EndDate,
-                EventId: element.EventId,
-                EventRecurrence: element.EventRecurrence,
-                EventType: element.EventType,
-                HasAttachments: element.HasAttachments,
-                HumanDate: element.HumanDate,
-                IsAllDayEvent: element.IsAllDayEvent,
-                IsMeeting: element.IsMeeting,
-                IsRecurring: element.IsRecurring,
-                Location: element.Location,
-                Organizer: element.Organizer,
-                Profile: element.Profile,
-                StartDate: element.StartDate,
-                Subject: element.Subject
-              }
-                todayEvents.push(eventObject);
-            })
-            
-          })
-        });
-      }
-    }
-  }
-
-  addProcessToDb(list) {
-
-    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-      this.storage.set('process', list).then(() => {
-        // 
-      })
-    } else {
-      if (list.length > 0) {
-        list.forEach(element => {
-          this.sqliteservice.addProcess(element)
-        });
-      }
-    }
-  }
 
   getEventsFromLocalDb() {
 
@@ -241,105 +189,28 @@ export class EventsPage implements OnInit {
     let month = date.getMonth() + 1;
     //date.setMonth(date.getMonth() + 1);
     let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate();
-    // ('dateeeeee', dateToday)
-    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-      this.storage.get('events').then((events: any[] = []) => {
-        // 
 
-        if(Array.isArray(events)) {
-          this.listToPresent = events
-          this.totalEvent = this.listToPresent.length
-          this.currentEvent = this.listToPresent[0].Subject
-          this.currentHoursMinutes = this.listToPresent[0].StartDate
+    this.storage.get('events').then((events: any[] = []) => {
+      // 
+
+      if(Array.isArray(events)) {
+        this.listToPresent = events
+        this.totalEvent = this.listToPresent.length
+        this.currentEvent = this.listToPresent[0].Subject
+        this.currentHoursMinutes = this.listToPresent[0].StartDate
+      }
+      // 
+    })
+
+    this.storage.get('process').then((process: any[] = []) => {
+      // 
+        if(Array.isArray(process)) {
+          this.listToPresentexpediente = process;
         }
-        // 
-      })
+    })
 
-      this.storage.get('process').then((process: any[] = []) => {
-        // 
-          if(Array.isArray(process)) {
-            const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e))
-            this.listToPresentexpediente = ExpedienteTask;
-          }
-      })
+    this.showLoader = false;
 
-      this.showLoader = false;
-
-    } else {
-      this.sqliteservice.getAllEvents().then((event: any[] = []) => {
-        let todayEvents = new Array()
-        event.forEach((element) => {
-          let eventObject = {
-            AppointmentState: element.AppointmentState,
-            Attachments: element.Attachments,
-            Attendees: element.Attendees,
-            CalendarId: element.CalendarId,
-            CalendarName: element.CalendarName,
-            Category: element.Category,
-            EndDate: element.EndDate,
-            EventId: element.EventId,
-            EventRecurrence: element.EventRecurrence,
-            EventType: element.EventType,
-            HasAttachments: element.HasAttachments,
-            HumanDate: element.HumanDate,
-            IsAllDayEvent: element.IsAllDayEvent,
-            IsMeeting: element.IsMeeting,
-            IsRecurring: element.IsRecurring,
-            Location: element.Location,
-            Organizer: element.Organizer,
-            Profile: element.Profile,
-            StartDate: element.StartDate,
-            Subject: element.Subject
-          }
-          let starteDate = momentG(new Date(element.StartDate), 'yyyy-MM-dd');
-          // 
-          if (dateToday == starteDate) {
-            todayEvents.push(eventObject);
-          }
-        })
-        this.listToPresent = todayEvents
-        if(this.listToPresent?.length) {
-          this.totalEvent = this.listToPresent.length
-          this.currentEvent = this.listToPresent[0].Subject
-          this.currentHoursMinutes = this.listToPresent[0].StartDate
-        }
-        // 
-      })
-
-      this.sqliteservice.getprocessByworkflow("Expediente").then((process: any[] = []) => {
-
-        // 
-
-        if (process.length > 0 || process != undefined) {
-
-          var expedientlist: any = new Array();
-          process.forEach((element) => {
-            if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) {
-
-              let task = {
-                activityInstanceName: element.activityInstanceName,
-                deadline: null,
-                serialNumber: element.serialNumber,
-                taskStartDate: element.taskStartDate,
-                totalDocuments: element.totalDocuments,
-                workflowDisplayName: element.workflowDisplayName,
-                workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields)
-              }
-              expedientlist.push(task);
-
-            }
-          })
-
-          // 
-          const ExpedienteTask = expedientlist.map(e => this.expedienteTaskPipe.transform(e))
-          this.listToPresentexpediente = ExpedienteTask;
-
-        }
-
-        this.showLoader = false;
-      })
-    }
-    // });
   }
 
 
@@ -408,12 +279,13 @@ export class EventsPage implements OnInit {
   LoadList() {
     this.showCorrespondenciasLoader = true
     this.processes.GetTaskListExpediente(false).subscribe(result => {
-      this.addProcessToDb(result);
 
       let ExpedienteTask = result.map(e => this.expedienteTaskPipe.transform(e))
 
       this.listToPresentexpediente = ExpedienteTask;
 
+      this.storage.set('process', ExpedienteTask)
+
       this.showCorrespondenciasLoader = false
     }, ((error) => {
 
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index 87348484e..17cbfd6f8 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -21,9 +21,14 @@
       <div class="upper-content" >
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="date">{{customDate}}</span></p>
+          </ion-label>
+          <ion-label>
             <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
+          <ion-label>
+            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
+          </ion-label>
         </div>
       </div>
       <div class="line"></div>
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 2861e2530..599a4ae46 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -21,9 +21,14 @@
       <div class="upper-content">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="date">{{customDate}}</span></p>
+          </ion-label>
+          <ion-label>
             <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
+          <ion-label>
+            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
+          </ion-label>
         </div>
       </div>
       <div class="line"></div>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
index 7b13ce150..69e9c050c 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
@@ -26,9 +26,14 @@
       <div class="upper-content">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="date">{{customDate}}</span></p>
+          </ion-label>
+          <ion-label>
             <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
+          <ion-label>
+            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
+          </ion-label>
         </div>
       </div>
       <div class="line"></div>
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
index 53db81b72..4a74644b6 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
@@ -25,9 +25,14 @@
       <div class="upper-content">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="date">{{customDate}}</span></p>
+          </ion-label>
+          <ion-label>
             <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
+          <ion-label>
+            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
+          </ion-label>
         </div>
       </div>
       <div class="line"></div>
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
index b238b79bd..0fa1f0a44 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -24,9 +24,14 @@
       <div class="upper-content">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="date">{{customDate}}</span></p>
+          </ion-label>
+          <ion-label>
             <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
+          <ion-label>
+            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
+          </ion-label>
         </div>
       </div>
       <div class="line"></div>
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 8d548c884..f8a2b4862 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
@@ -149,6 +149,7 @@ export class ApproveEventPage implements OnInit {
       await this.processes.PostTaskAction(body).toPromise()
       this.goBack();
       this.httpErrorHandle.httpsSucessMessagge('Evento aprovação')
+      this.TaskService.loadEventosParaAprovacao();
 
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
@@ -195,6 +196,7 @@ export class ApproveEventPage implements OnInit {
                 this.offlineManager.storeRequestData('event-listRever', body);
               });
               this.httpErrorHandle.httpsSucessMessagge('Rever')
+              this.TaskService.loadEventosParaAprovacao();
               this.goBack();
             } catch (error) {
               this.httpErrorHandle.httpStatusHandle(error)
@@ -218,6 +220,7 @@ export class ApproveEventPage implements OnInit {
     try {
       await this.processes.PostTaskAction(body).toPromise();
       this.httpErrorHandle.httpsSucessMessagge('Rejeitar')
+      this.TaskService.loadEventosParaAprovacao();
       this.goBack();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
@@ -301,6 +304,7 @@ export class ApproveEventPage implements OnInit {
             await this.processes.PostTaskAction(body).toPromise();
             this.goBack();
             this.httpErrorHandle.httpsSucessMessagge('Rever')
+            this.TaskService.loadEventosParaAprovacao();
           } catch (error) {
             this.httpErrorHandle.httpStatusHandle(error)
           } finally {
@@ -342,6 +346,7 @@ export class ApproveEventPage implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then(res => {
+      this.TaskService.loadEventosParaAprovacao();
       this.getTask();
     });
 
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 084edece5..e68c8cd0b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -27,8 +27,12 @@
       <div class="upper-content" style="overflow: unset !important;">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
+            <p><span class="date">{{customDate}}</span></p>
           </ion-label>
+          <ion-label>
+            <p class="d-flex mt-10"><span class="label">{{ task.WorkflowName }}</span></p>
+          </ion-label>
+
         </div>
       </div>
       <div class="line"></div>
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index 59ee5b8d3..be32a4c61 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -30,7 +30,13 @@
       <div class="upper-content" style="overflow: unset !important;">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="date">{{customDate}}</span></p>
+          </ion-label>
+          <ion-label>
+            <p><span class="color-red">{{ task.DeadlineType }}</span></p>
+          </ion-label>
+          <ion-label>
+            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
           </ion-label>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 2803016a0..c186b27ba 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -1,9 +1,9 @@
 <!-- {{ NotificationsService.active }} -->
 <ion-content class="height-100 container-wrapper">
-  <ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
+  <!-- <ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
     <ion-refresher-content>
     </ion-refresher-content>
-  </ion-refresher>
+  </ion-refresher> -->
 
   <div class="main-content d-flex height-100 border-t-radius">
 
@@ -12,26 +12,56 @@
         <ion-progress-bar type="indeterminate" *ngIf="TaskService.showLoader"></ion-progress-bar>
         <div class="title-container">
           <div class="title">
-            <ion-label>Gabinete Digital</ion-label>
+            <ion-label *ngIf="hideRefreshBtn">Gabinete Digital</ion-label>
+            <mat-form-field *ngIf="!hideRefreshBtn && segmentVista == 'listview' " class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+              <mat-select [(value)]="filterName">
+      
+                <mat-option value="Para hoje" >
+                  Para hoje
+                </mat-option>
+      
+                <mat-option value="Novos" >
+                  Novos
+                </mat-option>
+      
+                <mat-option value="Lidos" >
+                  Lidos
+                </mat-option>
+      
+                <mat-option value="Não lidos" >
+                  Não lidos
+                </mat-option>
+      
+                <mat-option value="OverdueTasks">
+                  Em atraso
+                </mat-option>
+    
+                <mat-option value="Todos" >
+                  Todos
+                </mat-option>
+      
+              </mat-select>
+            </mat-form-field>
           </div>
           <button  title="Atualizar" *ngIf="hideRefreshBtn && TaskService.loadCount" class="btn-no-color btn-refresh" (click)="doRefresh($event)">
             <ion-icon class="title-icon font-awesome" name="reload-circle"></ion-icon>
           </button>
           <div *ngIf="!hideRefreshBtn" class="title-icons">
-              <ion-segment [(ngModel)]="segmentVista" (ionChange)="onSegmentVistaChange()">
-                <ion-segment-button value="listview" class="ion-segment-button-no-border">
-                  <fa-icon icon="align-justify"></fa-icon>
-                </ion-segment-button>
-                <ion-segment-button value="boxview" class="ion-segment-button-no-border">
-                  <fa-icon icon="th-large"></fa-icon>
-                </ion-segment-button>
-              </ion-segment>
+          
+            <ion-segment [(ngModel)]="segmentVista" (ionChange)="onSegmentVistaChange()">
+              <ion-segment-button value="listview" class="ion-segment-button-no-border" >
+                <fa-icon icon="align-justify" [class.activeTab]="segmentVista == 'listview' "></fa-icon>
+              </ion-segment-button>
+              <ion-segment-button value="boxview" class="ion-segment-button-no-border">
+                <fa-icon icon="th-large" [class.activeTab]="segmentVista == 'boxview' "></fa-icon>
+              </ion-segment-button>
+            </ion-segment>
 
 
           </div>
         </div>  
-        <div *ngIf="segmentVista == 'listview' " class="d-flex px-30 justify-content-end">
-          <div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
+        <div *ngIf="segmentVista == 'listview' " class="d-flex px-30 justify-content-end width-100">
+          <div title="Pesquisa"  class="d-flex align-center cursor-pointer width-100 justify-end">
             <div  (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
               <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
               <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src='assets/images/icons-search.svg'></ion-icon>
@@ -42,12 +72,12 @@
               <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
             </button>
   
-            <div *ngIf="showSearch">
+            <div *ngIf="showSearch" class="width-100">
               <div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
                 <!-- <div class="icon" (click)="basicSearch()">
                   <ion-icon class="icon-z" slot="end" name="search"></ion-icon>
                 </div> -->
-                <div class="input-text d-flex ion-align-items-center">
+                <div class="input-text d-flex ion-align-items-center flex-1">
                   <ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
                     class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
                 </div>
@@ -61,7 +91,7 @@
             </div>
           </div>
 
-          <div>
+          <div *ngIf="hideSearchBtn">
             <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
               <mat-select [(value)]="filterName">
       
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 348180670..9596712e2 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -717,3 +717,8 @@ ion-content{
     width: 20px;
   }
 }
+
+
+.activeTab {
+  color: #cf1521;
+}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index 5b0e8213e..57495dd70 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -23,9 +23,14 @@
       <div class="upper-content">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="date">{{customDate}}</span></p>
+          </ion-label>
+          <ion-label>
             <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
+          <ion-label>
+            <p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
+          </ion-label>
         </div>
       </div>
       <div class="line"></div>
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index 0bcc5fa80..0df38810d 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -117,8 +117,8 @@ export class ChatSystemService {
 
   private async ReLoadChat() {
 
-    await this.chatService.refreshtoken();
     await this.restoreUsers();
+    await this.chatService.refreshtoken();
     await this.getUser();
     await this.restoreRooms();
     await this.getAllRooms();
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index e88f1ab7c..33fa63000 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -93,6 +93,7 @@ export class ApproveEventPage implements OnInit {
       await this.processes.PostTaskAction(body).toPromise()
       this.modalController.dismiss(serialNumber);
       this.httpErroHandle.httpsSucessMessagge('Aprovar')
+      this.TaskService.loadEventosParaAprovacao();
     } catch (error) {
       this.httpErroHandle.httpStatusHandle(error)
     } finally {
@@ -112,6 +113,7 @@ export class ApproveEventPage implements OnInit {
     try {
       await this.processes.PostTaskAction(body).toPromise()
       this.httpErroHandle.httpsSucessMessagge('Rejeitar');
+      this.TaskService.loadEventosParaAprovacao();
     } catch (error) {
       this.httpErroHandle.httpStatusHandle(error)
       
@@ -201,6 +203,7 @@ export class ApproveEventPage implements OnInit {
           try {
             await this.processes.PostTaskAction(body).toPromise();
             this.httpErroHandle.httpsSucessMessagge('Rever')
+            this.TaskService.loadEventosParaAprovacao();
             this.close();
           } catch (error) {
             this.httpErroHandle.httpStatusHandle(error)
@@ -213,6 +216,8 @@ export class ApproveEventPage implements OnInit {
             this.toastService._badRequest('É necessário adicionar uma nota');
           }
         }
+
+        
       } else {
         
       } 
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html
index 839f9ea23..275ec29b7 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.html
+++ b/src/app/shared/chat/messages/contacts/contacts.page.html
@@ -31,7 +31,7 @@
 
   <div class="main-content">
 
-    <ion-virtual-scroll [items]="ChatSystemService.users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
+    <ion-virtual-scroll [items]="userList" approxItemHeight="70px" [headerFn]="separateLetter">
 
       <div class="item-divider" *virtualHeader="let header">
         <ion-label>{{header}}</ion-label>
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index 1cf48b0bb..242903778 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -28,6 +28,9 @@ export class ContactsPage implements OnInit {
   @Output() backToChat:EventEmitter<any> = new EventEmitter<any>();
   @Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();  
 
+
+  userList = this.ChatSystemService.users
+
   constructor(
     private modalController: ModalController,
     private chatService: ChatService,
@@ -46,7 +49,14 @@ export class ContactsPage implements OnInit {
   }
 
   onChange(event) {
-    this.textSearch = event.detail.value;
+
+    this.textSearch = event.detail.value.toLowerCase();
+
+    this.userList = this.ChatSystemService.users.filter((e) => {
+      const username = e.name.toLowerCase()
+      return username.includes(this.textSearch)
+    })
+    
   }
 
   openMessagesPage(username:string) {
diff --git a/src/app/shared/publication/new-action/new-action.page.scss b/src/app/shared/publication/new-action/new-action.page.scss
index 646cc659e..8422825b7 100644
--- a/src/app/shared/publication/new-action/new-action.page.scss
+++ b/src/app/shared/publication/new-action/new-action.page.scss
@@ -88,6 +88,7 @@ font-size: 25px;
   }
   .ion-item-class-2{
     margin: 0px auto;
+    overflow: hidden;
   }
   .ion-icon-class{
     width: 45px;
diff --git a/version/git-version.ts b/version/git-version.ts
index 232213037..3a025a0ae 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "ef882e8ff",
-  "SHA": "ef882e8ff15e33bf250aceb4f21876f626391d1b",
+  "shortSHA": "a526b9153",
+  "SHA": "a526b9153217d80d3d345ee51e91347f7e0fe21d",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon May 8 10:52:54 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "4935",
+  "lastCommitTime": "'Thu May 18 17:40:52 2023 +0100'",
+  "lastCommitMessage": "fix box sixing",
+  "lastCommitNumber": "4936",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   readme.md\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/models/user.model.ts\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/events/events.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.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/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/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.html\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/expediente/expediente-detail/expediente-detail.page.ts\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/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified:   src/app/services/auth.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.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/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/pedidos/pedidos.page.html\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/environments/suport/doneIt.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified:   src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/events/events.page.scss\n\tmodified:   src/app/pages/events/events.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/services/chat/chat-system.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified:   src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified:   src/app/shared/publication/new-action/new-action.page.scss",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file