diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index 3fee5c8fc..22e480568 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -363,13 +363,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -388,13 +388,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 2.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index ce629ed79..a0814f3d1 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -3,51 +3,52 @@
 </ion-header>
 
 <ion-header class="ion-no-border header-2">
-  
-  <div class="title d-flex align-center">
-    <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
 
-    <div class="title flex-1"><ion-label >Despachos</ion-label></div>
+  <div class="title d-flex align-center">
+    <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
+
+    <div class="title flex-1"><ion-label>Despachos</ion-label></div>
     <div class="theicon btn-refresh d-flex align-center">
 
-      
+
       <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 
-        <ion-icon  class="mr-10"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
+        <ion-icon class="mr-10" src="assets/images/theme/gov/crescente.svg"></ion-icon>
       </div>
 
       <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
-        <ion-icon  class="mr-10"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
+        <ion-icon class="mr-10" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
       </div>
 
       <div>
-        <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+          placeholder="Selecione agenda">
           <mat-select [(value)]="filterName">
-  
-            <mat-option value="Para hoje" >
+
+            <mat-option value="Para hoje">
               Para hoje
             </mat-option>
-  
-            <mat-option value="Novos" >
+
+            <mat-option value="Novos">
               Novas
             </mat-option>
-  
-            <mat-option value="Lidos" >
+
+            <mat-option value="Lidos">
               Lidas
             </mat-option>
-  
-            <mat-option value="Não lidos" >
+
+            <mat-option value="Não lidos">
               Não lidas
             </mat-option>
-  
+
             <mat-option value="OverdueTasks">
               Em atraso
             </mat-option>
-  
-            <mat-option value="Todos" >
+
+            <mat-option value="Todos">
               Todas
             </mat-option>
-  
+
           </mat-select>
         </mat-form-field>
       </div>
@@ -60,24 +61,18 @@
 </ion-header>
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
+    <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
+      refreshingSpinner="circles" refreshingText="A actualizar...">
     </ion-refresher-content>
   </ion-refresher>
 
   <div class="main-content width-100 overflow-y-auto height-100">
-    <div >
+    <div>
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
       <div class="height-100">
         <ion-list>
-          <div
-            class=" ion-no-padding ion-no-margin cursor-pointer"  
-            *ngFor = "let task of despachoStore.list; let i = index"
-            (click)="GoToDespacho(task.SerialNumber)"
-          >
+          <div class=" ion-no-padding ion-no-margin cursor-pointer"
+            *ngFor="let task of despachoStore.list; let i = index" (click)="GoToDespacho(task.SerialNumber)">
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
             <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
               <div class="exp-top-detail">
@@ -87,8 +82,10 @@
                   <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                    src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                    src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
@@ -102,7 +99,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                  <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>
@@ -112,15 +109,13 @@
       </div>
     </div>
 
-    <div 
-      *ngIf="!skeletonLoader && despachoStore.list.length == 0" 
-      class="empty-list d-flex height-100 align-center justify-content-center"
-    >
+    <div *ngIf="!skeletonLoader && despachoStore.list.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center">
       <span>Lista vazia</span>
     </div>
 
     <div *ngIf="skeletonLoader && (despachoStore.list.length == null || despachoStore.list.length == 0)">
-    
+
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">
@@ -146,5 +141,4 @@
     </div>
   </div>
 
-</ion-content>
-
+</ion-content>
\ No newline at end of file
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 ae8227857..477a074d0 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
@@ -6,31 +6,32 @@
 <ion-header class="ion-no-border header-2">
   <div class="title">
     <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
-    <div class="thetitle"><ion-label >Diplomas</ion-label></div>
+    <div class="thetitle"><ion-label>Diplomas</ion-label></div>
     <div class="theicon btn-refresh d-flex align-center">
       <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
-        <ion-icon  class="mr-10"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
+        <ion-icon class="mr-10" src="assets/images/theme/gov/crescente.svg"></ion-icon>
       </div>
 
       <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
-        <ion-icon  class="mr-10"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
+        <ion-icon class="mr-10" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
       </div>
-      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+      <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+        placeholder="Selecione agenda">
         <mat-select [(value)]="filterName">
 
-          <mat-option value="Para hoje" >
+          <mat-option value="Para hoje">
             Para hoje
           </mat-option>
 
-          <mat-option value="Novos" >
+          <mat-option value="Novos">
             Novas
           </mat-option>
 
-          <mat-option value="Lidos" >
+          <mat-option value="Lidos">
             Lidas
           </mat-option>
 
-          <mat-option value="Não lidos" >
+          <mat-option value="Não lidos">
             Não lidas
           </mat-option>
 
@@ -38,7 +39,7 @@
             Em atraso
           </mat-option>
 
-          <mat-option value="Todos" >
+          <mat-option value="Todos">
             Todas
           </mat-option>
 
@@ -48,7 +49,9 @@
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
       </button>
     </div>
-    <div class="bottom-title d-flex"><h3 class="bottom-text">Diplomas por Assinar PR</h3></div>
+    <div class="bottom-title d-flex">
+      <h3 class="bottom-text">Diplomas por Assinar PR</h3>
+    </div>
   </div>
 </ion-header>
 <ion-content>
@@ -56,11 +59,8 @@
   <div class="main-content width-100 overflow-y-auto height-100">
 
     <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
+      <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
+        refreshingSpinner="circles" refreshingText="A actualizar...">
       </ion-refresher-content>
     </ion-refresher>
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
@@ -69,24 +69,25 @@
     <div class="width-100" *ngIf="deplomasStore.diplomasParaAssinarList">
 
       <div *ngIf="deplomasStore.diplomasParaAssinarList">
-        <ion-list >
+        <ion-list>
 
-          <div
-            class=" ion-no-padding ion-no-margin cursor-pointer"
-            *ngFor = "let task of deplomasStore.diplomasParaAssinarList"
-            (click)="goToDiploma(task.SerialNumber || task.serialNumber)"
-          >
+          <div class=" ion-no-padding ion-no-margin cursor-pointer"
+            *ngFor="let task of deplomasStore.diplomasParaAssinarList"
+            (click)="goToDiploma(task.SerialNumber || task.serialNumber)">
 
             <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
               <div class="exp-top-detail">
                 <div class="subject d-flex align-center">
-                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
+                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio ||
+                    task.workflowInstanceDataFields.Subject }}</ion-label>
                   <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
                   <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                    src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                    src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
@@ -100,7 +101,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                  <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>
@@ -110,10 +111,8 @@
     </div>
 
     <!-- Empty -->
-    <div
-      *ngIf="!skeletonLoader && deplomasStore.diplomasParaAssinarList.length == 0"
-      class="empty-list d-flex height-100 align-center justify-content-center"
-    >
+    <div *ngIf="!skeletonLoader && deplomasStore.diplomasParaAssinarList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center">
       <span>Lista vazia</span>
     </div>
 
@@ -144,5 +143,4 @@
     </div>
   </div>
 
-</ion-content>
-
+</ion-content>
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
index 068076bff..fd37bd992 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -6,9 +6,9 @@
 <ion-header class="ion-no-border header-2">
 
   <div class="title d-flex align-center">
-    <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
+    <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
 
-    <div class="title"><ion-label >Diplomas por Elaborar</ion-label></div>
+    <div class="title"><ion-label>Diplomas por Elaborar</ion-label></div>
     <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
@@ -20,14 +20,11 @@
 <ion-content>
 
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <ion-refresher-content
-      pullingIcon="chevron-down-circle-outline"
-      pullingText="deslize para actualizar"
-      refreshingSpinner="circles"
-      refreshingText="A actualizar...">
+    <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
+      refreshingSpinner="circles" refreshingText="A actualizar...">
     </ion-refresher-content>
   </ion-refresher>
-  
+
   <div class="main-content width-100 overflow-y-auto height-100">
 
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
@@ -45,14 +42,18 @@
         </p>
       </div>
       <div>
-        <div  *ngIf="ordinance == 'old'" (click)="reorderList('recent')">
-          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-up.svg"></ion-icon>
-          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-arrow-arrow-up.svg"></ion-icon>
+        <div *ngIf="ordinance == 'old'" (click)="reorderList('recent')">
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+            src="assets/images/icons-arrow-arrow-up.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+            src="assets/images/theme/gov/icons-arrow-arrow-up.svg"></ion-icon>
         </div>
 
         <div *ngIf="ordinance == 'recent'" (click)="reorderList('old')">
-          <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-down-25.svg"></ion-icon>
-          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-arrow-arrow-down.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+            src="assets/images/icons-arrow-arrow-down-25.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+            src="assets/images/theme/gov/icons-arrow-arrow-down.svg"></ion-icon>
         </div>
       </div>
     </div>
@@ -61,12 +62,9 @@
     <div class="width-100" *ngIf="deplomasStore.DiplomaGerarList.length >= 1">
 
       <div *ngIf="deplomasStore.DiplomaGerarList">
-        <ion-list >
-          <div
-            class=" ion-no-padding ion-no-margin cursor-pointer"
-            *ngFor = "let task of deplomasStore.DiplomaGerarList"
-            (click)="goToDiploma(task.SerialNumber)"
-          >
+        <ion-list>
+          <div class=" ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of deplomasStore.DiplomaGerarList"
+            (click)="goToDiploma(task.SerialNumber)">
             <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
               <div class="exp-top-detail">
                 <div class="subject d-flex align-center">
@@ -75,8 +73,10 @@
                   <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                    src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                    src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
@@ -90,7 +90,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                  <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>
@@ -100,10 +100,8 @@
     </div>
 
     <!-- Empty -->
-    <div
-      *ngIf="!skeletonLoader && diplomasList.length == 0"
-      class="empty-list d-flex height-100 align-center justify-content-center"
-    >
+    <div *ngIf="!skeletonLoader && diplomasList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center">
       <span>Lista vazia</span>
     </div>
 
@@ -138,15 +136,12 @@
 
   <div class="main-content width-100 overflow-y-auto height-100">
 
-    <div >
+    <div>
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
       <div class="height-100">
         <ion-list>
-          <div
-            class="expediente ion-no-padding ion-no-margin cursor-pointer"  
-            *ngFor = "let task of deplomasStore.DiplomaGerarList; let i = index"
-            (click)="goToDiploma(task.SerialNumber)"
-          >
+          <div class="expediente ion-no-padding ion-no-margin cursor-pointer"
+            *ngFor="let task of deplomasStore.DiplomaGerarList; let i = index" (click)="goToDiploma(task.SerialNumber)">
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
             <div class="item width-100">
               <div class="exp-top-detail">
@@ -156,8 +151,10 @@
                   <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                    src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                    src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
@@ -171,7 +168,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                  <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>
@@ -181,15 +178,13 @@
       </div>
     </div>
 
-    <div 
-      *ngIf="!skeletonLoader && deplomasStore.DiplomaGerarList.length == 0" 
-      class="empty-list d-flex height-100 align-center justify-content-center"
-    >
+    <div *ngIf="!skeletonLoader && deplomasStore.DiplomaGerarList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center">
       <span>Lista vazia</span>
     </div>
 
     <div *ngIf="skeletonLoader && deplomasStore.DiplomaGerarList.length == 0">
-    
+
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">
@@ -215,5 +210,4 @@
     </div>
   </div>
 
-</ion-content>
-
+</ion-content>
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index bacf17fe7..bb9b1beb9 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -1,14 +1,8 @@
 <ion-header class="ion-no-border header-2">
 
-  <app-task-list-header
-    [goBackButton] = true
-    [headerName] = "headerName"
-    [ordinance] = ordinance
-    [loading] = skeletonLoader
-    (reorderList) = reorderList($event)
-    (changeFilterName) = changeFilterName($event)
-    (goBack) = goBack()
-  ></app-task-list-header>
+  <app-task-list-header [goBackButton]=true [headerName]="headerName" [ordinance]=ordinance [loading]=skeletonLoader
+    (reorderList)=reorderList($event) (changeFilterName)=changeFilterName($event)
+    (goBack)=goBack()></app-task-list-header>
 
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -37,40 +31,38 @@
 
         <ion-list *ngSwitchCase="'validar'">
           <div *ngIf="listDiplomasPorValidar.length >= 1">
-            <ion-item
-            class=" ion-no-padding cursor-pointer"
-            *ngFor = "let task of listDiplomasPorValidar"
-            (click)="goToDiploma(task.SerialNumber)"
-            lines="none"
-            >
-            <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
-              <div class="exp-top-detail">
-                <div class="subject d-flex align-center">
-                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
-                  <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
-                  <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
+            <ion-item class=" ion-no-padding cursor-pointer" *ngFor="let task of listDiplomasPorValidar"
+              (click)="goToDiploma(task.SerialNumber)" lines="none">
+              <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
+                <div class="exp-top-detail">
+                  <div class="subject d-flex align-center">
+                    <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
+                    <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
+                    <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
+                  </div>
+                  <div class="exp-icon">
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                      src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                      src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                    <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+                  </div>
                 </div>
-                <div class="exp-icon">
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
-                  <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+                <div class="exp-bottom-detail">
+                  <div class="exp-remetente">
+                    <ion-label>{{task.Senders}}</ion-label>
+                  </div>
+                </div>
+                <div class="exp-middle-detail">
+                  <div class="exp-workflow">
+                    <span class="label">{{task.activityInstanceName}}</span>
+                  </div>
+                  <div class="exp-date">
+                    <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                  </div>
                 </div>
               </div>
-              <div class="exp-bottom-detail">
-                <div class="exp-remetente">
-                  <ion-label>{{task.Senders}}</ion-label>
-                </div>
-              </div>
-              <div class="exp-middle-detail">
-                <div class="exp-workflow">
-                  <span class="label">{{task.activityInstanceName}}</span>
-                </div>
-                <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
-                </div>
-              </div>
-            </div>
-        </ion-item>
+            </ion-item>
           </div>
 
           <div *ngIf="listDiplomasPorValidar.length == 0 && skeletonLoader">
@@ -97,9 +89,9 @@
               </ion-item>
             </ion-list>
           </div>
-  
+
           <div *ngIf="listDiplomasPorValidar.length == 0 && !skeletonLoader"
-          class="empty-list d-flex height-100 align-center justify-content-center">
+            class="empty-list d-flex height-100 align-center justify-content-center">
             <span>Lista vazia</span>
           </div>
 
@@ -109,39 +101,37 @@
 
       <ion-list *ngSwitchCase="'assinados'">
         <div *ngIf="listDiplomasAssinadosPR.length >= 1">
-          <ion-item 
-          class=" ion-no-padding cursor-pointer"
-          *ngFor = "let task of listDiplomasAssinadosPR"
-          (click)="goToDiploma(task.SerialNumber)"
-          lines="none"
-        >
-        <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
-          <div class="exp-top-detail">
-            <div class="subject d-flex">
-              <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
-              <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
-              <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
+          <ion-item class=" ion-no-padding cursor-pointer" *ngFor="let task of listDiplomasAssinadosPR"
+            (click)="goToDiploma(task.SerialNumber)" lines="none">
+            <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
+              <div class="exp-top-detail">
+                <div class="subject d-flex">
+                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
+                  <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
+                  <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
+                </div>
+                <div class="exp-icon">
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                    src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                    src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+                </div>
+              </div>
+              <div class="exp-bottom-detail">
+                <div class="exp-remetente">
+                  <ion-label>{{task.Senders}}</ion-label>
+                </div>
+              </div>
+              <div class="exp-middle-detail">
+                <div class="exp-workflow">
+                  <span class="label">{{task.activityInstanceName}}</span>
+                </div>
+                <div class="exp-date">
+                  <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                </div>
+              </div>
             </div>
-            <div class="exp-icon">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
-              <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
-            </div>
-          </div>
-          <div class="exp-bottom-detail">
-            <div class="exp-remetente">
-              <ion-label>{{task.Senders}}</ion-label>
-            </div>
-          </div>
-          <div class="exp-middle-detail">
-            <div class="exp-workflow">
-              <span class="label">{{task.activityInstanceName}}</span>
-            </div>
-            <div class="exp-date">
-              <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
-            </div>
-          </div>
-        </div>
           </ion-item>
         </div>
 
@@ -171,14 +161,14 @@
         </div>
 
         <div *ngIf="listDiplomasAssinadosPR.length == 0 && !skeletonLoader"
-        class="empty-list d-flex height-100 align-center justify-content-center">
+          class="empty-list d-flex height-100 align-center justify-content-center">
           <span>Lista vazia</span>
         </div>
-        
+
       </ion-list>
 
     </div>
 
   </div>
 
-</ion-content>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index 7d8702a87..5637f8be3 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -2,9 +2,12 @@
   <div class="header-content">
     <div class="header-icon-left">
       <button class="btn-no-color cursor-pointer" (click)="goBack()">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+          src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
+          src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end"
+          src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
       </button>
     </div>
     <div class="header-title">
@@ -15,31 +18,32 @@
       <div>
         <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
         </div>
-  
+
         <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
         </div>
       </div>
 
-      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
-        
+      <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+        placeholder="Selecione agenda">
+
         <mat-select [(value)]="filterName">
 
-          <mat-option value="Para hoje" >
+          <mat-option value="Para hoje">
             Para hoje
           </mat-option>
 
-          <mat-option value="Novos" >
+          <mat-option value="Novos">
             Novas
           </mat-option>
 
-          <mat-option value="Lidos" >
+          <mat-option value="Lidos">
             Lidas
           </mat-option>
 
-          <mat-option value="Não lidos" >
+          <mat-option value="Não lidos">
             Não lidas
           </mat-option>
 
@@ -48,13 +52,13 @@
             Em atraso
           </mat-option>
 
-          <mat-option value="Todos" >
+          <mat-option value="Todos">
             Todas
           </mat-option>
 
-          
+
         </mat-select>
-        
+
       </mat-form-field>
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
@@ -66,53 +70,50 @@
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
-     <ion-refresher-content>
+    <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
 
-  <div class="main-content d-flex height-100" >
+  <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column width-100 overflow-y-auto px-20">
 
       <ion-list>
-        <div
-          class=" ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of list"
-          (click)="goToExpediente(task.SerialNumber)"
-        >
-        <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
-          <div class="exp-top-detail">
-            <div class="subject d-flex align-center">
-              <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label>
-              <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
-              <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
+        <div class=" ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of list"
+          (click)="goToExpediente(task.SerialNumber)">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
+            <div class="exp-top-detail">
+              <div class="subject d-flex align-center">
+                <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label>
+                <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
+                <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
+              </div>
+              <div class="exp-icon">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+              </div>
             </div>
-            <div class="exp-icon">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
-              <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+            <div class="exp-bottom-detail">
+              <div class="exp-remetente">
+                <ion-label>{{task.Senders}}</ion-label>
+              </div>
+            </div>
+            <div class="exp-middle-detail">
+              <div class="exp-workflow">
+                <span class="label">{{task.activityInstanceName}}</span>
+              </div>
+              <div class="exp-date">
+                <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+              </div>
             </div>
           </div>
-          <div class="exp-bottom-detail">
-            <div class="exp-remetente">
-              <ion-label>{{task.Senders}}</ion-label>
-            </div>
-          </div>
-          <div class="exp-middle-detail">
-            <div class="exp-workflow">
-              <span class="label">{{task.activityInstanceName}}</span>
-            </div>
-            <div class="exp-date">
-              <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
-            </div>
-          </div>
-        </div>
         </div>
       </ion-list>
 
-      <div
-      *ngIf="!skeletonLoader && list.length == 0 && list.length == 0"
-        class="empty-list d-flex height-100 align-center justify-content-center"
-      >
+      <div *ngIf="!skeletonLoader && list.length == 0 && list.length == 0"
+        class="empty-list d-flex height-100 align-center justify-content-center">
         <span>Lista vazia</span>
       </div>
 
@@ -145,4 +146,4 @@
     </div>
   </div>
 
-</ion-content>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 8ab0e5b26..f367f6994 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -7,60 +7,62 @@
 
   <div class="main-content d-flex height-100 border-t-radius">
 
-      <!-- Aside left -->
-      <div  class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1">
-        <ion-progress-bar type="indeterminate" *ngIf="TaskService.showLoader"></ion-progress-bar>
-        <div class="title-container" >
-          <div class="title d-flex justify-center">
-            <ion-label *ngIf="hideRefreshBtn">Gabinete Digital</ion-label>
-            <div class="d-flex align-center cursor" *ngIf="!hideRefreshBtn && segmentVista == 'listview' ">
-              <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
-                <mat-select [(value)]="filterName" (selectionChange)="dynamicSearch()">
-        
-                  <mat-option value="Para hoje" >
-                    Para hoje
-                  </mat-option>
-        
-                  <mat-option value="Novos" >
-                    Novas
-                  </mat-option>
-        
-                  <mat-option value="Lidos" >
-                    Lidas
-                  </mat-option>
-        
-                  <mat-option value="Não lidos" >
-                    Não lidas
-                  </mat-option>
-        
-                  <mat-option value="OverdueTasks">
-                    Em atraso
-                  </mat-option>
-      
-                  <mat-option value="Todos" >
-                    Todas
-                  </mat-option>
-        
-                </mat-select>
-              </mat-form-field>
-              
-              <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' && !hideRefreshBtn ">
+    <!-- Aside left -->
+    <div class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1">
+      <ion-progress-bar type="indeterminate" *ngIf="TaskService.showLoader"></ion-progress-bar>
+      <div class="title-container">
+        <div class="title d-flex justify-center">
+          <ion-label *ngIf="hideRefreshBtn">Gabinete Digital</ion-label>
+          <div class="d-flex align-center cursor" *ngIf="!hideRefreshBtn && segmentVista == 'listview' ">
+            <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+              placeholder="Selecione agenda">
+              <mat-select [(value)]="filterName" (selectionChange)="dynamicSearch()">
 
-                <ion-icon  class="ml-10 font-25-rem"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
-              </div>
+                <mat-option value="Para hoje">
+                  Para hoje
+                </mat-option>
 
-              <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' && !hideRefreshBtn ">
-                <ion-icon  class="ml-10 font-25-rem"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
-              </div>
-            
+                <mat-option value="Novos">
+                  Novas
+                </mat-option>
+
+                <mat-option value="Lidos">
+                  Lidas
+                </mat-option>
+
+                <mat-option value="Não lidos">
+                  Não lidas
+                </mat-option>
+
+                <mat-option value="OverdueTasks">
+                  Em atraso
+                </mat-option>
+
+                <mat-option value="Todos">
+                  Todas
+                </mat-option>
+
+              </mat-select>
+            </mat-form-field>
+
+            <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' && !hideRefreshBtn ">
+
+              <ion-icon class="ml-10 font-25-rem" src="assets/images/theme/gov/crescente.svg"></ion-icon>
             </div>
+
+            <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' && !hideRefreshBtn ">
+              <ion-icon class="ml-10 font-25-rem" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
+            </div>
+
           </div>
-          <button  title="Atualizar" *ngIf="hideRefreshBtn && TaskService.loadCount" class="btn-no-color btn-refresh" (click)="doRefreshAside()">
-            <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()" style="overflow:hidden; margin-right: 45px;">
+        </div>
+        <button title="Atualizar" *ngIf="hideRefreshBtn && TaskService.loadCount" class="btn-no-color btn-refresh"
+          (click)="doRefreshAside()">
+          <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()" style="overflow:hidden; margin-right: 45px;">
               <ion-segment-button value="listview" class="ion-segment-button-no-border pr-30" >
                 <fa-icon icon="align-justify" [class.activeTab]="segmentVista == 'listview' "></fa-icon>
               </ion-segment-button>
@@ -69,21 +71,21 @@
               </ion-segment-button>
             </ion-segment> -->
 
-            <div class="d-flex">
-              <div (click)="segmentVista = 'listview' " class="mr-30">
-                <fa-icon icon="align-justify" [class.activeTab]="segmentVista == 'listview' "></fa-icon>
-              </div>
-              <div (click)="segmentVista = 'boxview' ">
-                <fa-icon icon="th-large" [class.activeTab]="segmentVista == 'boxview' "></fa-icon>
-              </div>
+          <div class="d-flex">
+            <div (click)="segmentVista = 'listview' " class="mr-30">
+              <fa-icon icon="align-justify" [class.activeTab]="segmentVista == 'listview' "></fa-icon>
+            </div>
+            <div (click)="segmentVista = 'boxview' ">
+              <fa-icon icon="th-large" [class.activeTab]="segmentVista == 'boxview' "></fa-icon>
             </div>
-
-
           </div>
-        </div>  
-        <div *ngIf="segmentVista == 'listview' " class="d-flex px-20 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">
+
+
+        </div>
+      </div>
+      <div *ngIf="segmentVista == 'listview' " class="d-flex px-20 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-rem" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
               <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src='assets/images/icons-search.svg'></ion-icon>
               <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
@@ -92,592 +94,814 @@
               <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-35-rem" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
               <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
             </button> -->
-  
-            <div *ngIf="showSearch" class="width-100">
-              <div class="d-flex search-input-container justify-between" *ngIf="showSearch">
-                <!-- <div class="icon" (click)="basicSearch()">
+
+          <div *ngIf="showSearch" class="width-100">
+            <div class="d-flex search-input-container 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 flex-1">
-                  <ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
-                    class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
-                </div>
-                
-                <div (click)="basicSearch()"  class="d-flex align-center icon">
-  
-                  <ion-icon  class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
-      
-                </div>
+              <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>
+
+              <div (click)="basicSearch()" class="d-flex align-center icon">
+
+                <ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
+
               </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" (selectionChange)="dynamicSearch()">
-      
-                <mat-option value="Para hoje" >
-                  Para hoje
-                </mat-option>
-      
-                <mat-option value="Novos" >
-                  Novas
-                </mat-option>
-      
-                <mat-option value="Lidos" >
-                  Lidas
-                </mat-option>
-      
-                <mat-option value="Não lidos" >
-                  Não lidas
-                </mat-option>
-      
-                <mat-option value="OverdueTasks">
-                  Em atraso
-                </mat-option>
-    
-                <mat-option value="Todos" >
-                  Todas
-                </mat-option>
-      
-              </mat-select>
-            </mat-form-field>
-  
-          </div>
-          
         </div>
 
-        <div #scroll [ngSwitch]="segmentVista" class="overflow-y-auto">
-          <!-- This is the list view -->
-          <div *ngSwitchCase="'listview'">
+        <div *ngIf="hideSearchBtn">
+          <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+            placeholder="Selecione agenda">
+            <mat-select [(value)]="filterName" (selectionChange)="dynamicSearch()">
 
-            
-            <ion-item-sliding *ngIf="TaskService.loadCount || (AllProcess.length >= 1 && TaskService.loadNum >= 1)">
-              <div class="listview" >
-                <ion-list *ngIf="AllProcess">
-                  <div
-                    class=" box-hover ion-no-padding cursor-pointer"
-                    *ngFor = "let task of AllProcess"
-                    (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
-                    <div class="item-wrapper">
-                      <div class="item width-100">
-                        <div class="item-top-detail">
-                          <div class="item-subject">
-                            <!-- ... {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName }} {{ task.activityInstanceName }} -->
-                            <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
-                            <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span>
-                            <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate || task.taskStartDate)">Nova</span>
-                          </div>
-                          <div *ngIf="task.DocumentsQty != 0" class="item-icon">
-                            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
-                            <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-attachment.svg"></ion-icon>
-                            <label>{{task.DocumentsQty || task.totalDocuments}}</label>
-                          </div>
+              <mat-option value="Para hoje">
+                Para hoje
+              </mat-option>
+
+              <mat-option value="Novos">
+                Novas
+              </mat-option>
+
+              <mat-option value="Lidos">
+                Lidas
+              </mat-option>
+
+              <mat-option value="Não lidos">
+                Não lidas
+              </mat-option>
+
+              <mat-option value="OverdueTasks">
+                Em atraso
+              </mat-option>
+
+              <mat-option value="Todos">
+                Todas
+              </mat-option>
+
+            </mat-select>
+          </mat-form-field>
+
+        </div>
+
+      </div>
+
+      <div #scroll [ngSwitch]="segmentVista" class="overflow-y-auto">
+        <!-- This is the list view -->
+        <div *ngSwitchCase="'listview'">
+
+
+          <ion-item-sliding *ngIf="TaskService.loadCount || (AllProcess.length >= 1 && TaskService.loadNum >= 1)">
+            <div class="listview">
+              <ion-list *ngIf="AllProcess">
+                <div class=" box-hover ion-no-padding cursor-pointer" *ngFor="let task of AllProcess"
+                  (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
+                  <div class="item-wrapper">
+                    <div class="item width-100">
+                      <div class="item-top-detail">
+                        <div class="item-subject">
+                          <!-- ... {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName }} {{ task.activityInstanceName }} -->
+                          <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.Subject ||
+                            task.workflowInstanceDataFields.Subject}}</ion-label>
+                          <span class="dead-line ml-10"
+                            *ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span>
+                          <span class="new-task ml-10"
+                            *ngIf="TaskService.lessThen24Hours(task.TaskStartDate || task.taskStartDate)">Nova</span>
                         </div>
-                        <div class="item-middle-detail">
-                          <div class="item-remetente">
-                            <ion-label *ngIf="task.Senders">{{task.Senders }}</ion-label>
-                            <ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender }}</ion-label>
-                          </div>
+                        <div *ngIf="task.DocumentsQty != 0" class="item-icon">
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                            src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                            src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
+                            src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-attachment.svg"></ion-icon>
+                          <label>{{task.DocumentsQty || task.totalDocuments}}</label>
                         </div>
-                        <div *ngIf="task.Agenda" class="item-middle-detail">
-                          <div class="item-remetente">
-                            <ion-label>{{task.customDate}}</ion-label>
-                          </div>
+                      </div>
+                      <div class="item-middle-detail">
+                        <div class="item-remetente">
+                          <ion-label *ngIf="task.Senders">{{task.Senders }}</ion-label>
+                          <ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender
+                            }}</ion-label>
                         </div>
-                        <div *ngIf="task.Agenda" class="item-middle-detail-extra">
-                          <div class="item-middle-detail-extra-text">
-                            <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
-                              <!-- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República -->
-                              Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Titular
-                            </ion-label>
-                            <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
-                              A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}}
-                            </ion-label>
-                          </div>
+                      </div>
+                      <div *ngIf="task.Agenda" class="item-middle-detail">
+                        <div class="item-remetente">
+                          <ion-label>{{task.customDate}}</ion-label>
                         </div>
-                        <div class="item-bottom-detail d-flex align-items-center">
-                          <div class="item-workflow">
-                            <span class="label">{{task.activityInstanceName}}</span>
-                          </div>
-                          <div class="item-date">
-                            <ion-label>{{ task.CreateDate || task.taskStartDate || task.TaskStartDate  | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
-                          </div>
+                      </div>
+                      <div *ngIf="task.Agenda" class="item-middle-detail-extra">
+                        <div class="item-middle-detail-extra-text">
+                          <ion-label
+                            *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
+                            <!-- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República -->
+                            Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Titular
+                          </ion-label>
+                          <ion-label
+                            *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
+                            A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}}
+                          </ion-label>
+                        </div>
+                      </div>
+                      <div class="item-bottom-detail d-flex align-items-center">
+                        <div class="item-workflow">
+                          <span class="label">{{task.activityInstanceName}}</span>
+                        </div>
+                        <div class="item-date">
+                          <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm'
+                            }}</ion-label>
                         </div>
                       </div>
                     </div>
                   </div>
-                </ion-list>
-              </div>
-            </ion-item-sliding>
-
-
-            <ion-item-sliding  *ngIf="!TaskService.loadCount" class="width-100">
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-            </ion-item-sliding>
-          </div>
-
-          <!-- This is the box view -->
-          <div  *ngSwitchCase="'boxview'"  class="aside d-flex  flex-wrap width-100 height-100">
-            <div *ngIf="TaskService.loadCount" class="center-box">
-
-              <!-- List -->
-              <div *ngIf="hideInMobile" (click)="openAllProcessesPage()" [class.active]="selectedElement == 'allProcessesTag'"  class="box-hover exp-card d-flex flex-column" >
-                <div class="d-flex justify-center">
-                 <!--  <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon> -->
-                  <fa-icon class="icon-selected" icon="align-justify"></fa-icon>
                 </div>
-                <p class="text-center exp-card-title ">
-                  Todas as tarefas <br>
-                  <span class="new-task-count" *ngIf="TaskService.new >=2">{{ TaskService.new }} correspondências novas </span>
-                  <span class="new-task-count" *ngIf="TaskService.new == 1">{{ TaskService.new }} correspondência novas</span> 
-                </p>
-                <p class="text-center exp-card-content" >  {{ AllProcess.length }} 
-                  <span class="title1" *ngIf="AllProcess.length == 0">correspondência</span>
-                  <span class="title1" *ngIf="AllProcess.length == 1">correspondência</span>
-                  <span class="title1" *ngIf="AllProcess.length > 1">correspondências</span>
-                </p>
-              </div>
-              <!-- List -->
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDespachosPrPage(); selectedElement='showDespachosPr'" [class.active]="selectedElement == 'showDespachosPr'" class="box-hover exp-card-long width-100 d-flex flex-column justify-center">
-                <div class="center-div">
-                  <div class="exp-card-icon">
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'showDespachosPr'"  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'showDespachosPr'"  src="assets/images/theme/gov/icons-despachos-presidente-hover.svg"></ion-icon>
-                  </div>
-                  <div class="exp-card-text">
-                    <!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p> -->
-                    <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">
-                      Despachos {{ environment.despachoLabel }} <br>
-                      <span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{ TaskService.despachoprstore.newList.length}}  correspondências novas </span>
-                      <span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length == 1">{{ TaskService.despachoprstore.newList.length}} correspondência nova </span>
-                    </p>
+              </ion-list>
+            </div>
+          </ion-item-sliding>
 
-                    <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && !p.userPermission([p.permissionList.Gabinete.md_tasks])">
-                      Despachos criados por mim<br>
-                      <span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{ TaskService.despachoprstore.newList.length}} correspondências novas </span>
-                      <span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length ==1">{{ TaskService.despachoprstore.newList.length}} correspondência nova </span>
-                    </p>
-                    <p class="text-center exp-card-content"> {{ TaskService.despachoprstore.count }} 
-                      <span class="title1" *ngIf="TaskService.despachoprstore.count == 0">correspondência</span>
-                      <span class="title1" *ngIf="TaskService.despachoprstore.count == 1">correspondência</span>
-                      <span class="title1" *ngIf="TaskService.despachoprstore.count > 1">correspondências</span>
-                    </p>
-                  </div>
+
+          <ion-item-sliding *ngIf="!TaskService.loadCount" class="width-100">
+            <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+              <div class="item-content flex-grow-1 cursor-pointer">
+                <div class="my-2">
+                  <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                </div>
+                <div class="my-2">
+                  <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                </div>
+                <div class="my-2">
+                  <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
                 </div>
               </div>
-              <!-- List -->
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
-                </div>
-                <p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">
-                  Diplomas assinados PR <br>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência nova</span>
-                </p>
-                <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas <br>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência nova</span>
-                </p>
-                <p class="text-center exp-card-content"> {{ TaskService.deplomasStore.countDiplomasAssinadoListCount }}
-                  <span class="title1" *ngIf="TaskService.deplomasStore.countDiplomasAssinadoListCount == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.countDiplomasAssinadoListCount == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.countDiplomasAssinadoListCount > 1">correspondências</span>
-              </div>
-              
 
-                         
-              <!-- List -->
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
+            </ion-item>
+            <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+              <div class="item-content flex-grow-1 cursor-pointer">
+                <div class="my-2">
+                  <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
                 </div>
-                <p class="text-center exp-card-title">Diplomas por Assinar {{ environment.PR}} <br>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >=2">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas  correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length ==1">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma correspondência nova</span>
-                </p>
-                <p class="text-center exp-card-content"> 
-                  {{ TaskService.deplomasStore.diplomasParaAssinartCount }} 
-                  <span class="title1" *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount > 1">correspondências</span>
-                </p>
-              </div>
-              
-              <!-- List -->
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
+                <div class="my-2">
+                  <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                </div>
+                <div class="my-2">
+                  <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
                 </div>
-                <p class="text-center exp-card-title " >
-                  Diplomas por Validar<br>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasReviewListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasReviewListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondência nova</span>
-                </p>
-                <!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Assinar PR</p> -->
-                <p class="text-center exp-card-content"> 
-                  {{ TaskService.deplomasStore.deplomasReviewCount }} 
-                  <span class="title1" *ngIf="TaskService.deplomasStore.deplomasReviewCount == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.deplomasReviewCount == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.deplomasReviewCount > 1">correspondências</span>
-                </p>
               </div>
 
-              
-              <!-- List -->
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
+            </ion-item>
+            <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+              <div class="item-content flex-grow-1 cursor-pointer">
+                <div class="my-2">
+                  <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
                 </div>
-                <p class="text-center exp-card-title">Diplomas para Assinar<br>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >= 2">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondências novas</span>
-                  <span class="new-task-count " *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length == 1">{{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondência nova</span>
-                </p>
-                <p class="text-center exp-card-content"> 
-                  {{ TaskService.deplomasStore.diplomasParaAssinartCount }} 
-                  <span class="title1" *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount > 1">correspondências</span>
-                </p>
-              </div>
-              
-
-              <!-- List -->
-              <div *ngIf="SessionStore.user.Profile == 'Consultant' && environment.presidential"  (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'gerarDiplomas'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'gerarDiplomas'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt'"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-diplomas-assinados-presidente.svg"></ion-icon>
-                  <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'gerarDiplomas'"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
+                <div class="my-2">
+                  <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                </div>
+                <div class="my-2">
+                  <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
                 </div>
-
-                <p class="text-center exp-card-title" >
-                  Diplomas por elaborar <br>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasGerarListNewCount.length >=2">{{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasGerarListNewCount.length ==1">{{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondência nova</span>
-                </p>
-                <p class="text-center exp-card-content"> 
-                  {{  TaskService.deplomasStore.DiplomaGerarList.length }} 
-                  <span class="title1" *ngIf="TaskService.deplomasStore.DiplomaGerarList.length == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.DiplomaGerarList.length == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.deplomasStore.DiplomaGerarList.length > 1">correspondências</span>
-                </p>
-
               </div>
 
-              <!-- List -->
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])" (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'"  class="box-hover exp-card d-flex flex-column">
-                <div class="d-flex justify-center">
-                  <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
-                </div>
-                <p class="text-center exp-card-title ">Eventos para Aprovação <br>
-                  <span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} eventos novos</span>
-                  <span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} evento novo</span>
-                </p>
-                <p class="text-center exp-card-content"> 
-                  {{TaskService.eventoaprovacaostore.countAll}} 
-                  <span class="title1" *ngIf="TaskService.eventoaprovacaostore.countAll == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.eventoaprovacaostore.countAll == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.eventoaprovacaostore.countAll > 1">correspondências</span>
-                </p>
-              </div>
-  
-              <!-- List -->
-              <div (click)="openExpedientListPage(); selectedElement='Correspondence'" [class.active]="selectedElement == 'Correspondence' || selectedElement == 'Expediente Presidente'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-correspondencia.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Correspondence'" src="assets/images/theme/gov/icons-correspondencia.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Correspondence'" src="assets/images/theme/gov/icons-correspondencia-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia.svg"></ion-icon>
-                  <ion-icon hidden  *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Correspondence'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia-hover.svg"></ion-icon>
-                </div>
+            </ion-item>
+            <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
-                <p class="text-center exp-card-title ">Expediente <br>
-                  <span *ngIf="TaskService.expedientegbstore.newList.length == 1" class="new-task-count">{{ TaskService.expedientegbstore.newList.length}} correspondência nova</span>
-                  <span *ngIf="TaskService.expedientegbstore.newList.length >= 2" class="new-task-count">{{ TaskService.expedientegbstore.newList.length}} correspondências novas</span>
-                </p>
-
-                <p class="text-center exp-card-content"> 
-                  {{TaskService.expedientegbstore.count}}
-                  <span class="title1" *ngIf="TaskService.expedientegbstore.count == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.expedientegbstore.count == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.expedientegbstore.count > 1">correspondências</span>
-                </p>
-                
+              <div class="item-content flex-grow-1 cursor-pointer">
+                <div class="my-2">
+                  <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                </div>
+                <div class="my-2">
+                  <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                </div>
+                <div class="my-2">
+                  <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                </div>
               </div>
 
-              <!-- List -->
-              <div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" [class.active]="selectedElement == 'Dispatches'" class="box-hover exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'">
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Dispatches'"  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Dispatches'"  src="assets/images/theme/gov/icons-despachos-presidente-hover.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt'"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-despachos-presidente.svg"></ion-icon>
-                  <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Dispatches'"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-despachos-presidente-hover.svg"></ion-icon>
+            </ion-item>
+          </ion-item-sliding>
+        </div>
+
+        <!-- This is the box view -->
+        <div *ngSwitchCase="'boxview'" class="aside d-flex  flex-wrap width-100 height-100">
+          <div *ngIf="TaskService.loadCount" class="center-box">
+
+            <!-- List -->
+            <div *ngIf="hideInMobile" (click)="openAllProcessesPage()"
+              [class.active]="selectedElement == 'allProcessesTag'" class="box-hover exp-card d-flex flex-column">
+              <div class="d-flex justify-center">
+                <!--  <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon> -->
+                <fa-icon class="icon-selected" icon="align-justify"></fa-icon>
+              </div>
+              <p class="text-center exp-card-title ">
+                Todas as tarefas <br>
+                <span class="new-task-count" *ngIf="TaskService.new >=2">{{ TaskService.new }} correspondências novas
+                </span>
+                <span class="new-task-count" *ngIf="TaskService.new == 1">{{ TaskService.new }} correspondência
+                  novas</span>
+              </p>
+              <p class="text-center exp-card-content"> {{ AllProcess.length }}
+                <span class="title1" *ngIf="AllProcess.length == 0">correspondência</span>
+                <span class="title1" *ngIf="AllProcess.length == 1">correspondência</span>
+                <span class="title1" *ngIf="AllProcess.length > 1">correspondências</span>
+              </p>
+            </div>
+            <!-- List -->
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])"
+              (click)="openDespachosPrPage(); selectedElement='showDespachosPr'"
+              [class.active]="selectedElement == 'showDespachosPr'"
+              class="box-hover exp-card-long width-100 d-flex flex-column justify-center">
+              <div class="center-div">
+                <div class="exp-card-icon">
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                    src="assets/images/icons-despachos-presidente.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'showDespachosPr'"
+                    src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'showDespachosPr'"
+                    src="assets/images/theme/gov/icons-despachos-presidente-hover.svg"></ion-icon>
                 </div>
-                <p class="text-center exp-card-title ">Despachos<br>
-                  <span class="new-task-count" *ngIf="TaskService.despachoStore.newList.length >=2">{{ TaskService.despachoStore.newList.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.despachoStore.newList.length ==1">{{ TaskService.despachoStore.newList.length}} correspondência nova</span>
+                <div class="exp-card-text">
+                  <!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p> -->
+                  <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">
+                    Despachos {{ environment.despachoLabel }} <br>
+                    <span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{
+                      TaskService.despachoprstore.newList.length}} correspondências novas </span>
+                    <span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length == 1">{{
+                      TaskService.despachoprstore.newList.length}} correspondência nova </span>
                   </p>
-                <p class="text-center exp-card-content"> 
-                  {{TaskService.despachoStore.count}} 
-                  <span class="title1" *ngIf="TaskService.despachoStore.count == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.despachoStore.count == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.despachoStore.count > 1">correspondências</span> 
-                </p>
-              </div>
-              
- 
 
-              
-              <!-- List -->
-              <div (click)="openPedidosPage('parecer'); selectedElement='RequestsForOpinion'" [class.active]="selectedElement == 'RequestsForOpinion'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-parecer.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'RequestsForOpinion' " src="assets/images/theme/gov/icons-expediente-parecer.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'RequestsForOpinion'" src="assets/images/theme/gov/icons-expediente-parecer-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-parecer.svg"></ion-icon>
-                  <ion-icon hidden  *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'RequestsForOpinion'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-parecer-hover.svg"></ion-icon>
+                  <p class="text-center exp-card-title "
+                    *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && !p.userPermission([p.permissionList.Gabinete.md_tasks])">
+                    Despachos criados por mim<br>
+                    <span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length >=2">{{
+                      TaskService.despachoprstore.newList.length}} correspondências novas </span>
+                    <span class="new-task-count" *ngIf="TaskService.despachoprstore.newList.length ==1">{{
+                      TaskService.despachoprstore.newList.length}} correspondência nova </span>
+                  </p>
+                  <p class="text-center exp-card-content"> {{ TaskService.despachoprstore.count }}
+                    <span class="title1" *ngIf="TaskService.despachoprstore.count == 0">correspondência</span>
+                    <span class="title1" *ngIf="TaskService.despachoprstore.count == 1">correspondência</span>
+                    <span class="title1" *ngIf="TaskService.despachoprstore.count > 1">correspondências</span>
+                  </p>
                 </div>
-                <p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
-                  Pedidos de Parecer<br>
-                  <span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2" >{{ TaskService.pedidosstore.listParecerCount.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1" >{{ TaskService.pedidosstore.listParecerCount.length}} correspondência nova</span>
-                </p>
-                <p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
-                  Pedidos de Parecer solicitados por mim <br>
-                  <span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2">{{ TaskService.pedidosstore.listParecerCount.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1">{{ TaskService.pedidosstore.listParecerCount.length}} correspondência nova</span>
-                </p>
-                <p class="text-center exp-card-content"> 
-                  {{TaskService.pedidosstore.countparecer}} 
-                  <span class="title1" *ngIf="TaskService.pedidosstore.countparecer == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.pedidosstore.countparecer == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.pedidosstore.countparecer > 1">correspondências</span> 
-                </p>
               </div>
-              
-              <!-- List -->
-              <div (click)="openPedidosPage('deferimento'); selectedElement = 'RequestForApproval'" [class.active]="selectedElement == 'RequestForApproval'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-deferimento.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'RequestForApproval'" src="assets/images/theme/gov/icons-expediente-deferimento.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'RequestForApproval'" src="assets/images/theme/gov/icons-expediente-deferimento-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-deferimento.svg"></ion-icon>
-                  <ion-icon hidden  *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'RequestForApproval'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-deferimento-hover.svg"></ion-icon>
-                </div>
-                <p class="text-center exp-card-title ">
-                  Pedidos de Deferimento<br>
-                  <span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length >=2">{{ TaskService.pedidosstore.listDeferimentoCount.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length ==1">{{ TaskService.pedidosstore.listDeferimentoCount.length}} correspondência nova</span>
-                </p>
-                <p class="text-center exp-card-content"> 
-                  {{ TaskService.pedidosstore.countdeferimento}}
-                  <span class="title1" *ngIf="TaskService.pedidosstore.countdeferimento == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.pedidosstore.countdeferimento == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.pedidosstore.countdeferimento > 1">correspondências</span> 
-                </p>
+            </div>
+            <!-- List -->
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])"
+              (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'"
+              [class.active]="selectedElement == 'DiplomasAssinados'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasAssinados'"
+                  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasAssinados'"
+                  src="assets/images/theme/gov/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
               </div>
-            
-              <!-- List -->
-              <div  [class.active]="selectedElementF('Pending')" (click)="openPendentesPage(); selectedElement='Pending'" class="box-hover exp-card d-flex flex-column justify-center"  >
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-pendente.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Pending'" src="assets/images/theme/gov/icons-expediente-pendente.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Pending'" src="assets/images/theme/gov/icons-expediente-pendente-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-pendente.svg"></ion-icon>
-                  <ion-icon hidden  *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Pending'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-pendente-hover.svg"></ion-icon>
-                </div>
-                <p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
-                  Pendentes<br>
-                  <span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{ TaskService.pendentesstore.newList.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=1">{{ TaskService.pendentesstore.newList.length}} correspondência nova</span>
-                </p>
-                <p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Meus Pendentes<br>
-
-                  <span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{ TaskService.pendentesstore.newList.length}} correspondências novas</span>
-                  <span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length ==1">{{ TaskService.pendentesstore.newList.length}} correspondência nova</span>
-                </p>
-
-                <p class="text-center exp-card-content"> 
-                  <span class="number">{{TaskService.pendentesstore.count}} </span> 
-                  <span class="title1" *ngIf="TaskService.pendentesstore.count == 0">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.pendentesstore.count == 1">correspondência</span>
-                  <span class="title1" *ngIf="TaskService.pendentesstore.count > 1">correspondências</span> 
-              </div>
-            
-
-              
+              <p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">
+                Diplomas assinados PR <br>
+                <span class="new-task-count"
+                  *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length >=2">{{
+                  TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novas</span>
+                <span class="new-task-count"
+                  *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length ==1">{{
+                  TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência nova</span>
+              </p>
+              <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">
+                Diplomas <br>
+                <span class="new-task-count"
+                  *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length >=2">{{
+                  TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novas</span>
+                <span class="new-task-count"
+                  *ngIf="TaskService.deplomasStore.diplomasAssinadoListNewCount.length ==1">{{
+                  TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência nova</span>
+              </p>
+              <p class="text-center exp-card-content"> {{ TaskService.deplomasStore.countDiplomasAssinadoListCount }}
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.countDiplomasAssinadoListCount == 0">correspondência</span>
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.countDiplomasAssinadoListCount == 1">correspondência</span>
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.countDiplomasAssinadoListCount > 1">correspondências</span>
             </div>
 
-            <div *ngIf="!TaskService.loadCount" class="width-100">
-              
-              <ion-item-sliding  class="width-100">
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-              </ion-item-sliding>
-              <ion-item-sliding  class="width-100">
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-                <ion-item lines="none"
-                class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
-            
-                  <div class="item-content flex-grow-1 cursor-pointer">
-                    <div class="my-2"><div style="width: 90%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
-                    <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
-                  </div>
-            
-                </ion-item>
-              </ion-item-sliding>
+
+
+            <!-- List -->
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"
+              (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'"
+              [class.active]="selectedElement == 'DiplomasParaAssinar'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' "
+                  src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' "
+                  src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
+                <ion-icon hidden
+                  *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' "
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
+              </div>
+              <p class="text-center exp-card-title">Diplomas por Assinar {{ environment.PR}} <br>
+                <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >=2">{{
+                  TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length ==1">{{
+                  TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma correspondência nova</span>
+              </p>
+              <p class="text-center exp-card-content">
+                {{ TaskService.deplomasStore.diplomasParaAssinartCount }}
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 0">correspondência</span>
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 1">correspondência</span>
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount > 1">correspondências</span>
+              </p>
             </div>
 
+            <!-- List -->
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"
+              (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'"
+              [class.active]="selectedElement == 'DiplomasPorValidar'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasPorValidar' "
+                  src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasPorValidar' "
+                  src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
+              </div>
+              <p class="text-center exp-card-title ">
+                Diplomas por Validar<br>
+                <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasReviewListNewCount.length >=2">{{
+                  TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasReviewListNewCount.length ==1">{{
+                  TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondência nova</span>
+              </p>
+              <!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Assinar PR</p> -->
+              <p class="text-center exp-card-content">
+                {{ TaskService.deplomasStore.deplomasReviewCount }}
+                <span class="title1" *ngIf="TaskService.deplomasStore.deplomasReviewCount == 0">correspondência</span>
+                <span class="title1" *ngIf="TaskService.deplomasStore.deplomasReviewCount == 1">correspondência</span>
+                <span class="title1" *ngIf="TaskService.deplomasStore.deplomasReviewCount > 1">correspondências</span>
+              </p>
+            </div>
+
+
+            <!-- List -->
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])"
+              (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'"
+              [class.active]="selectedElement == 'DiplomasParaAssinar'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' "
+                  src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' "
+                  src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
+                <ion-icon hidden
+                  *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' "
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
+              </div>
+              <p class="text-center exp-card-title">Diplomas para Assinar<br>
+                <span class="new-task-count"
+                  *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length >= 2">{{
+                  TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondências novas</span>
+                <span class="new-task-count "
+                  *ngIf="TaskService.deplomasStore.diplomasParaAssinarNewCount.length == 1">{{
+                  TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondência nova</span>
+              </p>
+              <p class="text-center exp-card-content">
+                {{ TaskService.deplomasStore.diplomasParaAssinartCount }}
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 0">correspondência</span>
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount == 1">correspondência</span>
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.diplomasParaAssinartCount > 1">correspondências</span>
+              </p>
+            </div>
+
+
+            <!-- List -->
+            <div *ngIf="SessionStore.user.Profile == 'Consultant' && environment.presidential"
+              (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'"
+              [class.active]="selectedElement == 'gerarDiplomas'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'gerarDiplomas'"
+                  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'gerarDiplomas'"
+                  src="assets/images/theme/gov/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'gerarDiplomas'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
+              </div>
+
+              <p class="text-center exp-card-title">
+                Diplomas por elaborar <br>
+                <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasGerarListNewCount.length >=2">{{
+                  TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.deplomasStore.diplomasGerarListNewCount.length ==1">{{
+                  TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondência nova</span>
+              </p>
+              <p class="text-center exp-card-content">
+                {{ TaskService.deplomasStore.DiplomaGerarList.length }}
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.DiplomaGerarList.length == 0">correspondência</span>
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.DiplomaGerarList.length == 1">correspondência</span>
+                <span class="title1"
+                  *ngIf="TaskService.deplomasStore.DiplomaGerarList.length > 1">correspondências</span>
+              </p>
+
+            </div>
+
+            <!-- List -->
+            <div *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])"
+              (click)="openEventsToApprovePage();selectedElement='approval'"
+              [class.active]="selectedElement == 'approval'" class="box-hover exp-card d-flex flex-column">
+              <div class="d-flex justify-center">
+                <ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
+              </div>
+              <p class="text-center exp-card-title ">Eventos para Aprovação <br>
+                <span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{
+                  TaskService.eventoaprovacaostore.newList.length}} eventos novos</span>
+                <span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{
+                  TaskService.eventoaprovacaostore.newList.length}} evento novo</span>
+              </p>
+              <p class="text-center exp-card-content">
+                {{TaskService.eventoaprovacaostore.countAll}}
+                <span class="title1" *ngIf="TaskService.eventoaprovacaostore.countAll == 0">correspondência</span>
+                <span class="title1" *ngIf="TaskService.eventoaprovacaostore.countAll == 1">correspondência</span>
+                <span class="title1" *ngIf="TaskService.eventoaprovacaostore.countAll > 1">correspondências</span>
+              </p>
+            </div>
+
+            <!-- List -->
+            <div (click)="openExpedientListPage(); selectedElement='Correspondence'"
+              [class.active]="selectedElement == 'Correspondence' || selectedElement == 'Expediente Presidente'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-correspondencia.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Correspondence'"
+                  src="assets/images/theme/gov/icons-correspondencia.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Correspondence'"
+                  src="assets/images/theme/gov/icons-correspondencia-hover.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia.svg"></ion-icon>
+                <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Correspondence'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia-hover.svg"></ion-icon>
+              </div>
+
+              <p class="text-center exp-card-title ">Expediente <br>
+                <span *ngIf="TaskService.expedientegbstore.newList.length == 1" class="new-task-count">{{
+                  TaskService.expedientegbstore.newList.length}} correspondência nova</span>
+                <span *ngIf="TaskService.expedientegbstore.newList.length >= 2" class="new-task-count">{{
+                  TaskService.expedientegbstore.newList.length}} correspondências novas</span>
+              </p>
+
+              <p class="text-center exp-card-content">
+                {{TaskService.expedientegbstore.count}}
+                <span class="title1" *ngIf="TaskService.expedientegbstore.count == 0">correspondência</span>
+                <span class="title1" *ngIf="TaskService.expedientegbstore.count == 1">correspondência</span>
+                <span class="title1" *ngIf="TaskService.expedientegbstore.count > 1">correspondências</span>
+              </p>
+
+            </div>
+
+            <!-- List -->
+            <div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])"
+              [class.active]="selectedElement == 'Dispatches'"
+              class="box-hover exp-card d-flex flex-column justify-center"
+              (click)="openDespachosPage(); selectedElement='Dispatches'">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Dispatches'"
+                  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Dispatches'"
+                  src="assets/images/theme/gov/icons-despachos-presidente-hover.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-despachos-presidente.svg"></ion-icon>
+                <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Dispatches'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-despachos-presidente-hover.svg"></ion-icon>
+              </div>
+              <p class="text-center exp-card-title ">Despachos<br>
+                <span class="new-task-count" *ngIf="TaskService.despachoStore.newList.length >=2">{{
+                  TaskService.despachoStore.newList.length}} correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.despachoStore.newList.length ==1">{{
+                  TaskService.despachoStore.newList.length}} correspondência nova</span>
+              </p>
+              <p class="text-center exp-card-content">
+                {{TaskService.despachoStore.count}}
+                <span class="title1" *ngIf="TaskService.despachoStore.count == 0">correspondência</span>
+                <span class="title1" *ngIf="TaskService.despachoStore.count == 1">correspondência</span>
+                <span class="title1" *ngIf="TaskService.despachoStore.count > 1">correspondências</span>
+              </p>
+            </div>
+
+
+
+
+            <!-- List -->
+            <div (click)="openPedidosPage('parecer'); selectedElement='RequestsForOpinion'"
+              [class.active]="selectedElement == 'RequestsForOpinion'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-parecer.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'RequestsForOpinion' "
+                  src="assets/images/theme/gov/icons-expediente-parecer.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'RequestsForOpinion'"
+                  src="assets/images/theme/gov/icons-expediente-parecer-hover.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-parecer.svg"></ion-icon>
+                <ion-icon hidden
+                  *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'RequestsForOpinion'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-parecer-hover.svg"></ion-icon>
+              </div>
+              <p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
+                Pedidos de Parecer<br>
+                <span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2">{{
+                  TaskService.pedidosstore.listParecerCount.length}} correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1">{{
+                  TaskService.pedidosstore.listParecerCount.length}} correspondência nova</span>
+              </p>
+              <p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
+                Pedidos de Parecer solicitados por mim <br>
+                <span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2">{{
+                  TaskService.pedidosstore.listParecerCount.length}} correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1">{{
+                  TaskService.pedidosstore.listParecerCount.length}} correspondência nova</span>
+              </p>
+              <p class="text-center exp-card-content">
+                {{TaskService.pedidosstore.countparecer}}
+                <span class="title1" *ngIf="TaskService.pedidosstore.countparecer == 0">correspondência</span>
+                <span class="title1" *ngIf="TaskService.pedidosstore.countparecer == 1">correspondência</span>
+                <span class="title1" *ngIf="TaskService.pedidosstore.countparecer > 1">correspondências</span>
+              </p>
+            </div>
+
+            <!-- List -->
+            <div (click)="openPedidosPage('deferimento'); selectedElement = 'RequestForApproval'"
+              [class.active]="selectedElement == 'RequestForApproval'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-deferimento.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'RequestForApproval'"
+                  src="assets/images/theme/gov/icons-expediente-deferimento.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'RequestForApproval'"
+                  src="assets/images/theme/gov/icons-expediente-deferimento-hover.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-deferimento.svg"></ion-icon>
+                <ion-icon hidden
+                  *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'RequestForApproval'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-deferimento-hover.svg"></ion-icon>
+              </div>
+              <p class="text-center exp-card-title ">
+                Pedidos de Deferimento<br>
+                <span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length >=2">{{
+                  TaskService.pedidosstore.listDeferimentoCount.length}} correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length ==1">{{
+                  TaskService.pedidosstore.listDeferimentoCount.length}} correspondência nova</span>
+              </p>
+              <p class="text-center exp-card-content">
+                {{ TaskService.pedidosstore.countdeferimento}}
+                <span class="title1" *ngIf="TaskService.pedidosstore.countdeferimento == 0">correspondência</span>
+                <span class="title1" *ngIf="TaskService.pedidosstore.countdeferimento == 1">correspondência</span>
+                <span class="title1" *ngIf="TaskService.pedidosstore.countdeferimento > 1">correspondências</span>
+              </p>
+            </div>
+
+            <!-- List -->
+            <div [class.active]="selectedElementF('Pending')" (click)="openPendentesPage(); selectedElement='Pending'"
+              class="box-hover exp-card d-flex flex-column justify-center">
+              <div class="d-flex justify-center">
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-pendente.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'Pending'"
+                  src="assets/images/theme/gov/icons-expediente-pendente.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'Pending'"
+                  src="assets/images/theme/gov/icons-expediente-pendente-hover.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-pendente.svg"></ion-icon>
+                <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Pending'"
+                  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-pendente-hover.svg"></ion-icon>
+              </div>
+              <p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
+                Pendentes<br>
+                <span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{
+                  TaskService.pendentesstore.newList.length}} correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=1">{{
+                  TaskService.pendentesstore.newList.length}} correspondência nova</span>
+              </p>
+              <p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Meus
+                Pendentes<br>
+
+                <span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{
+                  TaskService.pendentesstore.newList.length}} correspondências novas</span>
+                <span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length ==1">{{
+                  TaskService.pendentesstore.newList.length}} correspondência nova</span>
+              </p>
+
+              <p class="text-center exp-card-content">
+                <span class="number">{{TaskService.pendentesstore.count}} </span>
+                <span class="title1" *ngIf="TaskService.pendentesstore.count == 0">correspondência</span>
+                <span class="title1" *ngIf="TaskService.pendentesstore.count == 1">correspondência</span>
+                <span class="title1" *ngIf="TaskService.pendentesstore.count > 1">correspondências</span>
+            </div>
+
+
 
           </div>
 
+          <div *ngIf="!TaskService.loadCount" class="width-100">
+
+            <ion-item-sliding class="width-100">
+              <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                <div class="item-content flex-grow-1 cursor-pointer">
+                  <div class="my-2">
+                    <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                </div>
+
+              </ion-item>
+              <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                <div class="item-content flex-grow-1 cursor-pointer">
+                  <div class="my-2">
+                    <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                </div>
+
+              </ion-item>
+              <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                <div class="item-content flex-grow-1 cursor-pointer">
+                  <div class="my-2">
+                    <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                </div>
+
+              </ion-item>
+              <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                <div class="item-content flex-grow-1 cursor-pointer">
+                  <div class="my-2">
+                    <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                </div>
+
+              </ion-item>
+            </ion-item-sliding>
+            <ion-item-sliding class="width-100">
+              <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                <div class="item-content flex-grow-1 cursor-pointer">
+                  <div class="my-2">
+                    <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                </div>
+
+              </ion-item>
+              <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                <div class="item-content flex-grow-1 cursor-pointer">
+                  <div class="my-2">
+                    <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                </div>
+
+              </ion-item>
+              <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                <div class="item-content flex-grow-1 cursor-pointer">
+                  <div class="my-2">
+                    <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                </div>
+
+              </ion-item>
+              <ion-item lines="none" class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                <div class="item-content flex-grow-1 cursor-pointer">
+                  <div class="my-2">
+                    <div style="width: 90%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 50%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                  <div class="my-2">
+                    <div style="width: 100%; background-color: #eeeeee; height: 10px;"></div>
+                  </div>
+                </div>
+
+              </ion-item>
+            </ion-item-sliding>
+          </div>
+
+
         </div>
+
       </div>
+    </div>
 
-      <!-- Aside right -->
-      <div class="aside-content d-none flex-column height-100">
+    <!-- Aside right -->
+    <div class="aside-content d-none flex-column height-100">
 
-        <app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" [style.display]="showEmptyContainer ? 'flex' : 'none'"   class="height-100 flex-column"></app-empty-container>
-        <app-all-processes [profile]="profile" class=" height-100 flex-column"  *ngIf="showAllProcesses" [style.display]="showAllProcesses ? 'flex' : 'none'" ></app-all-processes>
-        <app-events-to-approve [profile]="'MDGPR'"  *ngIf="showEventsToApprove" [style.display]="showEventsToApprove ? 'flex' : 'none'" class=" height-100 flex-column"></app-events-to-approve>
+      <app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer"
+        [style.display]="showEmptyContainer ? 'flex' : 'none'" class="height-100 flex-column"></app-empty-container>
+      <app-all-processes [profile]="profile" class=" height-100 flex-column" *ngIf="showAllProcesses"
+        [style.display]="showAllProcesses ? 'flex' : 'none'"></app-all-processes>
+      <app-events-to-approve [profile]="'MDGPR'" *ngIf="showEventsToApprove"
+        [style.display]="showEventsToApprove ? 'flex' : 'none'" class=" height-100 flex-column"></app-events-to-approve>
 
-        <app-expedients [profile]="profile" class=" height-100 flex-column" *ngIf="showExpedients"  [style.display]="showExpedients ? 'flex' : 'none'" ></app-expedients>
-        <app-pedidos [profile]="profile" [segment]="segment" [serialNumber]="serialNumber" class=" height-100 flex-column" *ngIf="showPedidos"  [style.display]="showPedidos ? 'flex' : 'none'"></app-pedidos>
-        <app-despachos  [profile]="profile" class="height-100 flex-column"  *ngIf="showDespachos" [style.display]="showDespachos ? 'flex' : 'none'"  ></app-despachos>
-        <app-despachos-pr [profile]="profile" class=" height-100 flex-column" *ngIf="showDespachosPr" [style.display]="showDespachosPr ? 'flex' : 'none'" ></app-despachos-pr>
-        <app-pendentes  [profile]="profile" class=" height-100 flex-column"  *ngIf="showPendentes" [style.display]="showPendentes ? 'flex' : 'none'" ></app-pendentes>
-        <app-diplomas (openExpedientDetail)="openExpedientesPrPage($event)" [profile]="profile" [segment]="segment" class=" height-100 flex-column" *ngIf="showDiplomas" [style.display]="showDiplomas ? 'flex' : 'none'"></app-diplomas>
-        <app-diplomas-assinar class=" height-100 flex-column" *ngIf="showDiplomasAssinar" [style.display]="showDiplomasAssinar ? 'flex' : 'none'"></app-diplomas-assinar>
-        <app-expedientes-pr [profile]="profile" class=" height-100 flex-column"  *ngIf="showExpedientesPr" [style.display]="showExpedientesPr ? 'flex' : 'none'" ></app-expedientes-pr>
-        <app-signed-diploma  [profile]="profile" class=" height-100 flex-column"  *ngIf="showSignedDiploma" [style.display]="showSignedDiploma ? 'flex' : 'none'" ></app-signed-diploma>
+      <app-expedients [profile]="profile" class=" height-100 flex-column" *ngIf="showExpedients"
+        [style.display]="showExpedients ? 'flex' : 'none'"></app-expedients>
+      <app-pedidos [profile]="profile" [segment]="segment" [serialNumber]="serialNumber" class=" height-100 flex-column"
+        *ngIf="showPedidos" [style.display]="showPedidos ? 'flex' : 'none'"></app-pedidos>
+      <app-despachos [profile]="profile" class="height-100 flex-column" *ngIf="showDespachos"
+        [style.display]="showDespachos ? 'flex' : 'none'"></app-despachos>
+      <app-despachos-pr [profile]="profile" class=" height-100 flex-column" *ngIf="showDespachosPr"
+        [style.display]="showDespachosPr ? 'flex' : 'none'"></app-despachos-pr>
+      <app-pendentes [profile]="profile" class=" height-100 flex-column" *ngIf="showPendentes"
+        [style.display]="showPendentes ? 'flex' : 'none'"></app-pendentes>
+      <app-diplomas (openExpedientDetail)="openExpedientesPrPage($event)" [profile]="profile" [segment]="segment"
+        class=" height-100 flex-column" *ngIf="showDiplomas"
+        [style.display]="showDiplomas ? 'flex' : 'none'"></app-diplomas>
+      <app-diplomas-assinar class=" height-100 flex-column" *ngIf="showDiplomasAssinar"
+        [style.display]="showDiplomasAssinar ? 'flex' : 'none'"></app-diplomas-assinar>
+      <app-expedientes-pr [profile]="profile" class=" height-100 flex-column" *ngIf="showExpedientesPr"
+        [style.display]="showExpedientesPr ? 'flex' : 'none'"></app-expedientes-pr>
+      <app-signed-diploma [profile]="profile" class=" height-100 flex-column" *ngIf="showSignedDiploma"
+        [style.display]="showSignedDiploma ? 'flex' : 'none'"></app-signed-diploma>
 
-        <app-diplomas-gerars [profile]="profile" class="height-100 flex-column"  *ngIf="showDiplomasGerar" [style.display]="showDiplomasGerar ? 'flex' : 'none'"></app-diplomas-gerars>
-      </div>
+      <app-diplomas-gerars [profile]="profile" class="height-100 flex-column" *ngIf="showDiplomasGerar"
+        [style.display]="showDiplomasGerar ? 'flex' : 'none'"></app-diplomas-gerars>
+    </div>
   </div>
-</ion-content>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index cd78259a8..10e0473fc 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -1,569 +1,629 @@
 @import '~src/function.scss';
 
-ion-content{
+ion-content {
   /*  --padding-top:15px; */
- /*   --padding-end:15px;
+  /*   --padding-end:15px;
    --padding-start:15px; */
   /*  --padding-bottom:15px; */
-   /* --background:#ecf8ff; */
- }
- ion-segment{
-   overflow: auto;
- }
- ion-segment-button{
-   margin: 0 auto !important;
-   padding: 0 !important;
- 
-   --padding-bottom: 0px;
-   --padding-top: 5px;
-   --margin-bottom: 5px;
-   --margin-top: 0px;
- 
-   min-height: rem(25);
-   min-width: 25px;
- }
- :host{
-   // background: #0782c9;
-   ion-card-title {
-     text-align: center;
-   }
-   .title-container{
-     background:var(--gabinete-title-container);
-     padding: 30px 20px 15px 20px !important;
-     //margin-bottom: 15px;
-     border-top-left-radius: 25px;
-     border-top-right-radius: 25px;
- 
-     .title{
-       width: fit-content;
-       font-size: rem(25) !important;
-       float: left;
-     }
-     .btn-no-color{
-       display: flex;
-       float: right;
-     }
-     .title-icon{
-       float: right;
-       margin-right: 20px;
-       font-size: rem(30);
-       color: #42b9fe;
-     }
-     .title-icons{
-       width: fit-content;
-       float: right !important;
-       align-self: baseline;
-     }
-     .title-icons fa-icon{
-       font-size: rem(25) !important;
-     }
-   }
- 
-   ion-card{
-     background-color: #d4d5ca;
-     border-radius: 20px;
-   }
-   ion-item{
-     --ion-background-color:#ffffff;
-     margin-bottom: 10px;
-     border-radius: 5px;
-   }
-   ion-button{
-     color: #000;
-     --background:none;
-     --border-color: none;
-     --box-shadow:none;
-   }
-   ion-label{
-     padding: 10px;
-   }
- }
- .ion-item-change-color{
-   --ion-background-color:#fff2cc !important;
-   margin-bottom: 10px;
-   border-radius: 5px;
- }
- .div-top-header{
-   width: 400px;
-   margin: 0 auto;
-   background-color: #0782c9;
-   overflow: auto;
-   padding-top: 15px;
-   border: 0!important;
- 
-   .div-search{
-     font-size: rem(45);
-     float: left;
-     margin: 0 0 0 10px
-   }
-   .div-logo{
-     background: transparent;
-     width: 140px;
-     margin: 5px 0 0px 71px;
-     float: left;
-   }
-   .div-logo img{
-     width: 100%;
-   }
-   .div-profile{
-     font-size: rem(45);
-     float: right;
-     margin-right: 10px;
-   }
- }
- 
- 
- /* NEW CSS */
- .main-content {
-   width: 100%; /* 400px */
-   height: 100%;
-   font-family: Roboto;
-   margin: 0 auto;
-   background:var(--gabinete-main-container);
-   overflow:hidden;
-   padding: 0 !important;
- 
-   .aside-wrapper{
-     overflow: hidden;
-     .listview{
-       width: 100%t;
-       height: auto !important;
-       padding: 0px 20px 15px 20px !important;
-       overflow: auto;
-     }
-   }
- 
- 
- 
-   .aside{
-     align-items: center;
-     justify-content: center;
- 
-     .exp-card{
-       cursor: pointer;
-       user-select: none;
-       width: 173px;
-       height: 200px;
-       margin: 7px;
-       padding: 30px 5px 30px 5px;
-       border-radius: 15px;
-       box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
-       background: white;
-       border: 1px solid white;
-       float: left;
-     }
-     .exp-card-long{
-       cursor: pointer;
-       user-select: none;
-       background:  white;
-       box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
-       width: 360px;
-       margin: 7px;
-       border-radius: 15px;
-       padding: 7px;
-       border:1px solid white;
- 
-       .center-div{
-         width: fit-content;
-         margin: 0 auto;
-         overflow: auto;
- 
-         .exp-card-title{
-           margin: 0 !important;
-         }
-       }
- 
-       .exp-card-icon{
-         width: fit-content;
-         font-size: rem(48);
-         float: left !important;
-       }
-       .exp-card-text{
-         padding: 0 !important;
-         margin: 0 !important;
-         width: fit-content;
-         float: left !important;
-       }
-     }
- 
-     .exp-card-icon{
-       margin: 0 auto;
-     }
-     .exp-card ion-icon{
-       font-size: rem(48) !important;
-     }
-     .exp-card fa-icon{
-       font-size: rem(30);
-       padding: 0 1px 0 1px;
-       margin: 6px;
-       //border: 1px solid #ccc;
-       color: #797979;
-     }
-     .exp-card-title{
-       font-size: rem(15);
-       color: var(--title-text-color);;
-       font-family: Roboto;
-       font-weight: bold;
-       font-stretch: normal;
-       font-style: normal;
-       margin: 15px 0 0 10px;
-       text-align: center;
-     }
-     .exp-card-title p{
-       text-align: center;
- 
-     }
-     .exp-card-content{
-       font-size: rem(13);
-       color: #797979;
-       margin: 11px 0 0;
-       font-family: Roboto;
-       font-weight: 700;
-       font-stretch: normal;
-       font-style: normal;
-       line-height: normal;
-       letter-spacing: normal;
-       text-align: center;
-     }
- 
-   }
- }
- .title-content{
-   height: auto;
-   margin: 0 auto;
-   overflow: hidden;
-   padding: 0 !important;
-   background: transparent;
- }
- .div-title{
-   padding: 0!important;
-   float: left;
- }
- .title{
-   font-size: rem(25);
- }
- .div-icon{
-   float: right;
-   font-size: rem(35);
-   overflow: auto;
- }
- 
- /* New list view CSS */
- ion-list{
-   background: transparent;
- }
- .item-wrapper{
-   border-radius: 15px;
-   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
-   border:1px solid #e9e9e9 !important;
-   background-color: #fff !important;
-   margin-bottom: 10px !important;
-   padding: rem(15);
- 
-   .item{
-     background-color: var(--white);
-     margin: 0 auto;
-     overflow: hidden;
- 
-     .item-top-detail{
-       width: 100%;
-       float: left;
-       font-family: Roboto;
-       font-size: rem(16);
-       font-weight: 700;
-       color: var(--title-text-color);
-       padding-left: 3px;
- 
-       .item-subject{
-         width: 84%;
-         float: left;
- 
-          ion-label{
-            float: left;
-            display: inline;
-            margin: 0 !important;
-            padding: 2.5px 10.5px 2.5px 10.5px;
-          }
-       }
- 
-       .item-icon{
-         width: fit-content;
-         float: right;
-       /* font-size: rem(13); */
-         margin: 0 !important;
-         padding: 0 !important;
- 
-         ion-icon{
-           font-size: rem(16);
-           color: #42b9fe;
-           float: left;
-         }
-         label{
-           font-size: rem(13);
-         }
-       }
-     }
-     .item-middle-detail{
-       font-size: rem(13);
-       width: 100%;
-       overflow: auto;
-       padding-left: 3px;
-       //border: 1px solid red;
-       margin: 0 !important;
- 
-       .item-remetente{
-         //width: 200px;
-         font-family: Roboto;
+  /* --background:#ecf8ff; */
+}
+
+ion-segment {
+  overflow: auto;
+}
+
+ion-segment-button {
+  margin: 0 auto !important;
+  padding: 0 !important;
+
+  --padding-bottom: 0px;
+  --padding-top: 5px;
+  --margin-bottom: 5px;
+  --margin-top: 0px;
+
+  min-height: rem(25);
+  min-width: 25px;
+}
+
+:host {
+
+  // background: #0782c9;
+  ion-card-title {
+    text-align: center;
+  }
+
+  .title-container {
+    background: var(--gabinete-title-container);
+    padding: 30px 20px 15px 20px !important;
+    //margin-bottom: 15px;
+    border-top-left-radius: 25px;
+    border-top-right-radius: 25px;
+
+    .title {
+      width: fit-content;
+      font-size: rem(25) !important;
+      float: left;
+    }
+
+    .btn-no-color {
+      display: flex;
+      float: right;
+    }
+
+    .title-icon {
+      float: right;
+      margin-right: 20px;
+      font-size: rem(30);
+      color: #42b9fe;
+    }
+
+    .title-icons {
+      width: fit-content;
+      float: right !important;
+      align-self: baseline;
+    }
+
+    .title-icons fa-icon {
+      font-size: rem(25) !important;
+    }
+  }
+
+  ion-card {
+    background-color: #d4d5ca;
+    border-radius: 20px;
+  }
+
+  ion-item {
+    --ion-background-color: #ffffff;
+    margin-bottom: 10px;
+    border-radius: 5px;
+  }
+
+  ion-button {
+    color: #000;
+    --background: none;
+    --border-color: none;
+    --box-shadow: none;
+  }
+
+  ion-label {
+    padding: 10px;
+  }
+}
+
+.ion-item-change-color {
+  --ion-background-color: #fff2cc !important;
+  margin-bottom: 10px;
+  border-radius: 5px;
+}
+
+.div-top-header {
+  width: 400px;
+  margin: 0 auto;
+  background-color: #0782c9;
+  overflow: auto;
+  padding-top: 15px;
+  border: 0 !important;
+
+  .div-search {
+    font-size: rem(45);
+    float: left;
+    margin: 0 0 0 10px
+  }
+
+  .div-logo {
+    background: transparent;
+    width: 140px;
+    margin: 5px 0 0px 71px;
+    float: left;
+  }
+
+  .div-logo img {
+    width: 100%;
+  }
+
+  .div-profile {
+    font-size: rem(45);
+    float: right;
+    margin-right: 10px;
+  }
+}
+
+
+/* NEW CSS */
+.main-content {
+  width: 100%;
+  /* 400px */
+  height: 100%;
+  font-family: Roboto;
+  margin: 0 auto;
+  background: var(--gabinete-main-container);
+  overflow: hidden;
+  padding: 0 !important;
+
+  .aside-wrapper {
+    overflow: hidden;
+
+    .listview {
+      width: 100%t;
+      height: auto !important;
+      padding: 0px 20px 15px 20px !important;
+      overflow: auto;
+    }
+  }
+
+
+
+  .aside {
+    align-items: center;
+    justify-content: center;
+
+    .exp-card {
+      cursor: pointer;
+      user-select: none;
+      width: 173px;
+      height: 200px;
+      margin: 7px;
+      padding: 30px 5px 30px 5px;
+      border-radius: 15px;
+      box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+      background: white;
+      border: 1px solid white;
+      float: left;
+    }
+
+    .exp-card-long {
+      cursor: pointer;
+      user-select: none;
+      background: white;
+      box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+      width: 360px;
+      margin: 7px;
+      border-radius: 15px;
+      padding: 7px;
+      border: 1px solid white;
+
+      .center-div {
+        width: fit-content;
+        margin: 0 auto;
+        overflow: auto;
+
+        .exp-card-title {
+          margin: 0 !important;
+        }
+      }
+
+      .exp-card-icon {
+        width: fit-content;
+        font-size: rem(48);
+        float: left !important;
+      }
+
+      .exp-card-text {
+        padding: 0 !important;
+        margin: 0 !important;
+        width: fit-content;
+        float: left !important;
+      }
+    }
+
+    .exp-card-icon {
+      margin: 0 auto;
+    }
+
+    .exp-card ion-icon {
+      font-size: rem(48) !important;
+    }
+
+    .exp-card fa-icon {
+      font-size: rem(30);
+      padding: 0 1px 0 1px;
+      margin: 6px;
+      //border: 1px solid #ccc;
+      color: #797979;
+    }
+
+    .exp-card-title {
+      font-size: rem(15);
+      color: var(--title-text-color);
+      ;
+      font-family: Roboto;
+      font-weight: bold;
+      font-stretch: normal;
+      font-style: normal;
+      margin: 15px 0 0 10px;
+      text-align: center;
+    }
+
+    .exp-card-title p {
+      text-align: center;
+
+    }
+
+    .exp-card-content {
+      font-size: rem(13);
+      color: #797979;
+      margin: 11px 0 0;
+      font-family: Roboto;
+      font-weight: 700;
+      font-stretch: normal;
+      font-style: normal;
+      line-height: normal;
+      letter-spacing: normal;
+      text-align: center;
+    }
+
+  }
+}
+
+.title-content {
+  height: auto;
+  margin: 0 auto;
+  overflow: hidden;
+  padding: 0 !important;
+  background: transparent;
+}
+
+.div-title {
+  padding: 0 !important;
+  float: left;
+}
+
+.title {
+  font-size: rem(25);
+}
+
+.div-icon {
+  float: right;
+  font-size: rem(35);
+  overflow: auto;
+}
+
+/* New list view CSS */
+ion-list {
+  background: transparent;
+}
+
+.item-wrapper {
+  border-radius: 15px;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+  border: 1px solid #e9e9e9 !important;
+  background-color: #fff !important;
+  margin-bottom: 10px !important;
+  padding: rem(15);
+
+  .item {
+    background-color: var(--white);
+    margin: 0 auto;
+    overflow: hidden;
+
+    .item-top-detail {
+      width: 100%;
+      float: left;
+      font-family: Roboto;
+      font-size: rem(16);
+      font-weight: 700;
+      color: var(--title-text-color);
+      padding-left: 3px;
+
+      .item-subject {
+        width: 84%;
+        float: left;
+
+        ion-label {
+          float: left;
+          display: inline;
+          margin: 0 !important;
+          padding: 2.5px 10.5px 2.5px 10.5px;
+        }
+      }
+
+      .item-icon {
+        width: fit-content;
+        float: right;
+        /* font-size: rem(13); */
+        margin: 0 !important;
+        padding: 0 !important;
+        background-color: white;
+
+        ion-icon {
+          font-size: rem(16);
+          color: #42b9fe;
+          float: left;
+        }
+
+        label {
+          font-size: rem(13);
+        }
+      }
+    }
+
+    .item-middle-detail {
+      font-size: rem(13);
+      width: 100%;
+      overflow: auto;
+      padding-left: 3px;
+      //border: 1px solid red;
+      margin: 0 !important;
+
+      .item-remetente {
+        //width: 200px;
+        font-family: Roboto;
         /*  font-size: rem(13); */
-         font-weight: normal;
-         color: #000000;
-         float: left;
-         /* border: 1px solid red; */
- 
-         ion-label{
-           padding: 2.5px 10.5px 2.5px 10.5px;
-           margin: 0 !important;
-         }
-       }
-     }
-     .item-middle-detail-extra{
-       font-size: rem(13);
-       padding-left: 3px;
-       //border: 1px solid red;
- 
-       .item-middle-detail-extra-text{
-         //border: 1px solid blue;
- 
-         ion-label{
-           padding: 2.5px 10.5px 2.5px 10.5px;
-           margin: 0 !important;
-         }
-       }
-     }
-     .item-bottom-detail{
-       font-size: rem(16);
-       width: 100%;
-       overflow: auto;
-       margin-top: 10px;
-       padding-bottom: 0 !important;
- 
-       .item-workflow{
-         float: left;
-         margin: 0 !important;
-         align-self: flex-start;
- 
- 
-         .label{
-           border-radius: 15px;
-           background: var(--label-bg-color);
-           font-size: rem(12);
-           float: right;
-           padding: 2.5px 13.5px 2.5px 13.5px;
-           color: #fff;
-       }
-       }
-       .item-date{
-         width: auto;
-         font-family: Roboto;
-         font-size: rem(13);
-         font-weight: normal;
-         font-stretch: normal;
-         font-style: normal;
-         line-height: normal;
-         letter-spacing: normal;
-         color: #797979;
-         text-align: right;
-         flex-grow: 1;
- 
-         ion-label{
-           margin: 0 !important;
-           padding: 0 !important;
-         }
-       }
-     }
-     .item-middle-detail, .item-bottom-detail{
-       margin-bottom: 5px;
-     }
-   }
- }
- 
- 
- @media only screen and (min-width: 561px) {
-   .exp-card-long{
-     width: 547px !important;
-   }
- }
- /* @media only screen and (min-width: 749px) {
+        font-weight: normal;
+        color: #000000;
+        float: left;
+        /* border: 1px solid red; */
+
+        ion-label {
+          padding: 2.5px 10.5px 2.5px 10.5px;
+          margin: 0 !important;
+        }
+      }
+    }
+
+    .item-middle-detail-extra {
+      font-size: rem(13);
+      padding-left: 3px;
+      //border: 1px solid red;
+
+      .item-middle-detail-extra-text {
+        //border: 1px solid blue;
+
+        ion-label {
+          padding: 2.5px 10.5px 2.5px 10.5px;
+          margin: 0 !important;
+        }
+      }
+    }
+
+    .item-bottom-detail {
+      font-size: rem(16);
+      width: 100%;
+      overflow: auto;
+      margin-top: 10px;
+      padding-bottom: 0 !important;
+
+      .item-workflow {
+        float: left;
+        margin: 0 !important;
+        align-self: flex-start;
+
+
+        .label {
+          border-radius: 15px;
+          background: var(--label-bg-color);
+          font-size: rem(12);
+          float: right;
+          padding: 2.5px 13.5px 2.5px 13.5px;
+          color: #fff;
+        }
+      }
+
+      .item-date {
+        width: auto;
+        font-family: Roboto;
+        font-size: rem(13);
+        font-weight: normal;
+        font-stretch: normal;
+        font-style: normal;
+        line-height: normal;
+        letter-spacing: normal;
+        color: #797979;
+        text-align: right;
+        flex-grow: 1;
+
+        ion-label {
+          margin: 0 !important;
+          padding: 0 !important;
+        }
+      }
+    }
+
+    .item-middle-detail,
+    .item-bottom-detail {
+      margin-bottom: 5px;
+    }
+  }
+}
+
+
+@media only screen and (min-width: 561px) {
+  .exp-card-long {
+    width: 547px !important;
+  }
+}
+
+/* @media only screen and (min-width: 749px) {
    .exp-card-long{
      width: 734px !important;
    }
  } */
- 
- 
- @media only screen and (min-width: 701px) {
-   ion-content{
-     --background: transparent;
-   }
-   .title{
-     font-size: rem(15) !important;
-   }
- 
-   .main-content{
-     border-top-left-radius: 25px;
-     border-top-right-radius: 25px;
-     overflow: hidden;
- 
-     .aside-wrapper{
-       display: flex;
-       width: 35%;
-       justify-content: flex-start !important;
-       border-right: 1px solid #d8d8d8;
-       overflow: hidden;
- 
-       .aside{
-         background:transparent;
- 
-         .d-none{
-           display: block;
-         }
-       }
-       .aside-title{
-         font-family: Roboto;
-         font-size: rem(16) !important;
-         text-align: left;
-       }
-       .exp-card{
-         width: 90% !important;
-         justify-content: flex-start !important;
-         padding: 10px !important;
- 
-         .exp-card-title{
-           text-align: left !important;
-         }
- 
-       }
-       .exp-card-long{
-         //display: none;
-         width: 90% !important;
-         cursor: pointer;
-         user-select: none;
-         background:  white;
-         box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
-         background: white;
- 
-         .center-div{
-           display: flex;
-           justify-content: center;
-           width: 100%;
-           margin: 0 !important;
- 
-           .exp-card-text{
-             width: calc(100% - 50px);
-           }
-         }
-         .title1{
-           display: none !important;
- 
-         }
-         .exp-card-title {
-           flex: 1;
-           float: left !important;
-           text-align: left;
-           padding-left: 10px;
-         }
-         .exp-card-content{
-           width: fit-content;
-           float: right;
-         }
-         .exp-card-text{
-           display: flex;
-           align-items: center;
-           justify-content: center;
-         }
-       }
-     }
-     .aside-content{
-       width: 65%;
-       display: flex !important;
-       background-color: white;
-     }
-   }
- 
-   .exp-card{
-     display: flex;
-     align-items: center;
-     margin: 0 auto;
-     margin-bottom: 15px;
-     flex-direction: row !important;
-     width: 100%;
-     padding: 10px 17px 10px 17px;
-     height: unset !important;
-     //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
- 
-     .exp-card-title{
-       flex: 1;
-       text-align: left;
-       margin-top: 0px !important;
-     }
-     .exp-card-content{
-       margin: 0 !important;
-     }
-     .exp-card-content .title1{
-       display: none;
-       margin-top: 0px !important;
-     }
-     .exp-card-content .number{
-       //display: none;
-       margin-top: 0px !important;
-     }
-   }
 
-    .exp-card-long{
-      .exp-card-title{
-        text-align: left !important;
+
+@media only screen and (min-width: 701px) {
+  ion-content {
+    --background: transparent;
+  }
+
+  .title {
+    font-size: rem(15) !important;
+  }
+
+  .main-content {
+    border-top-left-radius: 25px;
+    border-top-right-radius: 25px;
+    overflow: hidden;
+
+    .aside-wrapper {
+      display: flex;
+      width: 35%;
+      justify-content: flex-start !important;
+      border-right: 1px solid #d8d8d8;
+      overflow: hidden;
+
+      .aside {
+        background: transparent;
+
+        .d-none {
+          display: block;
+        }
+      }
+
+      .aside-title {
+        font-family: Roboto;
+        font-size: rem(16) !important;
+        text-align: left;
+      }
+
+      .exp-card {
+        width: 90% !important;
+        justify-content: flex-start !important;
+        padding: 10px !important;
+
+        .exp-card-title {
+          text-align: left !important;
+        }
+
+      }
+
+      .exp-card-long {
+        //display: none;
+        width: 90% !important;
+        cursor: pointer;
+        user-select: none;
+        background: white;
+        box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+        background: white;
+
+        .center-div {
+          display: flex;
+          justify-content: center;
+          width: 100%;
+          margin: 0 !important;
+
+          .exp-card-text {
+            width: calc(100% - 50px);
+          }
+        }
+
+        .title1 {
+          display: none !important;
+
+        }
+
+        .exp-card-title {
+          flex: 1;
+          float: left !important;
+          text-align: left;
+          padding-left: 10px;
+        }
+
+        .exp-card-content {
+          width: fit-content;
+          float: right;
+        }
+
+        .exp-card-text {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
       }
     }
- }
- 
- @media only screen and (min-width: 801px) {
-   .title{
-     font-size: rem(25) !important;
-   }
-   .content{
-     width: 65%;
-   }
- 
-   .aside-right{
-     width: 35%;
-   }
-   .aside-title{
-     font-family: Roboto;
-     font-size: rem(25);
-     text-align: left;
-   }
- }
- @media only screen and (min-width: 1024px){
-   .content{
-     width: 70%;
-   }
-   .aside-right{
-     width: 30%;
-   }
- }
- @media only screen and (min-width: 1140px) {
-   .div-icon{
-     display: none;
-   }
-   .content{
-     width: 75%;
-     border-right: 1px solid #d8d8d8;
-   }
-   .aside-right{
-     width: 25%;
-   }
- }
- 
- 
+
+    .aside-content {
+      width: 65%;
+      display: flex !important;
+      background-color: white;
+    }
+  }
+
+  .exp-card {
+    display: flex;
+    align-items: center;
+    margin: 0 auto;
+    margin-bottom: 15px;
+    flex-direction: row !important;
+    width: 100%;
+    padding: 10px 17px 10px 17px;
+    height: unset !important;
+    //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+
+    .exp-card-title {
+      flex: 1;
+      text-align: left;
+      margin-top: 0px !important;
+    }
+
+    .exp-card-content {
+      margin: 0 !important;
+    }
+
+    .exp-card-content .title1 {
+      display: none;
+      margin-top: 0px !important;
+    }
+
+    .exp-card-content .number {
+      //display: none;
+      margin-top: 0px !important;
+    }
+  }
+
+  .exp-card-long {
+    .exp-card-title {
+      text-align: left !important;
+    }
+  }
+}
+
+@media only screen and (min-width: 801px) {
+  .title {
+    font-size: rem(25) !important;
+  }
+
+  .content {
+    width: 65%;
+  }
+
+  .aside-right {
+    width: 35%;
+  }
+
+  .aside-title {
+    font-family: Roboto;
+    font-size: rem(25);
+    text-align: left;
+  }
+}
+
+@media only screen and (min-width: 1024px) {
+  .content {
+    width: 70%;
+  }
+
+  .aside-right {
+    width: 30%;
+  }
+}
+
+@media only screen and (min-width: 1140px) {
+  .div-icon {
+    display: none;
+  }
+
+  .content {
+    width: 75%;
+    border-right: 1px solid #d8d8d8;
+  }
+
+  .aside-right {
+    width: 25%;
+  }
+}
+
+
 .active {
   color: white !important;
   fill: white !important;
@@ -574,8 +634,9 @@ ion-content{
   .new-task-count {
     color: white;
   }
-  
-  .exp-card-content, .icon-selected{
+
+  .exp-card-content,
+  .icon-selected {
     color: white !important;
   }
 
@@ -593,9 +654,9 @@ ion-content{
     fill: rgb(255, 255, 255) !important;
   }
 
-  svg{
-    path{
-        fill: rgb(255, 255, 255) !important
+  svg {
+    path {
+      fill: rgb(255, 255, 255) !important
     }
   }
 }
@@ -610,13 +671,13 @@ ion-content{
   fill: rgb(255, 255, 255) !important;
 }
 
-.active ion-icon{
+.active ion-icon {
   color: white !important;
   fill: red !important;
 }
- 
 
-.item-skeleton{
+
+.item-skeleton {
   width: 100% !important;
   padding: 0px 20px 0 20px !important;
   border-bottom: 1px solid #ebebeb;
@@ -626,63 +687,71 @@ ion-content{
   background-color: transparent;
   overflow: auto;
 
-  .item-icon{
+  .item-icon {
     //margin-top: 28px;
     width: rem(45);
     float: left;
     font-size: rem(40);
 
-    .item-icon ion-icon{
+    .item-icon ion-icon {
       color: #061b52;
     }
   }
-  .item-icon2{
+
+  .item-icon2 {
     //margin-top: 23px;
     width: rem(45);
     float: left;
     font-size: rem(40);
   }
 
-  .item-content{
+  .item-content {
     width: 100%;
     padding: 15px 0 15px 10px;
     overflow: auto;
     margin-right: 5px;
 
-    p{
+    p {
       white-space: nowrap;
       overflow: hidden !important;
       text-overflow: ellipsis !important;
     }
 
-    .item-content-date{
+    .item-content-date {
       color: #797979;
       font-size: rem(13);
       margin: 0 !important;
       padding: 0 !important;
     }
-    .item-content-title{
+
+    .item-content-title {
       color: var(--title-text-color);
       font-size: rem(15);
       margin: 0 !important;
       padding: 0 !important;
     }
-    .item-content-detail{
+
+    .item-content-detail {
       color: #000000;
-      font-size:rem(13);
+      font-size: rem(13);
       margin: 0 !important;
       padding: 0 !important;
     }
-    .item-options{
+
+    .item-options {
       color: var(--box-hover-background-color);
       width: 25px;
       font-size: rem(20);
     }
-    .item-content-date-active, .item-content-title-active, .item-content-detail-active{
+
+    .item-content-date-active,
+    .item-content-title-active,
+    .item-content-detail-active {
       color: #fff;
     }
   }
-  .item-options-active{
+
+  .item-options-active {
     display: none !important;
   }
 }
@@ -694,7 +763,7 @@ ion-content{
   flex-wrap: wrap;
 }
 
-.new-task-count{
+.new-task-count {
   color: red;
   font-size: rem(13);
 }
@@ -703,12 +772,13 @@ ion-content{
   float: left;
 }
 
-.search-input-container{
+.search-input-container {
   background-color: white;
   border-radius: 27.5px;
   border: solid 1px #ebebeb;
   font-size: rem(14);
-  .icon{
+
+  .icon {
     color: #797979;
     width: 41px;
     height: 41px;
@@ -717,10 +787,12 @@ ion-content{
     font-size: rem(25);
     align-items: center;
   }
-  .input-text{
+
+  .input-text {
     width: 100%;
   }
-  .icon-z{
+
+  .icon-z {
     width: 20px;
   }
 }
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index b8f2bb46a..9a7d4288b 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -3,45 +3,49 @@
 </ion-header>
 
 <ion-header class="ion-no-border header-2">
-  
+
   <div class="title d-flex justify-space-between">
     <div class="d-flex align-center" (click)="goBack()">
       <div class="d-flex align-center font-35-rem">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end"
+          src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end"
+          src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end"
+          src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
       </div>
-      <div class="thetitle"><ion-label >Pedidos</ion-label></div>
+      <div class="thetitle"><ion-label>Pedidos</ion-label></div>
     </div>
 
     <div class="theicon btn-refresh d-flex">
 
       <div>
         <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
         </div>
-  
+
         <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
         </div>
       </div>
 
-      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+      <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+        placeholder="Selecione agenda">
         <mat-select [(value)]="filterName">
 
-          <mat-option value="Para hoje" >
+          <mat-option value="Para hoje">
             Para hoje
           </mat-option>
 
-          <mat-option value="Novos" >
+          <mat-option value="Novos">
             Novas
           </mat-option>
 
-          <mat-option value="Lidos" >
+          <mat-option value="Lidos">
             Lidas
           </mat-option>
 
-          <mat-option value="Não lidos" >
+          <mat-option value="Não lidos">
             Não lidas
           </mat-option>
 
@@ -49,8 +53,8 @@
             Em atraso
           </mat-option>
 
-          
-          <mat-option value="Todos" >
+
+          <mat-option value="Todos">
             Todas
           </mat-option>
 
@@ -64,7 +68,7 @@
   </div>
 
   <ion-toolbar>
-    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" >
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="parecer">
         Parecer
       </ion-segment-button>
@@ -77,14 +81,11 @@
 
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <ion-refresher-content
-      pullingIcon="chevron-down-circle-outline"
-      pullingText="deslize para actualizar"
-      refreshingSpinner="circles"
-      refreshingText="A actualizar...">
+    <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
+      refreshingSpinner="circles" refreshingText="A actualizar...">
     </ion-refresher-content>
   </ion-refresher>
-  
+
   <div class="main-content width-100 overflow-y-auto height-100">
 
 
@@ -94,11 +95,8 @@
         <ion-list *ngSwitchCase="'parecer'">
           <!-- *ngFor = "let task of pedidosstorage.listparecer; let i = index"
           (click)="viewExpedientDetail(task.SerialNumber)" -->
-          <div
-            class="ion-no-padding ion-no-margin cursor-pointer"
-            *ngFor = "let task of pedidosstorage.listparecer"
-            (click)="goToPedido(task.SerialNumber)"
-          >
+          <div class="ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of pedidosstorage.listparecer"
+            (click)="goToPedido(task.SerialNumber)">
             <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
             <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
@@ -109,8 +107,10 @@
                   <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                    src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                    src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
@@ -124,7 +124,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                  <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>
@@ -134,11 +134,8 @@
       </div>
       <div *ngIf="pedidosstorage.listdeferimento">
         <ion-list *ngSwitchCase="'deferimento'">
-          <div
-            class="expediente ion-no-padding ion-no-margin cursor-pointer"
-            *ngFor = "let task of pedidosstorage.listdeferimento"
-            (click)="goToPedido(task.SerialNumber)"
-          >
+          <div class="expediente ion-no-padding ion-no-margin cursor-pointer"
+            *ngFor="let task of pedidosstorage.listdeferimento" (click)="goToPedido(task.SerialNumber)">
             <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
             <div class="item width-100">
@@ -149,8 +146,10 @@
                   <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                    src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                    src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
@@ -164,7 +163,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                  <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>
@@ -174,26 +173,23 @@
     </div>
 
     <div [ngSwitch]="segment">
-    <div *ngSwitchCase="'parecer'" class="centered-div d-flex height-100 align-center justify-content-center" >
-      <div
-        *ngIf="pedidosstorage.listparecer.length == 0"
-        class="empty-list d-flex height-100 align-center justify-content-center"
-      >
-        <span>Lista vazia</span>
+      <div *ngSwitchCase="'parecer'" class="centered-div d-flex height-100 align-center justify-content-center">
+        <div *ngIf="pedidosstorage.listparecer.length == 0"
+          class="empty-list d-flex height-100 align-center justify-content-center">
+          <span>Lista vazia</span>
+        </div>
+      </div>
+
+      <div *ngSwitchCase="'deferimento'" class="centered-div d-flex height-100 align-center justify-content-center">
+        <div *ngIf="pedidosstorage.listdeferimento.length == 0"
+          class="empty-list d-flex height-100 align-center justify-content-center">
+          <span>Lista vazia</span>
+        </div>
       </div>
     </div>
 
-    <div *ngSwitchCase="'deferimento'" class="centered-div d-flex height-100 align-center justify-content-center">
-      <div
-        *ngIf="pedidosstorage.listdeferimento.length == 0"
-        class="empty-list d-flex height-100 align-center justify-content-center"
-      >
-        <span>Lista vazia</span>
-      </div>
-    </div>
-  </div>
-
-    <div *ngIf="skeletonLoader && pedidosstorage.listdeferimento.length == 0 && skeletonLoader && pedidosstorage.listparecer.length == 0">
+    <div
+      *ngIf="skeletonLoader && pedidosstorage.listdeferimento.length == 0 && skeletonLoader && pedidosstorage.listparecer.length == 0">
 
       <ion-list>
         <ion-item>
@@ -221,5 +217,4 @@
   </div>
 
 
-</ion-content>
-
+</ion-content>
\ No newline at end of file
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index c6d2dfe9a..3a5475089 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -1,10 +1,10 @@
-<ion-header  class="ion-no-border">
+<ion-header class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="title-content">
         <div class="middle">
           <ion-label id="edit-event-desktop" class="title">Editar Evento</ion-label> <br>
-          <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
+          <i style="margin-top: -3px; font-size: 15px;"> Campos marcados com * são obrigatórios</i>
         </div>
       </div>
       <ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -15,12 +15,13 @@
 <ion-content>
   <div class="main-content">
     <div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
-      <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*" [(ngModel)]="_postEvent.Subject"></ion-input>
+      <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*"
+        [(ngModel)]="_postEvent.Subject"></ion-input>
     </div>
-    <div *ngIf="Form && validateFrom" >
+    <div *ngIf="Form && validateFrom">
       <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
         <div *ngIf="Form.get('Subject').errors?.required">
-          
+
         </div>
         <div *ngIf="Form.get('Subject').errors?.minlength">
           O campo deve ter pelo menos 4 caracteres.
@@ -34,7 +35,8 @@
           <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid  && validateFrom ">
-          <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="_postEvent.Location"></ion-input>
+          <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*"
+            [(ngModel)]="_postEvent.Location"></ion-input>
         </div>
       </div>
       <!-- Error messages -->
@@ -61,10 +63,10 @@
 
     </div> -->
 
-    <div *ngIf="Form && validateFrom" >
+    <div *ngIf="Form && validateFrom">
       <div *ngIf="Form.get('Location').invalid " class="input-errror-message">
         <div *ngIf="Form.get('Location').errors?.required">
-          
+
         </div>
         <div *ngIf="Form.get('Location').errors?.minlength">
           O campo deve ter pelo menos 4 caracteres.
@@ -79,7 +81,7 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field appearance="none" floatLabel="never" class="width-100 " >
+          <mat-form-field appearance="none" floatLabel="never" class="width-100 ">
             <mat-select placeholder="Selecione agenda*" [(ngModel)]="_postEvent.CalendarName" [disabled]=true>
               <mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
                 Agenda {{ calendars }}
@@ -96,11 +98,12 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
+        <div class="ion-input-class flex-grow-1"
+          [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
 
           <mat-form-field appearance="none" floatLabel="never" class="width-100" required>
             <!-- <input matInput type="text" > -->
-            <mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="_postEvent.Category" >
+            <mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="_postEvent.Category">
               <mat-option value="Reunião">
                 Reunião
               </mat-option>
@@ -128,19 +131,11 @@
         <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid  && validateFrom ">
 
           <mat-form-field appearance="none" floatLabel="never" class="date-hour-picker">
-            <input matInput [ngxMatDatetimePicker]="picker1"
-              placeholder="Choose a date"
-              [(ngModel)]="_postEvent.StartDate"
-              [max]="maxDate"
-              [disabled]="disabled"
-            >
+            <input matInput [ngxMatDatetimePicker]="picker1" placeholder="Choose a date"
+              [(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled">
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
-            <ngx-mat-datetime-picker #picker1
-              [showSpinners]="showSpinners"
-              [showSeconds]="showSeconds"
-              [stepHour]="stepHour" [stepMinute]="stepMinute"
-              [stepSecond]="stepSecond"
-              [touchUi]="touchUi">
+            <ngx-mat-datetime-picker #picker1 [showSpinners]="showSpinners" [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi">
             </ngx-mat-datetime-picker>
           </mat-form-field>
 
@@ -149,26 +144,18 @@
     </div>
 
     <div class="container-div">
-      <div  class="ion-item-class-2 width-100 d-flex">
+      <div class="ion-item-class-2 width-100 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
         <div class="ion-input-class  flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid  && validateFrom ">
 
           <mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
-            <input matInput [ngxMatDatetimePicker]="fim"
-              placeholder="Choose a date"
-              [(ngModel)]="_postEvent.EndDate"
-              [max]="maxDate"
-              [disabled]="disabled"
-              [min]="_postEvent.StartDate"
-            >
+            <input matInput [ngxMatDatetimePicker]="fim" placeholder="Choose a date" [(ngModel)]="_postEvent.EndDate"
+              [max]="maxDate" [disabled]="disabled" [min]="_postEvent.StartDate">
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
-            <ngx-mat-datetime-picker #fim
-              [showSpinners]="showSpinners"
-              [showSeconds]="showSeconds"
-              [stepHour]="stepHour" [stepMinute]="stepMinute"
-              [stepSecond]="stepSecond">
+            <ngx-mat-datetime-picker #fim [showSpinners]="showSpinners" [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond">
             </ngx-mat-datetime-picker>
           </mat-form-field>
 
@@ -208,20 +195,11 @@
         <div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
 
           <mat-form-field class="date-hour-picker">
-            <input matInput [ngxMatDatetimePicker]="occurrrence"
-              placeholder="Choose a date"
-              [(ngModel)]="_postEvent.EventRecurrence.LastOccurrence"
-              [disabled]="disabled"
-              [min]="_postEvent.EndDate"
-            >
+            <input matInput [ngxMatDatetimePicker]="occurrrence" placeholder="Choose a date"
+              [(ngModel)]="_postEvent.EventRecurrence.LastOccurrence" [disabled]="disabled" [min]="_postEvent.EndDate">
             <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
-            <ngx-mat-datetime-picker #occurrrence
-              [showSpinners]="showSpinners"
-              [showSeconds]="showSeconds"
-              [stepHour]="stepHour" [stepMinute]="stepMinute"
-              [stepSecond]="stepSecond"
-              [touchUi]="touchUi"
-              >
+            <ngx-mat-datetime-picker #occurrrence [showSpinners]="showSpinners" [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi">
             </ngx-mat-datetime-picker>
           </mat-form-field>
 
@@ -236,7 +214,8 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
         </div>
-        <div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid  && validateFrom">
+        <div class="ion-input-class-no-height"
+          [class.input-error]="Form?.get('participantes')?.invalid  && validateFrom">
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
@@ -247,8 +226,10 @@
           </div>
           <div class="add-people">
             <button class="btn-no-color cursor-pointer" (click)="addParticipants()">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start"
+                src="assets/images/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start"
+                src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
             </button>
           </div>
         </div>
@@ -260,7 +241,8 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
         </div>
-        <div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid  && validateFrom">
+        <div class="ion-input-class-no-height"
+          [class.input-error]="Form?.get('participantes')?.invalid  && validateFrom">
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
@@ -271,8 +253,10 @@
           </div>
           <div class="add-people">
             <button class="btn-no-color cursor-pointer" (click)="addParticipantsCc()">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  class="font-35-rem" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  class="font-35-rem" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start"
+                src="assets/images/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start"
+                src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
             </button>
           </div>
         </div>
@@ -285,17 +269,20 @@
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
         <div class="ion-input-class-no-height width-100">
-          <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="_postEvent.Body.Text"  placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+          <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="_postEvent.Body.Text"
+            placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
         </div>
       </div>
     </div>
 
-    <div (click)="getDoc()" class="d-flex container-div width-100 ion-item-container-no-border cursor-pointer" >
+    <div (click)="getDoc()" class="d-flex container-div width-100 ion-item-container-no-border cursor-pointer">
       <ion-label>
         <div class="attach-icon">
-          <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-attach-doc.svg"></ion-icon>
-          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-attach-doc.svg"></ion-icon>
-                <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-attach-doc.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-attach-doc.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+            src="assets/images/theme/gov/icons-attach-doc.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
+            src="assets/images/theme/{{ThemeService.currentTheme}}/icons-attach-doc.svg"></ion-icon>
         </div>
         <div class="attach-document">
           <ion-label>Adicionar documentos</ion-label>
@@ -304,22 +291,23 @@
     </div>
 
 
-    <div class="d-flex container-div width-100"  *ngFor="let document of loadedEventAttachments; let i = index" >
-      <ion-list class="width-100 list"  *ngIf="!document.remove">
+    <div class="d-flex container-div width-100" *ngFor="let document of loadedEventAttachments; let i = index">
+      <ion-list class="width-100 list" *ngIf="!document.remove">
         <ion-item class="width-100">
-        <ion-label class="width-100">
-          <p class="d-flex ion-justify-content-between">
-            <span class="attach-title-item">{{document.SourceName}}</span>
-            <span class="app-name" *ngIf="document.ApplicationId  == '8'"> Correspondencia </span>
-            <span class="app-name" *ngIf="document.ApplicationId == '386'"> AccoesPresidenciais </span>
-            <span class="app-name" *ngIf="document.ApplicationId == '361' "> ArquivoDespachoElect </span>
-            <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document.Id, i)" >
-              <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
-            </span>
-          </p>
-          <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
-        </ion-label>
-      </ion-item>
+          <ion-label class="width-100">
+            <p class="d-flex ion-justify-content-between">
+              <span class="attach-title-item">{{document.SourceName}}</span>
+              <span class="app-name" *ngIf="document.ApplicationId  == '8'"> Correspondencia </span>
+              <span class="app-name" *ngIf="document.ApplicationId == '386'"> AccoesPresidenciais </span>
+              <span class="app-name" *ngIf="document.ApplicationId == '361' "> ArquivoDespachoElect </span>
+              <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document.Id, i)">
+                <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+              </span>
+            </p>
+            <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate |
+                date: 'dd-MM-yyyy HH:mm'}} </span></p>
+          </ion-label>
+        </ion-item>
       </ion-list>
     </div>
 
@@ -339,4 +327,4 @@
       </button>
     </ion-buttons>
   </ion-toolbar>
-</ion-footer>
+</ion-footer>
\ No newline at end of file
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 bef89e77b..645b07068 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -1,12 +1,15 @@
-<ion-header  class="ion-no-border">
+<ion-header class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header px-20" style="overflow: unset !important;">
-      <div class="title-content d-flex"  >
+      <div class="title-content d-flex">
         <div class="left">
           <button class="btn-no-color" (click)="close()">
-            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-calendar-arrow-left.svg'></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end"
+              src='assets/images/icons-calendar-arrow-left.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end"
+              src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end"
+              src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
           </button>
         </div>
         <div class="middle" (click)="openOptions()">
@@ -15,15 +18,18 @@
 
         <div class="div-icon d-flex align-base">
           <button class="btn-no-color" (click)="editEvent()">
-            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="edit" slot="end" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-edit.svg" ></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end"
+              src="assets/images/icons-edit.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end"
+              src="assets/images/theme/gov/icons-edit.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="edit" slot="end"
+              src="assets/images/theme/{{ThemeService.currentTheme}}/icons-edit.svg"></ion-icon>
           </button>
           <button class="btn-no-color" (click)="deleteYesOrNo()">
             <ion-icon class="delete" name="trash-sharp"></ion-icon>
           </button>
 
-          
+
           <!-- <div class="div-icon" (click)="openOptions()">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
@@ -51,15 +57,19 @@
         <span class="date">{{loadedEvent.Location}}</span>
 
         <div *ngIf="loadedEvent.Organizer">
-          
+
           <div *ngIf="eventsService.isMyEvent(loadedEvent) == false || sesseionStora.user.Profile =='PR'">
-            <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
-            <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
+            <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "
+              style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
+            <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' "
+              style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
           </div>
 
           <div *ngIf="eventsService.isMyEvent(loadedEvent) == true && sesseionStora.user.Profile !='PR'">
-            <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "  style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
-            <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
+            <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "
+              style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
+            <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' "
+              style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
           </div>
         </div>
 
@@ -67,14 +77,16 @@
       <div class="content-details">
         <ion-label>
           <p>{{customDate}}</p>
-          <p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
-          <p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.EndDate | date: 'dd/M/yy'}} </p>
+          <p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das
+            {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
+          <p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate |
+            date: 'd/M/yy' }} - {{ loadedEvent.EndDate | date: 'dd/M/yy'}} </p>
           <p *ngIf="loadedEvent.EventRecurrence">
             <span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>
             <span *ngIf="loadedEvent.EventRecurrence.Type == 3">Anual</span>
-            <span *ngIf="loadedEvent.EventRecurrence.Type == -1">(Não se repete)</span>            
+            <span *ngIf="loadedEvent.EventRecurrence.Type == -1">(Não se repete)</span>
           </p>
 
         </ion-label>
@@ -104,7 +116,8 @@
     <div *ngIf="loadedEvent.Attachments" class="bottom-content width-100">
       <h5 class="font-17-rem">Documentos Anexados</h5>
       <ion-list class="width-100">
-        <li *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding pa-0">
+        <li *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" lines="none"
+          class="ion-no-margin ion-no-padding pa-0">
           <ion-label class="width-100 d-flex align-center">
             <p class="flex-grow-1 cursor-pointer" (click)="docIndex(i);LoadDocumentDetails()">
               <span class="attach-title-item d-block">{{attach.SourceName}}</span>
@@ -116,8 +129,9 @@
             </div>
 
             <div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"  ></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"  ></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
             </div>
 
           </ion-label>
@@ -127,4 +141,4 @@
 
   </div>
 
-</ion-content>
+</ion-content>
\ No newline at end of file
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 6931298a6..f616ee6fc 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
@@ -1,19 +1,25 @@
 <ion-header class="ion-no-border">
   <!-- <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> -->
   <div class="title">
-    <div class="thetitle"><ion-label >Todas as tarefas</ion-label></div>
+    <div class="thetitle"><ion-label>Todas as tarefas</ion-label></div>
 
     <div class="theicon d-flex align-center">
       <div>
         <div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
           <div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
-            <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
-            <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src='assets/images/icons-search.svg'></ion-icon>
-            <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
+            <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem"
+              src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
+            <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem"
+              src='assets/images/icons-search.svg'></ion-icon>
+            <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem"
+              src='assets/images/theme/gov/icons-search.svg'></ion-icon>
           </div>
-          <button title="Fechar" class="btn-no-color d-flex" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch">
-            <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-35-rem" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
+          <button title="Fechar" class="btn-no-color d-flex" (click)="closeSearch();showSearch=false;searchSubject=''"
+            *ngIf="showSearch">
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' "
+              class="font-35-rem" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" name="restaurant-outline"
+              src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
           </button>
 
           <div *ngIf="showSearch">
@@ -25,16 +31,16 @@
                 <ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
                   class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
               </div>
-              
+
               <!-- <div class="icon" (click)="clearSearchInput()">
                 <ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
                 <ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline"  src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
                 <ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
               </div> -->
-              <div (click)="basicSearch()"  class="d-flex align-center icon">
+              <div (click)="basicSearch()" class="d-flex align-center icon">
+
+                <ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
 
-                <ion-icon  class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
-    
               </div>
             </div>
           </div>
@@ -44,42 +50,43 @@
       <div>
         <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
         </div>
-  
+
         <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
         </div>
       </div>
 
       <div>
-        <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+          placeholder="Selecione agenda">
           <mat-select [(value)]="filterName">
-  
-            <mat-option value="Para hoje" >
+
+            <mat-option value="Para hoje">
               Para hoje
             </mat-option>
-  
-            <mat-option value="Novos" >
+
+            <mat-option value="Novos">
               Novas
             </mat-option>
-  
-            <mat-option value="Lidos" >
+
+            <mat-option value="Lidos">
               Lidas
             </mat-option>
-  
-            <mat-option value="Não lidos" >
+
+            <mat-option value="Não lidos">
               Não lidas
             </mat-option>
-  
+
             <mat-option value="OverdueTasks">
               Em atraso
             </mat-option>
 
-            <mat-option value="Todos" >
+            <mat-option value="Todos">
               Todas
             </mat-option>
-  
+
           </mat-select>
         </mat-form-field>
       </div>
@@ -90,7 +97,7 @@
   </div>
 </ion-header>
 <ion-content>
-<!-- 
+  <!-- 
   <ion-refresher name="refresher" slot="fixed" >
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
@@ -103,35 +110,39 @@
 
   <div class="overflow-y-auto height-100 width-100">
 
-    <div  *ngIf="AllProcess.length >= 0">
+    <div *ngIf="AllProcess.length >= 0">
       <ion-item-sliding class="overflow-y-auto height-100">
         <div class="listview">
           <ion-list *ngIf="AllProcess">
-            <div
-              class="item-hover ion-no-padding cursor-pointer"
-              *ngFor = "let task of AllProcess"
+            <div class="item-hover ion-no-padding cursor-pointer" *ngFor="let task of AllProcess"
               (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName|| task.workflowDisplayName , task.activityInstanceName)">
               <div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
-                <div class="item width-100 " >
+                <div class="item width-100 ">
                   <div class="item-top-detail">
                     <div class="item-subject d-flex">
-  
+
                       <!-- {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName || task.workflowDisplayName }} {{ task.activityInstanceName }} -->
-                      
-                      <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
-                      <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span>
-                      <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate || task.taskReceiveDate)">Nova</span>
+
+                      <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.Subject ||
+                        task.workflowInstanceDataFields.Subject}}</ion-label>
+                      <span class="dead-line ml-10"
+                        *ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span>
+                      <span class="new-task ml-10"
+                        *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate || task.taskReceiveDate)">Nova</span>
                     </div>
                     <div *ngIf="task.DocumentsQty != 0" class="item-icon">
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                        src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                        src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                       <label>{{task.DocumentsQty || task.totalDocuments}}</label>
                     </div>
                   </div>
                   <div class="item-middle-detail">
                     <div class="item-remetente">
                       <ion-label class="sender" *ngIf="task.Senders">{{task.Senders }}</ion-label>
-                      <ion-label class="sender" *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender }}</ion-label>
+                      <ion-label class="sender" *ngIf="task.workflowInstanceDataFields">{{
+                        task.workflowInstanceDataFields.Sender }}</ion-label>
                     </div>
                   </div>
                   <div *ngIf="task.Agenda" class="item-middle-detail">
@@ -141,11 +152,13 @@
                   </div>
                   <div *ngIf="task.Agenda" class="item-middle-detail-extra">
                     <div class="item-middle-detail-extra-text">
-                      <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
+                      <ion-label
+                        *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
                         <!-- Agenda {{task.Agenda}} do Presidente da República -->
                         Agenda {{task.Agenda}} do Titular
                       </ion-label>
-                      <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
+                      <ion-label
+                        *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
                         A sua agenda {{task.Agenda}}
                       </ion-label>
                     </div>
@@ -155,7 +168,7 @@
                       <span class="label">{{task.activityInstanceName}}</span>
                     </div>
                     <div class="item-date">
-                      <ion-label>{{ task.CreateDate || task.taskStartDate || task.TaskStartDate  | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                      <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                     </div>
                   </div>
                 </div>
@@ -167,10 +180,8 @@
       </ion-item-sliding>
     </div>
 
-    <div
-      *ngIf="!TaskService.showLoader && AllProcess.length == 0"
-      class="empty-list d-flex height-100 align-center justify-content-center"
-    >
+    <div *ngIf="!TaskService.showLoader && AllProcess.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center">
       <span>Lista vazia</span>
     </div>
 
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 2e6f1ece1..97888f2ad 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
@@ -1,36 +1,37 @@
 <ion-header class="ion-no-border">
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
-    <div class="thetitle"><ion-label >Diplomas por gerar</ion-label></div>
+    <div class="thetitle"><ion-label>Diplomas por gerar</ion-label></div>
     <div class="theicon d-flex align-center">
 
       <div>
         <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
         </div>
-  
+
         <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
         </div>
       </div>
 
-      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+      <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+        placeholder="Selecione agenda">
         <mat-select [(value)]="filterName">
 
-          <mat-option value="Para hoje" >
+          <mat-option value="Para hoje">
             Para hoje
           </mat-option>
 
-          <mat-option value="Novos" >
+          <mat-option value="Novos">
             Novas
           </mat-option>
 
-          <mat-option value="Lidos" >
+          <mat-option value="Lidos">
             Lidas
           </mat-option>
 
-          <mat-option value="Não lidos" >
+          <mat-option value="Não lidos">
             Não lidas
           </mat-option>
 
@@ -40,7 +41,7 @@
           </mat-option>
 
 
-          <mat-option value="Todos" >
+          <mat-option value="Todos">
             Todas
           </mat-option>
 
@@ -54,26 +55,20 @@
 </ion-header>
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
+    <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
+      refreshingSpinner="circles" refreshingText="A actualizar...">
+    </ion-refresher-content>
   </ion-refresher>
 
 
   <div class="main-container width-100 overflow-y-auto height-100">
 
-    <div  *ngIf="diplomasList.length >= 1">
+    <div *ngIf="diplomasList.length >= 1">
 
 
-      <ion-list >
-        <div
-          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of list"
-          (click)="goToDiploma(task.SerialNumber)"
-        >
+      <ion-list>
+        <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of list"
+          (click)="goToDiploma(task.SerialNumber)">
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject d-flex">
@@ -82,8 +77,10 @@
                 <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
-                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
@@ -97,7 +94,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>
@@ -106,10 +103,8 @@
       </ion-list>
     </div>
 
-    <div
-      *ngIf="!skeletonLoader && diplomasList.length == 0"
-      class="empty-list d-flex height-100 align-center justify-content-center"
-    >
+    <div *ngIf="!skeletonLoader && diplomasList.length == 0"
+      class="empty-list d-flex height-100 align-center justify-content-center">
       <span>Lista vazia</span>
     </div>
 
@@ -141,5 +136,4 @@
   </div>
 
 
-</ion-content>
-
+</ion-content>
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index c0149f284..5af7322d7 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border">
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
-    <div class="thetitle"><ion-label >Diplomas</ion-label></div>
+    <div class="thetitle"><ion-label>Diplomas</ion-label></div>
     <div class="theicon d-flex align-center">
       <!-- <div>
         <div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
@@ -35,44 +35,45 @@
       <div>
         <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
         </div>
-  
+
         <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
         </div>
       </div>
 
       <div>
-        <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+          placeholder="Selecione agenda">
           <mat-select [(value)]="filterName">
-  
-            <mat-option value="Para hoje" >
+
+            <mat-option value="Para hoje">
               Para hoje
             </mat-option>
-  
-            <mat-option value="Novos" >
+
+            <mat-option value="Novos">
               Novas
             </mat-option>
-  
-            <mat-option value="Lidos" >
+
+            <mat-option value="Lidos">
               Lidas
             </mat-option>
-  
-            <mat-option value="Não lidos" >
+
+            <mat-option value="Não lidos">
               Não lidas
             </mat-option>
-  
-  
+
+
             <mat-option value="OverdueTasks">
               Em atraso
             </mat-option>
-  
-            <mat-option value="Todos" >
+
+            <mat-option value="Todos">
               Todas
             </mat-option>
-  
-  
+
+
           </mat-select>
         </mat-form-field>
       </div>
@@ -103,11 +104,8 @@
 
     <div *ngIf="listDiplomasPorValidar.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
       <ion-list *ngSwitchCase="'validar'">
-        <div
-          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of listDiplomasPorValidar"
-          (click)="goToDiploma(task.SerialNumber)"
-        >
+        <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of listDiplomasPorValidar"
+          (click)="goToDiploma(task.SerialNumber)">
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject d-flex">
@@ -116,8 +114,10 @@
                 <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
-                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
@@ -131,7 +131,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>
@@ -141,12 +141,8 @@
     </div>
     <div *ngIf="listDiplomasAssinadosPR.length >= 1">
       <ion-list *ngSwitchCase="'assinados'">
-        <div
-          class=" ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of listDiplomasAssinadosPR"
-
-          (click)="goToDiploma(task.SerialNumber)"
-        >
+        <div class=" ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of listDiplomasAssinadosPR"
+          (click)="goToDiploma(task.SerialNumber)">
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject d-flex">
@@ -155,8 +151,10 @@
                 <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
-                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
@@ -170,7 +168,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>
@@ -179,26 +177,22 @@
     </div>
 
 
-    <div *ngSwitchCase="'validar'" class="centered-div" >
-      <div
-        *ngIf=" listDiplomasPorValidar.length == 0 && !skeletonLoader"
-        class="empty-list d-flex height-100 align-center justify-content-center"
-      >
+    <div *ngSwitchCase="'validar'" class="centered-div">
+      <div *ngIf=" listDiplomasPorValidar.length == 0 && !skeletonLoader"
+        class="empty-list d-flex height-100 align-center justify-content-center">
         <span>Lista vazia</span>
       </div>
     </div>
 
     <div *ngSwitchCase="'assinados'" class="centered-div">
-      <div
-        *ngIf="listDiplomasAssinadosPR.length == 0 && !skeletonLoader"
-        class="empty-list d-flex height-100 align-center justify-content-center"
-      >
+      <div *ngIf="listDiplomasAssinadosPR.length == 0 && !skeletonLoader"
+        class="empty-list d-flex height-100 align-center justify-content-center">
         <span>Lista vazia</span>
       </div>
     </div>
 
 
-    <div *ngSwitchCase="'validar'" >
+    <div *ngSwitchCase="'validar'">
 
       <ion-list *ngIf="skeletonLoader && listDiplomasPorValidar.length == 0">
         <ion-list>
@@ -226,7 +220,7 @@
       </ion-list>
     </div>
 
-    <div *ngSwitchCase="'assinados'" >
+    <div *ngSwitchCase="'assinados'">
 
       <ion-list *ngIf="skeletonLoader && listDiplomasAssinadosPR.length == 0">
         <ion-list>
@@ -255,5 +249,4 @@
     </div>
   </div>
 
-</ion-content>
-
+</ion-content>
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
index 7335a213a..fe37e9924 100644
--- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
+++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
@@ -3,11 +3,8 @@
 
     <div *ngIf="taskList.length >= 1" class="width-100">
       <ion-list part="divo" class="width-100">
-        <div
-          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of taskList; let i = index"
-          (click)="viewTaskDetail.emit(task)"
-        >
+        <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
+          *ngFor="let task of taskList; let i = index" (click)="viewTaskDetail.emit(task)">
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
 
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
@@ -18,8 +15,10 @@
                 <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
-                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
@@ -33,7 +32,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>
@@ -41,10 +40,8 @@
       </ion-list>
     </div>
 
-    <div
-      *ngIf="!skeletonLoader && taskList.length == 0"
-      class="empty-list d-flex height-100 width-100 align-center justify-content-center"
-    >
+    <div *ngIf="!skeletonLoader && taskList.length == 0"
+      class="empty-list d-flex height-100 width-100 align-center justify-content-center">
       <span>Lista vazia</span>
     </div>
 
@@ -75,4 +72,4 @@
     </div>
 
   </div>
-</ion-content>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 5e5564001..779ab3065 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -1,10 +1,10 @@
 <ion-header class="ion-no-border">
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
-    <div class="thetitle"><ion-label >Pedidos</ion-label></div>
+    <div class="thetitle"><ion-label>Pedidos</ion-label></div>
     <div class="theicon btn-refresh d-flex align-center">
 
-      
+
       <!-- <div>
         <div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
           <div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
@@ -35,48 +35,49 @@
           </div>
         </div>
       </div> -->
-      
+
       <div>
         <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/crescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
         </div>
-  
+
         <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
-          <ion-icon  class="mr-10 font-25"  src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
+          <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
         </div>
       </div>
 
       <div>
-        <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
+          placeholder="Selecione agenda">
           <mat-select [(value)]="filterName">
-  
-            <mat-option value="Para hoje" >
+
+            <mat-option value="Para hoje">
               Para hoje
             </mat-option>
-  
-            <mat-option value="Novos" >
+
+            <mat-option value="Novos">
               Novas
             </mat-option>
-  
-            <mat-option value="Lidos" >
+
+            <mat-option value="Lidos">
               Lidas
             </mat-option>
-  
-            <mat-option value="Não lidos" >
+
+            <mat-option value="Não lidos">
               Não lidas
             </mat-option>
-  
-  
+
+
             <mat-option value="OverdueTasks">
               Em atraso
             </mat-option>
-  
-            <mat-option value="Todos" >
+
+            <mat-option value="Todos">
               Todas
             </mat-option>
-  
-  
+
+
           </mat-select>
         </mat-form-field>
       </div>
@@ -98,13 +99,10 @@
 </ion-header>
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
+    <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
+      refreshingSpinner="circles" refreshingText="A actualizar...">
+    </ion-refresher-content>
+  </ion-refresher>
 
   <div class="main-container width-100 overflow-y-auto height-100 px-20" [ngSwitch]="segment">
 
@@ -112,11 +110,8 @@
       <ion-list *ngSwitchCase="'parecer'">
         <!-- *ngFor = "let task of listPedidosParecer; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
-        <div
-          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of listPedidosParecer"
-          (click)="goToPedido(task.SerialNumber)"
-        >
+        <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of listPedidosParecer"
+          (click)="goToPedido(task.SerialNumber)">
           <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
@@ -127,8 +122,10 @@
                 <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
-                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
@@ -142,7 +139,7 @@
                 <span class="label mr-10">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>
@@ -152,11 +149,8 @@
     </div>
     <div *ngIf="listPedidosDeferimento.length >= 1">
       <ion-list *ngSwitchCase="'deferimento'">
-        <div
-          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of listPedidosDeferimento"
-          (click)="goToPedido(task.SerialNumber)"
-        >
+        <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of listPedidosDeferimento"
+          (click)="goToPedido(task.SerialNumber)">
           <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
@@ -167,8 +161,10 @@
                 <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
-                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
+                  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
+                  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
@@ -182,7 +178,7 @@
                 <span class="label mr-10">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
+                <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>
@@ -190,25 +186,21 @@
       </ion-list>
     </div>
 
-    <div *ngSwitchCase="'parecer'" class="centered-div" >
-      <div
-        *ngIf=" listPedidosParecer.length == 0 && !skeletonLoader"
-        class="empty-list d-flex height-100 align-center justify-content-center"
-      >
+    <div *ngSwitchCase="'parecer'" class="centered-div">
+      <div *ngIf=" listPedidosParecer.length == 0 && !skeletonLoader"
+        class="empty-list d-flex height-100 align-center justify-content-center">
         <span>Lista vazia</span>
       </div>
     </div>
 
     <div *ngSwitchCase="'deferimento'" class="centered-div">
-      <div
-        *ngIf="listPedidosDeferimento.length == 0 && !skeletonLoader"
-        class="empty-list d-flex height-100 align-center justify-content-center"
-      >
+      <div *ngIf="listPedidosDeferimento.length == 0 && !skeletonLoader"
+        class="empty-list d-flex height-100 align-center justify-content-center">
         <span>Lista vazia</span>
       </div>
     </div>
 
-    <div *ngSwitchCase="'deferimento'" >
+    <div *ngSwitchCase="'deferimento'">
 
       <ion-list *ngIf="skeletonLoader && listPedidosDeferimento.length == 0">
         <ion-item>
@@ -234,7 +226,7 @@
       </ion-list>
     </div>
 
-    <div *ngSwitchCase="'parecer'" >
+    <div *ngSwitchCase="'parecer'">
 
       <ion-list *ngIf="skeletonLoader && listPedidosParecer.length == 0">
         <ion-item>
@@ -262,5 +254,4 @@
 
   </div>
 
-</ion-content>
-
+</ion-content>
\ No newline at end of file