diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 3723d055b..e755593ce 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -194,7 +194,7 @@
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps btn-no-color" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-up.svg" ></ion-icon>
               </button>
-              <button  class="btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='320px';showCalendar=true">
+              <button  class="btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='316px';showCalendar=true">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps btn-no-color" src="assets/images/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps btn-no-color" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-down.svg" ></ion-icon>
@@ -205,10 +205,10 @@
             <ion-row class="timeline-date align-center">
               <span *ngIf="timelineIsCurrentDate()">Hoje, &nbsp;</span> {{ timelineDate }}
             </ion-row>
-            <ion-row class="filter ion-align-items-center">
-              <div class="filter-name">{{timelineFilterState}}</div>
+            <ion-row class="filter ion-align-items-center" >
+              <div class="filter-name" (click)="showTimelineFilterState=!showTimelineFilterState">{{timelineFilterState}}</div>
               <!-- Icon -->
-              <button  (click)="showTimelineFilterState=!showTimelineFilterState" class="arrow-down btn-no-color">
+              <button   class="arrow-down btn-no-color" (click)="showTimelineFilterState=!showTimelineFilterState">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index ec5221a8f..a3935ab61 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -204,7 +204,7 @@ export class AgendaPage implements OnInit {
       this.profile = "pr";
     }
 
-    this.calendarHeight = "320px";
+    this.calendarHeight = "316px";
     this.showCalendar = true;
     this.timelineDate = momentG(new Date(), 'dd MMMM yyyy');
 
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 1a6b55b81..9fc9309f4 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -269,7 +269,7 @@
       </ion-label>
     </div>
 
-    <div   *ngFor="let document of documents; let i = index" >
+    <div  *ngFor="let document of documents; let i = index" >
       <ion-list class="list">
         <ion-item>
         <ion-label>
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 9c068535c..b7ecf060c 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -93,8 +93,9 @@
         </div>
       </div>
     </div>
+
     <div class="container-div">
-      <div class="ion-item-class-2 d-flex">
+      <div class="ion-item-class-2 d-flex" >
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
@@ -102,7 +103,7 @@
         <!--
           [className]="Form?.get('Subject')?.invalid ? 'input-error ion-input-class  flex-grow-1' : 'ion-input-class  ion-input-class  flex-grow-1' "
          -->
-        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top">
+        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
           <mat-form-field class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
@@ -133,7 +134,7 @@
         <!--
           [className]="Form?.get('Subject')?.invalid ? 'input-error ion-input-class  flex-grow-1' : 'ion-input-class  ion-input-class  flex-grow-1' "
          -->
-        <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('dateEnd')?.invalid  && validateFrom ">
+        <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
           <mat-form-field class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"