From 6d5c584104789e2107e6216df53a0030cb2c6252 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 25 Oct 2021 13:21:48 +0100
Subject: [PATCH] add icons

---
 .../document-viewer/document-viewer.page.html |  3 +-
 .../view-document/view-document.page.html     |  4 +-
 .../emend-message-modal.page.html             |  4 +-
 .../agenda/view-event/view-event.page.html    |  3 +-
 .../chat/edit-group/edit-group.page.html      |  3 +-
 .../group-contacts/group-contacts.page.html   |  3 +-
 .../group-messages/group-messages.page.html   | 10 ++--
 .../chat/messages/contacts/contacts.page.html |  3 +-
 .../pages/chat/messages/messages.page.html    |  8 ++-
 .../new-group/contacts/contacts.page.html     |  3 +-
 .../pages/chat/new-group/new-group.page.html  |  3 +-
 .../despacho-pr/despacho-pr.page.html         |  3 +-
 .../despachos/despacho/despacho.page.html     |  3 +-
 .../diploma-assinar/diploma-assinar.page.html |  3 +-
 .../diplomas/diploma/diploma.page.html        |  3 +-
 .../approve-event-modal.page.html             |  3 +-
 .../approve-event/approve-event.page.html     |  3 +-
 .../event-list/event-list.page.html           |  3 +-
 .../expediente-detail.page.html               |  3 +-
 .../expediente/expediente.page.html           |  3 +-
 .../expediente-pr/expediente-pr.page.html     |  3 +-
 .../gabinete-digital.page.html                |  3 +-
 .../pedidos/pedido/pedido.page.html           |  3 +-
 .../publication-detail.page.html              |  6 +-
 .../publication-detail.page.html              |  6 +-
 .../view-publications.page.html               |  3 +-
 .../organic-entity/organic-entity.page.html   |  3 +-
 src/app/pages/search/sender/sender.page.html  |  3 +-
 .../approve-event/approve-event.page.html     |  3 +-
 .../approve-event/approve-event.page.ts       |  4 +-
 .../btn-modal-dismiss.page.html               |  3 +-
 .../btn-modal-dismiss.page.ts                 |  2 +
 .../chat/edit-group/edit-group.page.html      |  3 +-
 .../shared/chat/edit-group/edit-group.page.ts |  2 +
 .../group-contacts/group-contacts.page.html   |  3 +-
 .../group-contacts/group-contacts.page.ts     |  2 +
 .../group-messages/group-messages.page.html   |  5 +-
 .../chat/messages/contacts/contacts.page.html |  3 +-
 .../chat/messages/contacts/contacts.page.ts   |  2 +
 .../shared/chat/messages/messages.page.html   |  5 +-
 .../new-group/contacts/contacts.page.html     |  3 +-
 .../chat/new-group/contacts/contacts.page.ts  |  2 +
 .../task-details/task-details.page.html       |  3 +-
 .../publication-detail.page.html              |  6 +-
 .../publication-detail.page.ts                |  2 +
 .../view-publications.page.ts                 |  5 +-
 src/assets/icon/theme/gov/icons-user.svg      |  4 ++
 .../theme/gov/icons-correspondencia.svg       | 60 +++++++++++++++++++
 48 files changed, 175 insertions(+), 51 deletions(-)
 create mode 100644 src/assets/icon/theme/gov/icons-user.svg
 create mode 100644 src/assets/images/theme/gov/icons-correspondencia.svg

diff --git a/src/app/modals/document-viewer/document-viewer.page.html b/src/app/modals/document-viewer/document-viewer.page.html
index 78dd8f681..50abdcb04 100644
--- a/src/app/modals/document-viewer/document-viewer.page.html
+++ b/src/app/modals/document-viewer/document-viewer.page.html
@@ -3,7 +3,8 @@
 
     <div class="d-flex px-20 pt-20">
       <div class="cursor-pointer" (click)="close()">
-        <ion-icon class="font-35" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
       </div>
 
       <div class="font-25">{{ fileName }}</div>
diff --git a/src/app/modals/view-document/view-document.page.html b/src/app/modals/view-document/view-document.page.html
index 0dac8efec..8b95f6cd2 100644
--- a/src/app/modals/view-document/view-document.page.html
+++ b/src/app/modals/view-document/view-document.page.html
@@ -2,7 +2,7 @@
   <ion-toolbar class="d-flex">
     <div class="d-flex align-items-center px-20 pt-20 font-25">
       <div class="left cursor-pointer" (click)="close()">
-        <fa-icon icon="chevron-left" class="menu-icon"></fa-icon>
+        <fa-icon icon="chevron-left" class="menu-icon font-awesome"></fa-icon>
       </div>
 
       <div class="middle add-ellipsis">
@@ -10,7 +10,7 @@
       </div>
 
       <div class="right cursor-pointer" (click)="openOptions()">
-        <fa-icon icon="ellipsis-v" class="menu-icon"></fa-icon>
+        <fa-icon icon="ellipsis-v" class="menu-icon font-awesome"></fa-icon>
       </div>
 
     </div>
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
index f4054a0d3..2641e0c53 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
@@ -2,7 +2,9 @@
   <div class="header-content">
     <div hidden class="header-icon-left">
       <button class="btn-no-color cursor-pointer" (click)="close()">
-        <ion-icon src="assets/images/icons-arrow-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 == 'gov' " src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+
       </button>
     </div>
     <div class="header-title">
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index ef098db37..697350915 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -15,7 +15,8 @@
         <div class="title-content  d-flex justify-between width-100">
           <div class="left">
             <button class="btn-no-color d-flex align-center" (click)="goBack()">
-              <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+              <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>
             </button>
           </div>
           <div class="middle">
diff --git a/src/app/pages/chat/edit-group/edit-group.page.html b/src/app/pages/chat/edit-group/edit-group.page.html
index 7205ad17a..70817d9f6 100644
--- a/src/app/pages/chat/edit-group/edit-group.page.html
+++ b/src/app/pages/chat/edit-group/edit-group.page.html
@@ -4,7 +4,8 @@
       <div class="title-content width-100">
         <div class="left">
           <button class="btn-no-color" (click)="close()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-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>
           </button>
         </div>
         <div class="middle">
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
index 263363b7d..dafbabf47 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
@@ -4,7 +4,8 @@
       <div class="title-content width-100">
         <div class="back-icon">
           <button class="btn-no-color" (click)="close()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-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>
           </button>
         </div>
         <div class="div-title">
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 10dc91522..fd06b69a2 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -6,7 +6,7 @@
         <div class="left">
           <button class="btn-no-color" (click)="close()">
             <!-- <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> -->
-            <fa-icon icon="chevron-left" class="header-top-btn"></fa-icon>
+            <fa-icon icon="chevron-left" class="header-top-btn font-awesome"></fa-icon>
           </button>
         </div>
         <div class="middle-container" *ngIf="!showMessageOptions">
@@ -20,13 +20,14 @@
         <div class="right">
           <button class="btn-no-color" (click)="openOptions()">
            <!--  <ion-icon src="assets/images/icons-menu.svg"></ion-icon> -->
-            <fa-icon icon="ellipsis-v" class="header-top-btn"></fa-icon>
+            <fa-icon icon="ellipsis-v" class="header-top-btn font-awesome"></fa-icon>
           </button>
         </div>
       </div>
       <div (click)="addContacts()" class="header-bottom">
         <div class="header-bottom-icon">
-          <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
         </div>
         <div class="header-bottom-contacts">
           <ion-label class="contacts-list" *ngFor="let member of members" >
@@ -124,7 +125,8 @@
   <div class="container width-100 d-flex">
     <div>
       <button class="btn-no-color" (click)="openChatOptions()">
-        <ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options" src="assets/images/theme/gov/icons-add.svg"></ion-icon>
       </button>
     </div>
     <div class="message-box width-80">
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html
index 7ae952e46..576e531d5 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.html
+++ b/src/app/pages/chat/messages/contacts/contacts.page.html
@@ -4,7 +4,8 @@
       <div class="title-content width-100">
         <div class="back-icon">
           <button class="btn-no-color" (click)="close()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-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>
           </button>
         </div>
         <div class="div-title">
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 90991514d..b81dad3f3 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -8,7 +8,7 @@
         <div class="left">
           <button class="btn-no-color" (click)="close()">
             <!-- <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> -->
-            <fa-icon icon="chevron-left" class="header-top-btn"></fa-icon>
+            <fa-icon icon="chevron-left" class="header-top-btn font-awesome"></fa-icon>
           </button>
         </div>
         <div class="middle-container" *ngIf="!showMessageOptions">
@@ -30,7 +30,8 @@
       </div>
       <div hidden class="header-bottom" (click)="addContacts()">
         <div class="header-bottom-icon">
-          <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
         </div>
         <div class="header-bottom-contacts">
           <ion-label class="text-color-blue">Adicionar contacto</ion-label>
@@ -126,7 +127,8 @@
   <div class="container width-100 d-flex">
     <div>
       <button class="btn-no-color" (click)="openChatOptions()">
-        <ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options" src="assets/images/theme/gov/icons-add.svg"></ion-icon>
       </button>
     </div>
     <div class="width-70">
diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/pages/chat/new-group/contacts/contacts.page.html
index 509f4999f..08afbe556 100644
--- a/src/app/pages/chat/new-group/contacts/contacts.page.html
+++ b/src/app/pages/chat/new-group/contacts/contacts.page.html
@@ -4,7 +4,8 @@
       <div class="title-content width-100">
         <div class="back-icon">
           <button class="btn-no-color" (click)="close()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-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>
           </button>
         </div>
         <div class="div-title">
diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html
index df06b3573..fe832cd20 100644
--- a/src/app/pages/chat/new-group/new-group.page.html
+++ b/src/app/pages/chat/new-group/new-group.page.html
@@ -4,7 +4,8 @@
       <div class="title-content width-100">
         <div class="left">
           <button class="btn-no-color" (click)="close()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-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>
           </button>
         </div>
         <div class="middle">
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index 52be9074d..3df1fa9ac 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -7,7 +7,8 @@
       <div class="main-header" >
         <div class="title-content width-100 d-flex justify-space-between align-center">
           <div class="font-30 cursor-pointer align-center d-flex" (click)="goBack()" defaultHref="#">
-            <ion-icon  slot="end" src='assets/images/icons-arrow-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>
           </div>
           <div class="middle d-flex align-center flex-grow-1">
             <div class="title">{{ task.Folio}}</div>
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index d1468db8e..e4b35646b 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -8,7 +8,8 @@
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between align-center">
           <div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
-            <ion-icon  slot="end" src='assets/images/icons-arrow-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>
           </div>
           <div class="middle d-flex align-center flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
index e391b83e4..fc8bee16e 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
@@ -8,7 +8,8 @@
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between">
           <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
-            <ion-icon  slot="end" src='assets/images/icons-arrow-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>
           </div>
           <div class="middle d-flex align-center flex-grow-1 ">
             <ion-label class="title">{{ task.Folio}}</ion-label>
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
index 99743d549..f70e98814 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -8,7 +8,8 @@
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between">
           <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
-            <ion-icon  slot="end" src='assets/images/icons-arrow-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>
           </div>
           <div class="middle d-flex align-center flex-grow-1 ">
             <ion-label class="title">{{ task.Folio}}</ion-label>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index cf562b198..5c2977042 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -2,7 +2,8 @@
   <div class="header-content  mx-20 d-flex justify-between">
     <div class="header-icon-left">
       <button class="btn-no-color cursor-pointer" (click)="close()">
-        <ion-icon src="assets/images/icons-arrow-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 == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
       </button>
     </div>
     <div class="header-title flex-grow-1">
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index c55572e49..a9f9cf1d3 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -7,7 +7,8 @@
     <div class="content d-flex flex-column width-100" *ngIf="loadedEvent.workflowInstanceDataFields">
       <div class="header-content width-100 d-flex justify-space-between">
         <div (click)="goBack()" class="header-icon-left cursor-pointer">
-          <ion-icon src="assets/images/icons-arrow-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 == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer" *ngIf="loadedEvent.workflowInstanceDataFields.Subject">
           <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 2f0e10e3d..cb2a24d8f 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -6,7 +6,8 @@
   <div class="header-content">
     <div class="header-icon-left">
       <button class="btn-no-color cursor-pointer" (click)="goBack()">
-        <ion-icon src="assets/images/icons-arrow-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 == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
       </button>
     </div>
     <div class="header-title">
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 880c45f6c..f06f9417d 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -12,7 +12,8 @@
       <div class="main-header" style="overflow: unset !important;">
         <div class="title-content width-100 d-flex justify-between">
           <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
-            <ion-icon  slot="end" src='assets/images/icons-arrow-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>
           </div>
           <div class="middle flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index 53d9879d8..fe345d4d2 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -7,7 +7,8 @@
   <div class="header-content">
     <div class="header-icon-left">
       <button class="btn-no-color cursor-pointer" (click)="goBack()">
-        <ion-icon src="assets/images/icons-arrow-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 == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
       </button>
     </div>
     <div class="header-title">
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index 3c42341aa..7e7fcfe71 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -12,7 +12,8 @@
       <div class="main-header" style="overflow: unset !important;">
         <div class="title-content width-100 d-flex justify-between">
           <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
-            <ion-icon  slot="end" src='assets/images/icons-arrow-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>
           </div>
           <div class="middle flex-grow-1">
             <ion-label class="title">{{ task.Folio}}</ion-label>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index f3413d165..f0759e726 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -110,7 +110,8 @@
 
             <div (click)="openExpedientListPage(); selectedElement='Correspondence'" [class.active]="selectedElement == 'Correspondence'" class="box-hover exp-card d-flex flex-column justify-center">
               <div class="d-flex justify-center">
-                <ion-icon  src="assets/images/icons-correspondencia.svg"></ion-icon>
+                <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-correspondencia.svg"></ion-icon>
+                <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-correspondencia.svg"></ion-icon>
               </div>
               <p class="text-center exp-card-title ">Expediente</p>
               <p class="text-center exp-card-content">{{expedientegbstore.count}} <span class="title1">Documentos</span></p>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index 46ffb24a0..b83ec04b7 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -8,7 +8,8 @@
       <div class="main-header ">
         <div class="title-content width-100 d-flex justify-space-between ">
           <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
-            <ion-icon  slot="end" src='assets/images/icons-arrow-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>
           </div>
           <!-- <app-btn-modal-dismiss></app-btn-modal-dismiss> -->
           <div class="middle flex-grow-1">
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html
index f716a524b..9fed86dd4 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.html
@@ -5,7 +5,8 @@
     <div *ngIf="publication.Title != ''">
     <div class="title-content">
       <div class="back-icon">
-        <ion-icon tappable (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " tappable (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  tappable (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
       </div>
       <div class="div-title">
         <ion-label class="title"> {{publication.Title}}</ion-label>
@@ -32,7 +33,8 @@
     <div *ngIf="publication.Title == ''">
       <div class="title-content">
         <div class="back-icon">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
         </div>
         <div class="div-title">
           <ion-label class="title"><ion-skeleton-text animated style="width: 60%;"></ion-skeleton-text></ion-label>
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
index 6b3c0436e..70c3a110a 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
@@ -13,7 +13,8 @@
     <div *ngIf="publication.Title != ''" class="d-flex flex-column height-100">
       <div class="title-content px-20 width-100 ">
         <div class="back-icon cursor-pointer"  (click)="goBack()">
-          <ion-icon  slot="end" src='assets/images/icons-arrow-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>
         </div>
         <div class="div-title">
           <ion-label class="title"> {{publication.Title}}</ion-label>
@@ -37,7 +38,8 @@
     <div *ngIf="publication.Title == ''" class="d-flex flex-column">
       <div class="title-content width-100">
         <div class="back-icon cursor-pointer">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
         </div>
         <div class="div-title">
           <ion-label class="title"><ion-skeleton-text animated style="width: 60%;"></ion-skeleton-text></ion-label>
diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html
index ee14eb539..d1a547375 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.html
+++ b/src/app/pages/publications/view-publications/view-publications.page.html
@@ -7,7 +7,8 @@
   <div class="main-header">
     <div class="title-content d-flex width-100">
       <div class="back-icon" (click)="goBack()">
-        <ion-icon  slot="end" src='assets/images/icons-arrow-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>
       </div>
       <div class="div-title flex-grow-1">
         <ion-label class="title">{{item.Description}}</ion-label>
diff --git a/src/app/pages/search/organic-entity/organic-entity.page.html b/src/app/pages/search/organic-entity/organic-entity.page.html
index efde8e18c..370fe9c6a 100644
--- a/src/app/pages/search/organic-entity/organic-entity.page.html
+++ b/src/app/pages/search/organic-entity/organic-entity.page.html
@@ -7,7 +7,8 @@
 <ion-toolbar class="main-header d-flex">
     <div class="d-flex align-center">
       <div class="icon" (click)="close()">
-      <ion-icon style="font-size:35px;" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size:35px;" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size:35px;" src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
     </div>
 
     <div>
diff --git a/src/app/pages/search/sender/sender.page.html b/src/app/pages/search/sender/sender.page.html
index 50117aa85..f1b4e6a0e 100644
--- a/src/app/pages/search/sender/sender.page.html
+++ b/src/app/pages/search/sender/sender.page.html
@@ -2,7 +2,8 @@
 <ion-toolbar class="main-header d-flex">
     <div class="d-flex align-center">
       <div class="icon" (click)="close()">
-      <ion-icon style="font-size:35px;" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size:35px;" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size:35px;" src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
     </div>
 
     <div>
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index 2c64b1ce3..2cdca3245 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -18,7 +18,8 @@
     <div class="content d-flex flex-column">
       <div class="header-content width-100 d-flex justify-space-between">
         <div (click)="close()" class="header-icon-left cursor-pointer">
-          <ion-icon src="assets/images/icons-arrow-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 == 'gov' " src="assets/images/assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer">
           <label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11</label>
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index 473476872..c94d7daef 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -10,6 +10,7 @@ import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popo
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ToastService } from 'src/app/services/toast.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-approve-event',
@@ -48,7 +49,8 @@ export class ApproveEventPage implements OnInit {
     private popoverController: PopoverController,
     private alertService: AlertService,
     private iab: InAppBrowser,
-    private toastService: ToastService
+    private toastService: ToastService,
+    public ThemeService: ThemeService
   ) {
     // Event to approve list
 
diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
index 9b8db00e1..124c58b0d 100644
--- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
+++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
@@ -1,5 +1,6 @@
 <div class="btn-modal-dismiss">
   <button class="btn-no-color" (click)="close()">
-    <ion-icon slot="end" src='assets/images/icons-arrow-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/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
   </button>
 </div>
diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts
index f8d5f8507..c51aed317 100644
--- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts
+++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-btn-modal-dismiss',
@@ -10,6 +11,7 @@ export class BtnModalDismissPage implements OnInit {
 
   constructor(
     private modalController: ModalController, 
+    public ThemeService: ThemeService
   ) { 
 
   }
diff --git a/src/app/shared/chat/edit-group/edit-group.page.html b/src/app/shared/chat/edit-group/edit-group.page.html
index 9d046bfe9..5de4ba1db 100644
--- a/src/app/shared/chat/edit-group/edit-group.page.html
+++ b/src/app/shared/chat/edit-group/edit-group.page.html
@@ -4,7 +4,8 @@
       <div class="title-content">
         <div class="left">
           <button class="btn-no-color" (click)="close()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-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/iassets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
           </button>
         </div>
         <div class="middle">
diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts
index 02ca60700..0ee77552b 100644
--- a/src/app/shared/chat/edit-group/edit-group.page.ts
+++ b/src/app/shared/chat/edit-group/edit-group.page.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController, PickerController } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-edit-group',
@@ -26,6 +27,7 @@ export class EditGroupPage implements OnInit {
     private pickerController: PickerController,
     private chatService: ChatService,
     private authService: AuthService,
+    public ThemeService: ThemeService
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
    }
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
index 12efc9f18..d30645d4b 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
@@ -4,7 +4,8 @@
       <div class="title-content width-100">
         <div class="back-icon">
           <button class="btn-no-color" (click)="openGroupMessagesPage()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-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>
           </button>
         </div>
         <div class="div-title">
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index 916f3ad3e..63173ed2f 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -6,6 +6,7 @@ import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
 import { NewGroupPage } from '../../new-group/new-group.page';
 import { GroupMessagesPage } from '../group-messages.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-group-contacts',
@@ -39,6 +40,7 @@ export class GroupContactsPage implements OnInit {
     private http: HttpClient,
     private chatService: ChatService,
     private authService: AuthService,
+    public ThemeService: ThemeService
     //private navParams: NavParams,
   )
   {
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 7e4946900..cb747e12c 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -14,7 +14,8 @@
       </div>
       <div (click)="openGroupContactsPage()" class="header-bottom">
         <div class="header-bottom-icon">
-          <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
         </div>
         <div class="header-bottom-contacts">
           <ion-label class="contacts-list" *ngFor="let member of members" >
@@ -129,7 +130,7 @@
   <div class="container width-100 d-flex">
     <div>
       <!-- <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
-        <ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
+        <ion-icon class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
       </button> -->
       <ion-fab horizontal="start" vertical="bottom" slot="fixed">
         <ion-fab-button color="light" size="small">
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html
index e263f96f7..c2e87f080 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.html
+++ b/src/app/shared/chat/messages/contacts/contacts.page.html
@@ -3,7 +3,8 @@
     <div class="main-header">
       <div class="title-content">
         <div class="back-icon">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " (click)="close()" slot="end" src='assets/images/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
         </div>
         <div class="div-title">
           <ion-label class="title">Nova Conversa</ion-label>
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index b3192cc50..308e81dc6 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -5,6 +5,7 @@ import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
 import { GroupMessagesPage } from '../../group-messages/group-messages.page';
 import { MessagesPage } from '../messages.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-contacts',
@@ -30,6 +31,7 @@ export class ContactsPage implements OnInit {
     private http: HttpClient,
     private chatService: ChatService,
     private authService: AuthService,
+    public ThemeService: ThemeService
   )
   {
     this.loggedUser = authService.ValidatedUserChat['data'];
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 61631542a..9f77e4286 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -19,7 +19,8 @@
       </div> -->
       <div hidden class="header-bottom" (click)="addContacts()">
         <div class="header-bottom-icon">
-          <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
         </div>
         <div class="header-bottom-contacts">
           <ion-label class="text-color-blue">Adicionar contacto</ion-label>
@@ -105,7 +106,7 @@
   <div class="container width-100 d-flex">
     <div>
       <!-- <button class="btn-no-color" (click)="openSendMessageOptions()">
-        <ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
+        <ion-icon class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
       </button> -->
 
       <ion-fab horizontal="start" vertical="bottom" slot="fixed">
diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.html b/src/app/shared/chat/new-group/contacts/contacts.page.html
index 291e6ef37..300c58faf 100644
--- a/src/app/shared/chat/new-group/contacts/contacts.page.html
+++ b/src/app/shared/chat/new-group/contacts/contacts.page.html
@@ -4,7 +4,8 @@
       <div class="title-content">
         <div class="back-icon">
           <button class="btn-no-color" (click)="close()">
-            <ion-icon slot="end" src='assets/images/icons-arrow-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/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
           </button>
         </div>
         <div class="div-title">
diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.ts b/src/app/shared/chat/new-group/contacts/contacts.page.ts
index da4de0c8a..61a0cb101 100644
--- a/src/app/shared/chat/new-group/contacts/contacts.page.ts
+++ b/src/app/shared/chat/new-group/contacts/contacts.page.ts
@@ -2,6 +2,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { GroupMessagesPage } from '../../group-messages/group-messages.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-contacts',
@@ -53,6 +54,7 @@ export class ContactsPage implements OnInit {
   constructor(
     private modalController: ModalController,
     private http: HttpClient,
+    public ThemeService: ThemeService
   ) 
   { 
     this.headers = new HttpHeaders();
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
index 0631bdc88..6e4a59538 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
@@ -2,7 +2,8 @@
   <div class="main-header">
     <div class="title-content width-100 d-flex justify-space-between align-center">
       <div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack.emit()" defaultHref="#">
-        <ion-icon  slot="end" src='assets/images/icons-arrow-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/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
       </div>
       <div class="middle d-flex align-center flex-grow-1">
         <ion-label class="title">{{ task.Folio}}</ion-label>
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
index 38f34ba17..397e714b3 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
@@ -10,7 +10,8 @@
     <div class="title-content d-flex pl-20">
       <div class="back-icon "  (click)="goBack()">
 
-        <ion-icon class="font-30" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-30" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-30" slot="end" src='assets/images/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
 
       </div>
       <div class="div-title">
@@ -38,7 +39,8 @@
     <div *ngIf="publication.Title == ''">
       <div class="title-content">
         <div class="back-icon">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
         </div>
         <div class="div-title">
           <ion-label class="title"><ion-skeleton-text animated style="width: 60%;"></ion-skeleton-text></ion-label>
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 3d5dc3d37..b94ed647f 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -7,6 +7,7 @@ import { PublicationsService } from 'src/app/services/publications.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-publication-detail-shared',
@@ -29,6 +30,7 @@ export class PublicationDetailPage implements OnInit {
     private publications:PublicationsService,
     private animationController: AnimationController,
     private toastService: ToastService,
+    public ThemeService: ThemeService
     ) {
       
       /* this.folderId = this.navParams.get('folderIdId'); */
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts
index 910bed35e..1d48135bb 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -10,6 +10,8 @@ import { PublicationListStorage } from 'src/app/store/publication-list.service'
 import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
 import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service';
 import { PublicationPipe } from 'src/app/pipes/publication.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
+
 @Component({
   selector: 'app-view-publications',
   templateUrl: './view-publications.page.html',
@@ -42,7 +44,8 @@ export class ViewPublicationsPage implements OnInit {
   constructor(
     private loadingController: LoadingService,
     private modalController: ModalController,
-    private publications: PublicationsService
+    private publications: PublicationsService,
+    public ThemeService: ThemeService
     ) {
       this.item = new PublicationFolder();
   }
diff --git a/src/assets/icon/theme/gov/icons-user.svg b/src/assets/icon/theme/gov/icons-user.svg
new file mode 100644
index 000000000..bee00e45a
--- /dev/null
+++ b/src/assets/icon/theme/gov/icons-user.svg
@@ -0,0 +1,4 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 25C19.4036 25 25 19.4036 25 12.5C25 5.59644 19.4036 0 12.5 0C5.59644 0 0 5.59644 0 12.5C0 19.4036 5.59644 25 12.5 25Z" fill="#FFB81C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.615 6C14.09 6 15.285 7.195 15.285 8.67V9.17C15.285 9.995 14.913 10.731 14.327 11.22C16.027 11.962 17.231 13.782 17.231 15.909C17.231 18.697 8 18.697 8 15.909C8 13.782 9.202 11.963 10.904 11.219C10.318 10.731 9.945 9.994 9.945 9.171V8.671C9.945 7.194 11.141 6 12.615 6Z" stroke="#080808" stroke-width="2" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/theme/gov/icons-correspondencia.svg b/src/assets/images/theme/gov/icons-correspondencia.svg
new file mode 100644
index 000000000..1e3bbb459
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-correspondencia.svg
@@ -0,0 +1,60 @@
+<svg width="50" height="51" viewBox="0 0 50 51" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_91:145)">
+<g filter="url(#filter0_d_91:145)">
+<path d="M22.8103 3.27405C22.8053 2.56505 23.3683 1.99405 24.0703 2.00005L39.2983 2.12205C39.9983 2.12805 40.5713 2.70705 40.5773 3.41605L40.7373 23.951C40.7423 24.66 40.1783 25.23 39.4773 25.224L23.8273 25.12C23.2773 25.116 22.8343 24.67 22.8333 24.12L22.8103 3.27505V3.27405Z" fill="white"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.0653 2.50004L39.2943 2.62204C39.5083 2.62404 39.7013 2.71404 39.8423 2.85704C39.9863 3.00204 40.0753 3.20104 40.0773 3.42004L40.2373 23.955C40.2383 24.17 40.1553 24.365 40.0173 24.505C39.8803 24.642 39.6913 24.726 39.4813 24.725L23.8303 24.62L23.3103 3.27004C23.3083 3.05504 23.3923 2.86004 23.5303 2.72004C23.6673 2.58304 23.8563 2.49904 24.0653 2.50004V2.50004Z" fill="#C63527" stroke="#EBEBEB" stroke-opacity="0.194"/>
+<path d="M35.3503 12.2132H27.9153C27.6392 12.2132 27.4153 12.4371 27.4153 12.7132C27.4153 12.9893 27.6392 13.2132 27.9153 13.2132H35.3503C35.6265 13.2132 35.8503 12.9893 35.8503 12.7132C35.8503 12.4371 35.6265 12.2132 35.3503 12.2132Z" stroke="white" stroke-width="2"/>
+<path d="M35.3503 8.98221H27.9153C27.6392 8.98221 27.4153 9.20607 27.4153 9.48221C27.4153 9.75835 27.6392 9.98221 27.9153 9.98221H35.3503C35.6265 9.98221 35.8503 9.75835 35.8503 9.48221C35.8503 9.20607 35.6265 8.98221 35.3503 8.98221Z" stroke="white" stroke-width="2"/>
+<path d="M35.3503 15.4442H27.9153C27.6392 15.4442 27.4153 15.6681 27.4153 15.9442C27.4153 16.2204 27.6392 16.4442 27.9153 16.4442H35.3503C35.6265 16.4442 35.8503 16.2204 35.8503 15.9442C35.8503 15.6681 35.6265 15.4442 35.3503 15.4442Z" stroke="white" stroke-width="2"/>
+<path d="M32.2193 18.6742H27.9153C27.6392 18.6742 27.4153 18.8981 27.4153 19.1742C27.4153 19.4503 27.6392 19.6742 27.9153 19.6742H32.2193C32.4955 19.6742 32.7193 19.4503 32.7193 19.1742C32.7193 18.8981 32.4955 18.6742 32.2193 18.6742Z" stroke="white" stroke-width="2"/>
+<g filter="url(#filter1_d_91:145)">
+<path d="M12.9463 15.427C12.9413 14.693 13.5293 14.101 14.2593 14.107L30.1153 14.21C30.8453 14.215 31.4413 14.814 31.4453 15.548L31.5813 36.825C31.5863 37.559 30.9983 38.151 30.2683 38.146L13.9333 38.061C13.3833 38.058 12.9383 37.611 12.9393 37.061L12.9463 15.427V15.427Z" fill="white"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2553 14.606L30.1123 14.71C30.3403 14.711 30.5473 14.806 30.6983 14.958C30.8493 15.11 30.9443 15.32 30.9453 15.551L31.0813 36.828C31.0833 37.056 30.9933 37.262 30.8453 37.41C30.6993 37.557 30.4963 37.647 30.2713 37.646L13.9363 37.561L13.4463 15.424C13.4443 15.196 13.5343 14.99 13.6813 14.842C13.8283 14.695 14.0313 14.605 14.2553 14.606V14.606Z" fill="#C63527" stroke="#EBEBEB" stroke-opacity="0.194"/>
+<path d="M26.0524 24.6402H18.1824C17.9062 24.6402 17.6824 24.8641 17.6824 25.1402C17.6824 25.4163 17.9062 25.6402 18.1824 25.6402H26.0524C26.3285 25.6402 26.5524 25.4163 26.5524 25.1402C26.5524 24.8641 26.3285 24.6402 26.0524 24.6402Z" stroke="white" stroke-width="2"/>
+<path d="M26.0524 21.2942H18.1824C17.9062 21.2942 17.6824 21.518 17.6824 21.7942C17.6824 22.0703 17.9062 22.2942 18.1824 22.2942H26.0524C26.3285 22.2942 26.5524 22.0703 26.5524 21.7942C26.5524 21.518 26.3285 21.2942 26.0524 21.2942Z" stroke="white" stroke-width="2"/>
+<path d="M26.0524 27.9862H18.1824C17.9062 27.9862 17.6824 28.21 17.6824 28.4862C17.6824 28.7623 17.9062 28.9862 18.1824 28.9862H26.0524C26.3285 28.9862 26.5524 28.7623 26.5524 28.4862C26.5524 28.21 26.3285 27.9862 26.0524 27.9862Z" stroke="white" stroke-width="2"/>
+<path d="M22.7914 31.3322H18.1824C17.9062 31.3322 17.6824 31.556 17.6824 31.8322C17.6824 32.1083 17.9062 32.3322 18.1824 32.3322H22.7914C23.0675 32.3322 23.2914 32.1083 23.2914 31.8322C23.2914 31.556 23.0675 31.3322 22.7914 31.3322Z" stroke="white" stroke-width="2"/>
+<g filter="url(#filter2_d_91:145)">
+<path d="M2 39.0702H9.304C9.754 39.0702 10.192 39.2232 10.546 39.5022L15.77 43.6382C16.124 43.9182 16.561 44.0702 17.012 44.0702H33.252C33.702 44.0702 34.14 43.9182 34.492 43.6382L39.719 39.5022C40.072 39.2222 40.509 39.0702 40.96 39.0702H48C49.105 39.0702 50 39.9662 50 41.0702V47.0702C50 48.1752 49.105 49.0702 48 49.0702H2C0.895 49.0702 0 48.1752 0 47.0702V41.0702C0 39.9662 0.895 39.0702 2 39.0702V39.0702Z" fill="black"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.304 39.5702C9.642 39.5702 9.97 39.6842 10.235 39.8942L15.46 44.0302C15.902 44.3802 16.448 44.5702 17.012 44.5702H33.252C33.815 44.5702 34.362 44.3802 34.803 44.0302L40.028 39.8952C40.293 39.6852 40.621 39.5712 40.959 39.5712H48C48.414 39.5712 48.79 39.7392 49.06 40.0112C49.332 40.2822 49.5 40.6572 49.5 41.0712V47.0712C49.5 47.4862 49.332 47.8612 49.06 48.1322C48.79 48.4032 48.414 48.5722 48 48.5722H2C1.586 48.5722 1.21 48.4032 0.94 48.1322C0.667 47.8602 0.5 47.4852 0.5 47.0712V41.0712C0.5 40.6562 0.668 40.2812 0.94 40.0102C1.21 39.7382 1.586 39.5702 2 39.5702H9.304Z" fill="url(#paint0_linear_91:145)" stroke="#EBEBEB" stroke-opacity="0.194"/>
+</g>
+<defs>
+<filter id="filter0_d_91:145" x="21.8102" y="2" width="19.9271" height="25.2241" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187391 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_91:145"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_91:145" result="shape"/>
+</filter>
+<filter id="filter1_d_91:145" x="11.9393" y="14.1069" width="20.642" height="26.0391" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187391 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_91:145"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_91:145" result="shape"/>
+</filter>
+<filter id="filter2_d_91:145" x="-1" y="39.0702" width="52" height="12" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187391 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_91:145"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_91:145" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_91:145" x1="25" y1="39.5702" x2="25" y2="48.5722" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFD759"/>
+<stop offset="1" stop-color="#FFCB26"/>
+</linearGradient>
+<clipPath id="clip0_91:145">
+<rect width="50" height="51" fill="white"/>
+</clipPath>
+</defs>
+</svg>