diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index c12caa219..b041b09c0 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -25,11 +25,16 @@ const routes: Routes = [
           },
           {
             path:':eventId/:caller',
-            loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
+            loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
           },
           {
-            path:':SerialNumber/:caller',
-            loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule),
+            path:'expediente',
+            children: [
+              {
+                path:':SerialNumber/:caller',
+                loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule),
+              },
+            ]
           },
         ]
       },
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index bda24ae27..54aaa51db 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -171,7 +171,7 @@
 
         <!-- Timeline -->
         <div class="height-100">
-          <div class="timeline-container height-100 d-flex pt-20 pl-20" >
+          <div class="timeline-container height-100 d-flex pt-20 pa-20 filter-{{segment}}"  >
             
             <!-- <div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1  d-md-none">
               <mwl-calendar-day-view
@@ -213,7 +213,7 @@
               </div>
             </div> -->
 
-            <div  class="ss-timeline hide-scroll timeline-mobile flex-grow-1  d-md-none text-black height-100 overflow-y-auto" >
+            <div  class="ss-timeline hide-scroll timeline-mobile flex-grow-1  d-md-none text-black height-100 width-100 overflow-y-auto" >
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div *ngIf="CalendarCurrentDay <= events.key">
@@ -244,7 +244,9 @@
                       <div class="schedule-details">
                         {{ event.event.CalendarName }}
                         <div class="location">{{event.event.Location}}</div>
-                        <div class="description">{{event.event.Subject}}</div>
+                        <div class="description">
+                          <p>{{event.event.Subject}}</p> 
+                        </div>
                       </div>
                     </div>
   
@@ -254,7 +256,7 @@
               </div>
             </div>
 
-            <div  class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20 height-100 mr-md-20 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
+            <div  class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block  d-md-block text-black  pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
                 
                 <div *ngIf="CalendarCurrentDay <= events.key">
@@ -282,7 +284,9 @@
                       </div>
                       <div class="schedule-details">
                         <div class="location">{{event.event.Location}}</div>
-                        <div class="description">{{event.event.Subject}}</div>
+                        <div class="description">
+                          <p>{{event.event.Subject}}</p> 
+                        </div>
                       </div>
                     </div>
   
@@ -292,7 +296,7 @@
               </div>
             </div>
 
-            <div  class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pr-20 height-100 overflow-y-auto" >
+            <div  class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pl-20 width-100 height-100 overflow-y-auto" >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
                 
                 <div  *ngIf="CalendarCurrentDay <= events.key">
@@ -321,7 +325,9 @@
                       </div>
                       <div class="schedule-details">
                         <div class="location">{{event.event.Location}}</div>
-                        <div class="description">{{event.event.Subject}}</div>
+                        <div class="description"> 
+                          <p>{{event.event.Subject}}</p> 
+                        </div>
                       </div>
                     </div>
 
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 9228e1166..1ed94dde5 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -63,11 +63,11 @@ ion-slide{
     padding: 0 !important;
     background: #ecf8ff;
   }
-  .div-title{
+  .div-title {
     padding: 0!important;
     float: left;
   }
-  .title{
+  .title {
     font-size: 25px;
   }
   .div-icon{
@@ -504,14 +504,17 @@ td.monthview-primary-with-event {
     flex-wrap: wrap;
     align-items: center;
     width: 100%;
+    overflow: auto;
+
     .location{
+      width: 100%;
       font-family: Roboto;
       font-size: 13px;
       color: black;
-      width: 100%;
     
     }
     .description{
+      width: 100%;
       font-family: Roboto;
       font-size: 15px;
       font-weight: bold;
@@ -612,7 +615,7 @@ td.monthview-primary-with-event {
 }
 
 .event-details{
-  width: 100%;
+  width: 40%;
   background: white;
   border-top-right-radius: 25px;
 }
@@ -698,4 +701,22 @@ app-approve-event{
   display: flex;
   align-items: center;
   height: 100%;
+}
+
+
+.fs-timeline {
+  border-right: 2px solid #909090;
+}
+
+
+.filter-Pessoal {
+  .content-pr-Pessoal, .content-mdgpr-Pessoal {
+    display: none !important;
+  }
+}
+
+.filter-Oficial {
+  .content-pr-Oficial, .content-mdgpr-Oficial {
+    display: none !important;
+  }
 }
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index d24fa5631..3065381a4 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -378,7 +378,7 @@ export class AgendaPage implements OnInit {
 
   }
 
-  get CalendarCurrentDay () {
+  get CalendarCurrentDay ():any {
 
     console.log(this.viewDate.getDate(), '0_0')
     return this.viewDate.getDate()
@@ -657,8 +657,6 @@ export class AgendaPage implements OnInit {
         case "Pessoal":
           //Inicializa o array eventSource
 
-          alert('pessoal')
-
           if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
             this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => {
                 
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 74f7a8c1c..d56dcd8d8 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -177,8 +177,8 @@
             </div>
           </div>
 
-          <div (click)="getDoc()" class="cursor-pointer d-flex container-div width-100 ion-item-container-no-border" >
-            <ion-label>
+          <div class="d-flex container-div width-100 ion-item-container-no-border" >
+            <ion-label (click)="getDoc()" class="cursor-pointer">
               <div class="attach-icon">
                 <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
               </div>
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 413857720..fbff5023d 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -8,14 +8,14 @@
       <div class="main-header  d-flex">
         <div class="title-content d-flex justify-between width-100">
           <div class="left">
-            <button class="btn-no-color d-flex align-center" (click)="close()">
+            <button class="btn-no-color d-flex align-center" (click)="goBack()">
               <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
             </button>
           </div>
-          <div class="middle d-flex align-center flex-grow-1">
-            <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
+          <div class="middle">
+            <p class="title"><span>{{loadedEvent.Subject}}</span></p>
           </div>
-          <div class="menu-options d-flex align-base">
+          <div class="menu-options d-flex">
             <button class="btn-no-color" (click)="editEvent()">
               <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
             </button>
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index 96ecbac6d..7a51dd599 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -5,6 +5,7 @@ ion-content{
     --padding-start: 20px;
     --padding-end: 20px;
     font-size: 18px; */
+    overflow: auto;
 }
 ion-menu{
     --height: 225px;
@@ -14,15 +15,18 @@ ion-menu{
    --opacity: 1;
 }
   .main-header{
+    width: 100%; /* 400px */
     font-family: Roboto;
     background-color: #fff;
     color:#000;
     transform: translate3d(0, 1px, 0);
     
     .title-content{
+      width: 100% !important;
       margin: 0px auto;
-      overflow: auto;
+      padding: 0 !important;
       background: #fff;
+      overflow: auto;
 
       .left{
         width: 37px;
@@ -30,19 +34,29 @@ ion-menu{
         font-size: 35px;
       }
       .middle{
-          //width: 230px;
-          padding: 0!important;
-          float: left;
-          //margin: 2.5px 0 0 0;
+        width: calc(100% - 138.5px) !important;
+        padding: 0 !important;
+        float: left;
+        margin: 0 !important;
+        overflow: auto;
+
+        p{
+          margin: 0 !important;
         }
+      }
       .header-icon-right{
         width: 45px;
         font-size: 45px;
         float: right;
       }
       .menu-options{
+        width: fit-content;
+        height: fit-content;
+        align-items: flex-start;
+        justify-content: flex-start;
         float: right;
         padding: 1px;
+        margin-left: 15px;
       }
       .menu-options .edit{
         font-size: 35px;
@@ -64,6 +78,7 @@ ion-menu{
 
   }
   .main-content{
+    width: 100%;
     font-family: Roboto;
     background-color: #fff !important;
     border-top-left-radius: 25px;
@@ -77,15 +92,21 @@ ion-menu{
     }
 
     .upper-content{
-        margin-left: 50px;
-        overflow: auto;
-        font-size: 18px;
+      width: calc(100%-50px);
+      margin-left: 50px;
+      overflow: auto;
+      font-size: 18px;
       
         .content-location{
           width: 100%;
           margin: 0 auto;
           padding: 0;
           overflow: auto;
+
+          .date{
+            width: calc(100% - 105px);
+            float: left;
+          }
           
           .label{
             border-radius: 20px;
@@ -149,10 +170,14 @@ ion-menu{
         }
       }
       .line{
+        width: 100% !important;
         margin-top: 15px;
         border-top: 1px solid #d8d8d8;
       }
       .middle-conten{
+        width: 100% !important;
+        overflow: auto;
+
         .middle-content h3, .middle-content p{
           font-size: 16px;
         }
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index f1cc51568..53794d8fd 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -12,7 +12,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-view-event',
@@ -51,18 +51,25 @@ export class ViewEventPage implements OnInit {
     private iab: InAppBrowser,
     private processes: ProcessesService,
     public popoverController: PopoverController,
-    private activatedRoute: ActivatedRoute, 
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
   ) 
   {
     this.isEventEdited = false;
     this.loadedEvent = new Event();
     this.eventBody = { BodyType : "1", Text : ""};
     this.loadedEvent.Body = this.eventBody;
-  /*   this.eventId = this.navParams.get('eventId'); */
 
     this.activatedRoute.paramMap.subscribe(paramMap =>{
       this.eventId = paramMap['params'].eventId;
     });
+
+    /* this.activatedRoute.queryParams.subscribe(params => {
+      if(params["eventId"]) {
+        this.eventId = params["eventId"];
+        console.log(params["eventId"]);
+      }
+    }); */
     
   }
 
@@ -82,10 +89,22 @@ export class ViewEventPage implements OnInit {
   }
 
   close(){
-    /* console.log(this.isEventEdited); */
+    
     this.modalController.dismiss(this.isEventEdited);
   }
 
+  goBack() {
+    this.activatedRoute.paramMap.subscribe(params => {
+      this.router.navigate(['/home',params["params"].caller]);
+    });
+
+    /* this.activatedRoute.queryParams.subscribe(params => {
+      if(params["caller"]) {
+        this.router.navigate(['/home',params["caller"]]);
+      }
+    }); */
+  }
+
   loadEvent(){
     this.eventsService.getEvent(this.eventId).subscribe(res => {
       this.loadedEvent = res;
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
index dc05fb3dc..179d98509 100644
--- a/src/app/pages/events/attendees/attendees.page.html
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -12,7 +12,7 @@
     <ion-list lines="none"  class="flex-grow-1 overflow-y-auto height-100" >
       <ion-item-sliding class="px-20">
         <div *ngFor="let attendee of contacts;">
-          <ion-item lines="none"  *ngIf="filterSearchList(attendee)" >
+          <ion-item (click)="selectContact(attendee)" class="cursor-pointer" lines="none"  *ngIf="filterSearchList(attendee)" >
             <div class="pr-10">
               <ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
             </div>
@@ -20,7 +20,7 @@
               <h3>{{ attendee.Name }}</h3>
               <p>{{ attendee.EmailAddress }}</p>
             </ion-label>
-            <div (click)="selectContact(attendee)">
+            <div>
               <ion-icon class="font-35" src="assets/images/icons-add-25.svg"></ion-icon>
             </div>
           </ion-item>
@@ -41,7 +41,7 @@
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
           </ion-label>
-          <div  (click)="remove(attendee)">
+          <div class="cursor-pointer" (click)="remove(attendee)">
             <ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
           </div>
         </ion-item>
@@ -59,7 +59,7 @@
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
           </ion-label>
-          <div  (click)="remove(attendee)">
+          <div class="cursor-pointer" (click)="remove(attendee)">
             <ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
           </div>
         </ion-item>
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index a85775c8a..dcc5c5cf7 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -27,17 +27,6 @@
   </ion-refresher>
   
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-    
-    <!-- <ion-label>
-      <p class="time ion-text-center">{{customDate}}</p>
-    </ion-label>
-    <ion-label>
-      <p class="event-number p-small ion-text-center"> <strong>{{totalEvent}}</strong> eventos agendados para hoje</p>
-    </ion-label>
-    <div class="next-meeting">
-      <div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
-      <div class="meeting-description"> "{{currentEvent}}"</div>
-    </div> -->
 
     <div class="conteiner-box px-20" ng-swipe-up="swipe($event)">
       <div class="schedule">
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index d41e93e91..5508e2f65 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/core';
+import { Component, OnInit, LOCALE_ID, EventEmitter, Output, Renderer2, ElementRef } from '@angular/core';
 
 import { Event } from '../../models/event.model';
 import { EventsService } from 'src/app/services/events.service';
@@ -65,7 +65,8 @@ export class EventsPage implements OnInit {
 
   loggeduser: User;
 
-  constructor(private eventService: EventsService, 
+  constructor(
+    private eventService: EventsService, 
     private router: Router, 
     private storageService:StorageService,
     public activatedRoute: ActivatedRoute,
@@ -73,7 +74,8 @@ export class EventsPage implements OnInit {
     private authService: AuthService,
     private processes:ProcessesService,
     /* private gabineteService: GabineteDigitalPage, */
-    private modalController:ModalController) {
+    private modalController:ModalController,
+    ) {
 
     this.loggeduser = authService.ValidatedUser;
 
@@ -234,16 +236,6 @@ export class EventsPage implements OnInit {
     modal.onDidDismiss();
 
   }
-  async openEventDetail(id:any) {
-    const modal = await this.modalController.create({
-      component: EventDetailModalPage,
-      componentProps: {
-        eventId: id,
-      },
-      cssClass: 'my-custom-class'
-    });
-    return await modal.present();
-  }
 
   LoadList(){
     switch (this.loggeduser.Profile) {
@@ -258,12 +250,10 @@ export class EventsPage implements OnInit {
           this.expedientList = result.reverse();
           console.log(this.expedientList);
         });
-        break;
-    
+        break;    
       default:
         break;
     }
-    
   }
 
   sortArrayISODate(myArray: any){
@@ -273,126 +263,22 @@ export class EventsPage implements OnInit {
   }
 
   goToEvent(eventId:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "eventId": eventId,
-        "caller": "agenda"
-      }
-    };
-    this.router.navigate(['/home/agenda', eventId, 'events']);
+    this.router.navigate(['/home/events', eventId, 'events']);
   }
 
-  async viewEventDetail(eventId:any) {
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal modal-desktop'
-    } else  {
-      classs = 'modal modal-desktop showAsideOptions'
-    }
-    
-    const modal = await this.modalController.create({
-      component: ViewEventPage,
-      componentProps:{
-        eventId: eventId,
-      },
-      cssClass: classs,
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      if(res){
-        console.log(res);
-        this.RefreshEvents();
-      }
-    });
-  }
-
-
-  async editEventDetail(eventId:any) {
-
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal modal-desktop'
-    } else  {
-      classs = 'modal modal-desktop showAsideOptions'
-    }
-
-    const modal = await this.modalController.create({
-      component: EventEditPage,
-      componentProps:{
-        eventId: eventId,
-        profile: this.profile,
-      },
-      cssClass: classs,
-    });
-
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      if(res){
-        console.log(res);
-        this.RefreshEvents();
-      }
-    });
-  }
-
-  goToExpediente(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "serialNumber": serialNumber,
-        "caller": "agenda"
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'events']);
-  }
-
-  async viewExpedientDetail(serialNumber:any) {
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal modal-desktop'
-    } else  {
-      classs = 'modal modal-desktop showAsideOptions'
-    }
-    
-    const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
-      componentProps:{
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: classs,
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      if(res){
-        /* console.log(res); */
-        this.RefreshEvents();
-      }
-    });
+  goToExpediente(SerialNumber:any){
+    this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
   }
 
   viewExpedientListPage(){
     if( window.innerWidth <= 1024){
-      this.openExpedientList();
+      this.router.navigate(['/home/gabinete-digital/expediente']);
     }
     else{
       let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,} };
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
   }
-
-  async openExpedientList(){
-
-
-    const modal = await this.modalController.create({
-      component: ExpedientePage,
-      componentProps:{
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss();
-  }
-
   
 }
 
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 783e665b7..1bead163b 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -155,7 +155,7 @@
           </div>
         </div>
 
-        <div class="ion-item-container-no-border">
+        <div class="ion-item-container-no-border cursor-pointer" (click)="getDoc()">
           <ion-label>
             <div class="attach-icon">
               <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index 29dc86172..f30920797 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -382,7 +382,7 @@ export class BookMeetingModalPage implements OnInit {
         componentProps: {
           message: message || 'Processo não efetuado' ,
         },
-        cssClass: 'modal modal-desktop'
+        cssClass: 'notification-modal'
     });
 
     modal.present()
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 46625566f..619d247c8 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
@@ -75,11 +75,12 @@ export class ExpedienteDetailPage implements OnInit {
     
     this.activateRoute.paramMap.subscribe(paramMap => {
       if (!paramMap["params"].SerialNumber) {
+        console.log('HERE');
+        
         return;
       }
       console.log(paramMap);
       
-      /* this.serialnumber = paramMap.get('SerialNumber'); */
       this.LoadTaskDetail(this.serialnumber);
       this.LoadRelatedEvents(this.serialnumber);
     });
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index 4c7d0d072..ede493f6a 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -173,15 +173,8 @@ export class PendentesPage implements OnInit {
    }
 
    goToExpediente(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "serialNumber": serialNumber,
-        "from": "pendentes",
-        "type": "pendentes"
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
-  }
+     this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
+    }
 
 
   async openDespacho(serialNumber:string){
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 60377a2b5..0c7a4fb10 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -33,7 +33,7 @@
       <ion-icon class="icon" src="assets/images/icons-profile.svg"></ion-icon>
     </div>
 
-    <div class="btn-modal-dismiss">
+    <div class="btn-modal-dismiss" *ngIf="showSearchInput">
       <button class="btn-no-color" (click)="close()">
         <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
       </button>
diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss
index 4a61760e4..31d1969c4 100644
--- a/src/app/pages/search/search.page.scss
+++ b/src/app/pages/search/search.page.scss
@@ -13,15 +13,18 @@
     padding-right: 10px;
   }
   .btn-modal-dismiss{
+    display: flex;
     width: 50px !important;
-   
+   height: fit-content;
     padding: 0 !important;
     margin: 0 !important;
     margin-left: 25px !important;
-    /* border: 1px solid red; */
+    margin-top: 5px !important;
+    align-content: center;
+    align-items: center;
 
-    btn-modal-dismiss icon{
-      font-size: 45px !important;
+    ion-icon{
+      font-size: 32pt !important;
     }
   }
   .ion-align-content-center{
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index fa7cad6fd..a65827e6e 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -23,7 +23,9 @@
           <label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
         </div>
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
-          <ion-icon src="assets/images/icons-edit.svg"></ion-icon>
+          <button class="btn-no-color">
+            <ion-icon src="assets/images/icons-edit.svg"></ion-icon>
+          </button>
         </div>
       </div>
       <div class="upper-content d-flex flex-column">
@@ -95,7 +97,7 @@
   </div>
 </ion-content>
 
-<ion-footer class="display-none-{{showAside}}">
+<ion-footer class="display-none-{{showAside}} ion-no-border">
     <div class="buttons">
       <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
       <ion-menu-button  (click)="openMenu()" autoHide="false">
@@ -103,6 +105,5 @@
       </ion-menu-button>
       <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
       <button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
-
     </div>
 </ion-footer>
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss
index 699b4287a..6bbc3b95c 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.scss
+++ b/src/app/shared/agenda/approve-event/approve-event.page.scss
@@ -161,7 +161,7 @@ ion-menu{
     display: flex;
     justify-content: space-between;
     overflow: auto;
-  
+    padding: 5px;
   
   .button-options {
       height: 44px;
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index a71b50b6d..6f93a5214 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -1,34 +1,3 @@
-<!-- <ion-menu autoHide="false" side="end" content-id="main-content" >
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item  (click)="openExpedientActionsModal('0',fulltask)">
-        <ion-icon name="documents" slot="start"></ion-icon>
-        <ion-label>Efectuar Despacho</ion-label>
-      </ion-item>
-      <ion-item  (click)="openExpedientActionsModal('1',fulltask)">
-        <ion-icon name="arrow-undo" slot="start"></ion-icon>
-        <ion-label>Pedido de Parecer</ion-label>
-      </ion-item>
-      <ion-item  (click)="openExpedientActionsModal('2',fulltask)">
-        <ion-icon name="arrow-redo" slot="start"></ion-icon>
-        <ion-label>Pedido de Deferimento</ion-label>
-      </ion-item>
-      <ion-item  (click)="openBookMeetingModal(task)">
-        <ion-icon name="calendar" slot="start"></ion-icon>
-        <ion-label>Marcar reunião</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-<div class="ion-page d-none" id="main-content">
-  <ion-menu-button></ion-menu-button>
-</div> -->
-
 <ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header px-20" style="overflow: unset !important;">
@@ -38,8 +7,8 @@
             <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
           </button>
         </div>
-        <div class="middle flex-grow-1" (click)="openOptions()">
-          <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
+        <div class="middle" (click)="openOptions()">
+          <p class="title">{{loadedEvent.Subject}}</p>
         </div>
 
         <div class="div-icon d-flex align-base">
@@ -49,7 +18,6 @@
           <button class="btn-no-color" (click)="deleteEvent()">
             <ion-icon class="delete" name="trash-sharp"></ion-icon> 
           </button>
-          
         </div>
 
       </div>
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index 5202cb708..4de679580 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -4,10 +4,9 @@ ion-content{
     --padding-start: 20px;
     --padding-end: 20px;
     font-size: 18px;
+    overflow: auto;
 }
-ion-menu{
- 
-  }
+
 .header-toolbar{
    --background:transparent;
    --opacity: 1;
@@ -22,11 +21,14 @@ ion-menu{
     padding: 30px 0px 0px 0px;
     color:#000;
     transform: translate3d(0, 1px, 0);
+    overflow: auto;
     
     .title-content{
+      width: 100% !important;
       margin: 0px auto;
       padding: 0 !important;
       background: #fff;
+      overflow: auto;
 
       .left{
         width: 37px;
@@ -35,10 +37,17 @@ ion-menu{
 
       }
       .middle{
-          padding: 0 0 0 10px !important;
-          float: left;
-          margin: 2.5px 0 0 0;
+        width: calc(100% - 138.5px) !important;
+        padding: 0 !important;
+        float: left;
+        margin: 0 !important;
+        overflow: auto;
+
+        p{
+          margin: 0 !important;
         }
+      }
+
       .header-icon-right{
         width: 45px;
         font-size: 45px;
@@ -46,14 +55,15 @@ ion-menu{
 
       }
       .div-icon{
-        width: 136px;
+        width: fit-content;
+        height: fit-content;
         display: flex;
         align-items: flex-start;
-        justify-content: start;
+        justify-content:flex-start;
         float: right;
         padding: 1px !important;
         top: 0 !important;
-        margin: 0 !important;
+        margin: 0 0 0 15px !important;
 
       }
       .div-icon .edit{
@@ -81,10 +91,13 @@ ion-menu{
     margin: 0 auto;
     background-color: #fff;
     padding: 15px 0px 0 0px;
+    overflow: auto !important;
 
     .upper-content{
-        margin-left: 50px;
-        font-size: 18px;
+      width: calc(100%-50px);
+      margin-left: 50px;
+      font-size: 18px;
+      overflow: auto;
       
         .content-location{
           width: 100%;
@@ -92,12 +105,13 @@ ion-menu{
           padding: 0 !important;
           overflow: auto;
 
-
           .date{
+            width: calc(100% - 105px);
             float: left;
           }
           
           .label{
+            width: fit-content;
             border-radius: 20px;
             background: #ffb703;
             float: right !important;
@@ -128,10 +142,14 @@ ion-menu{
         }
       }
       .line{
+        width: 100% !important;
         margin-top: 15px;
         border-top: 1px solid #d8d8d8;
       }
-      .middle-conten{
+      .middle-content{
+        width: 100% !important;
+        overflow: auto;
+
         .middle-content h3, .middle-content p{
           font-size: 16px;
         }
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html
index b0d1bbf8c..d0f026983 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.html
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html
@@ -12,7 +12,7 @@
     <ion-list lines="none"  class="flex-grow-1 overflow-y-auto height-100" >
       <ion-item-sliding class="px-20">
         <div *ngFor="let attendee of contacts;">
-          <ion-item *ngIf="filterSearchList(attendee)" >
+          <ion-item (click)="selectContact(attendee)" class="cursor-pointer" *ngIf="filterSearchList(attendee)" >
             <div class="pr-10">
               <ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
             </div>
@@ -20,7 +20,7 @@
               <h3>{{ attendee.Name }}</h3>
               <p>{{ attendee.EmailAddress }}</p>
             </ion-label>
-            <div (click)="selectContact(attendee)">
+            <div >
               <ion-icon class="font-35" src="assets/images/icons-add-25.svg"></ion-icon>
             </div>
           </ion-item>
@@ -41,7 +41,7 @@
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
           </ion-label>
-          <div  (click)="remove(attendee)">
+          <div class="cursor-pointer" (click)="remove(attendee)">
             <ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
           </div>
         </ion-item>
@@ -59,7 +59,7 @@
             <h3>{{ attendee.Name }}</h3>
             <p>{{ attendee.EmailAddress }}</p>
           </ion-label>
-          <div  (click)="remove(attendee)">
+          <div class="cursor-pointer" (click)="remove(attendee)">
             <ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
           </div>
         </ion-item>
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 69acf33a4..b709a7ceb 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -92,41 +92,12 @@ export class ExpedientsPage implements OnInit {
 
   doRefresh() {
     console.log('refresh expedientes1');
-    
     this.LoadList();
-
-    setTimeout(() => {
-    }, 2000);
   }
 
   goToExpediente(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "serialNumber": serialNumber,
-        "from": "gabinete",
-        "type": "pendentes"
-      }
-    };
     this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
   }
 
-  async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
-    const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-
 }
   
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 416b07535..b8fe76c37 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -172,19 +172,9 @@ export class PendentesPage implements OnInit {
     }
 
    goToExpediente(serialNumber:any){
-    
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "serialNumber": serialNumber,
-        "from": "gabinete",
-        "type": "pendentes"
-      }
+     this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
     }
 
-    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras)
-
-  }
-
   async openDespacho(serialNumber:string){
 
     const modal = await this.modalController.create({
diff --git a/src/global.scss b/src/global.scss
index 1c3077cc9..9428fbef0 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -284,7 +284,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 
 .modal-desktop{
     .modal-wrapper{
-        width: 100%;
+        max-width: 1466px !important;
         height: 100%;
     }
 }
@@ -631,7 +631,8 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 
 
 // center
-app-approve-event ion-content .main-content{
+app-approve-event ion-content .main-content, 
+app-view-event ion-content .main-content{
     max-width: 1366px !important;
     margin: 0px auto !important;
 }
@@ -758,6 +759,7 @@ ion-icon{
 
     ::-webkit-scrollbar {
       width: 5px;
+      height: 5px;
     }
     
     /* Track */
@@ -788,10 +790,11 @@ ion-icon{
 
 
 
-@media only screen and (min-width: 800px) { 
+@media only screen and (min-width: 800px) {
 
     ::-webkit-scrollbar {
       width: 10px;
+      height: 10px;
     }
     
     /* Track */
@@ -821,8 +824,6 @@ ion-icon{
 }
 
 
-
-    
 .hide-scroll::-webkit-scrollbar {
     display: none !important;
 }