diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 385eb23e1..238b5e42c 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -101,7 +101,8 @@
                 </ion-item>
               </div>
               <div class="add-people" (click)="addParticipants();">
-                <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
@@ -122,7 +123,8 @@
                 </ion-item>
               </div>
               <div class="add-people" (click)="addParticipantsCc();">
-                <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index a566bfdcc..a2ef20d21 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -20,6 +20,8 @@ import { PermissionService } from 'src/app/services/worker/permission.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { PedidoService } from 'src/app/Rules/pedido.service'
 import { fullTask } from 'src/app/models/dailyworktask.model';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -97,7 +99,8 @@ export class CreateProcessPage implements OnInit {
     private toastService: ToastService,
     public p: PermissionService,
     private despachoService: DespachoService,
-    private pedidoService: PedidoService
+    private pedidoService: PedidoService,
+    public ThemeService: ThemeService
     ) {
       this.loggeduser = userAuth.ValidatedUser;
       this.task = this.navParams.get('task');
diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html
index fea6be656..13b29df72 100644
--- a/src/app/modals/delegar/delegar.page.html
+++ b/src/app/modals/delegar/delegar.page.html
@@ -24,7 +24,8 @@
                 </ion-item>
               </div>
               <div class="add-people" (click)="addParticipants()">
-                <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts
index 1a1116285..81e57b3ca 100644
--- a/src/app/modals/delegar/delegar.page.ts
+++ b/src/app/modals/delegar/delegar.page.ts
@@ -13,6 +13,8 @@ import { ToastService } from 'src/app/services/toast.service';
 import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
 import { SearchList } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.page';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-delegar',
@@ -52,6 +54,7 @@ export class DelegarPage implements OnInit {
     private alertService: AlertService,
     private animationController: AnimationController,
     private toastService: ToastService,
+    public ThemeService: ThemeService
     ) {
       this.task = this.navParams.get('task');
       this.postData = new Event();
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
index f34b17ec6..fe1858adb 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
@@ -276,7 +276,8 @@
                 </ion-item>
               </div>
               <div class="add-people" >
-                <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
@@ -297,7 +298,8 @@
                 </ion-item>
               </div>
               <div class="add-people" >
-                <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
index 947058b71..3d2429b35 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
@@ -17,6 +17,8 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick
 import { EventsService } from 'src/app/services/events.service';
 import { EventService } from 'src/app/services/rules/event.service';
 import { EventPipe } from 'src/app/pipes/event.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -96,7 +98,8 @@ export class DocumentSetUpMeetingPage implements OnInit {
     authService: AuthService,
     private toastService: ToastService,
     private calendarService: EventsService,
-    private eventService: EventService
+    private eventService: EventService,
+    public ThemeService: ThemeService
   ) {
     this.loggeduser = authService.ValidatedUser;
     this.document = this.navParams.get('document')
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html
index b8c0e22b6..837e47811 100644
--- a/src/app/modals/forward/forward.page.html
+++ b/src/app/modals/forward/forward.page.html
@@ -24,7 +24,8 @@
                 </ion-item>
               </div>
               <div class="add-people" (click)="addParticipants()">
-                <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts
index ede8b6f3b..d56c77b7a 100644
--- a/src/app/modals/forward/forward.page.ts
+++ b/src/app/modals/forward/forward.page.ts
@@ -15,6 +15,8 @@ import { ToastService } from 'src/app/services/toast.service';
 import { SearchList } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-forward',
@@ -53,6 +55,7 @@ export class ForwardPage implements OnInit {
     private alertService: AlertService,
     private animationController: AnimationController,
     private toastService: ToastService,
+    public ThemeService: ThemeService
     ) {
       this.task = this.navParams.get('task');
       this.postData = new Event();
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 7be7347da..53e4bfa2b 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -30,7 +30,8 @@
 
                   <div class="arrow">
                     <button (click)="back()" class="btn-no-color" >
-                      <ion-icon  slot="icon-only"  src="assets/images/icons-calendar-arrow-left.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="icon-only"  src="assets/images/icons-calendar-arrow-left.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="icon-only"  src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
                     </button>
 
                   </div>
@@ -40,7 +41,8 @@
                     {{ viewTitle }}  
 
                     <div (click)="dropdownScrollWeal = true; onDropDownScrollWeal()">
-                      <ion-icon style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
                     </div>
                     
                   </h2>
@@ -99,7 +101,8 @@
                   </div> -->
                   <!-- Move forward one screen of the slides -->
                   <div (click)="next()" class="arrow">
-                    <ion-icon  slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
+                    <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
+                    <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
                   </div>
 
                 </ion-row>
@@ -200,7 +203,8 @@
               <div class="filter-name">{{timelineFilterState}}</div>
               <!-- Icon -->
               <button  (click)="showTimelineFilterState=!showTimelineFilterState" class="arrow-down btn-no-color">
-                <ion-icon src="assets/images/icons-arrow-arrow-down.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
               </button>
 
               <!-- List -->
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 928c7d14f..8073765e1 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -205,7 +205,8 @@
                   </ion-item>
                 </div>
                 <div class="add-people">
-                  <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>
             </div>
@@ -226,7 +227,8 @@
                   </ion-item>
                 </div>
                 <div class="add-people">
-                  <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>
             </div>
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index 37ee65584..8cd58e2f1 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -11,6 +11,8 @@ import { ToastService } from 'src/app/services/toast.service';
 import { Event } from '../../../models/event.model';
 import { AttendeesPageModal } from '../../events/attendees/attendees.page';
 import { SearchPage } from '../../search/search.page';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-edit-event',
@@ -56,6 +58,7 @@ export class EditEventPage implements OnInit {
     private attachmentsService: AttachmentsService,
     private toastService: ToastService,
     private router: Router,
+    public ThemeService: ThemeService
   ) {
 
     this.postEvent = new Event();
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index b7aa03b6c..5b09bead6 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -209,7 +209,8 @@
             </ion-item>
           </div>
           <div (click)="addParticipants()" class="add-people cursor-pointer">
-            <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
           </div>
         </div>
       </div>
@@ -236,7 +237,8 @@
             </ion-item>
           </div>
           <div (click)="addParticipantsCC()" class="add-people cursor-pointer">
-            <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
           </div>
         </div>
       </div>
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index fb5d5d4e4..2c9954bcd 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -15,6 +15,7 @@ import { SearchPage } from '../../search/search.page';
 import { ThemePalette } from '@angular/material/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { EventRecurrence } from 'src/app/models/agenda/eventrecurrence.model';
+import { ThemeService } from 'src/app/services/theme.service'
 
 
 @Component({
@@ -67,6 +68,7 @@ export class NewEventPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     userService: AuthService,
+    public ThemeService: ThemeService
   ) {
     this.loggeduser = userService.ValidatedUser;
     this.postEvent = new Event();
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 88e6d3afa..65b1a2ff9 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -23,7 +23,8 @@
           </div>
           <div class="menu-options d-flex">
             <button class="btn-no-color" (click)="editEvent()">
-              <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
+              <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>
             </button>
             <button class="btn-no-color" (click)="deleteEvent()">
               <ion-icon class="delete"  name="trash-sharp"></ion-icon>
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index 21eb924f8..ad1989d2b 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -19,6 +19,8 @@ import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedi
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { BackgroundService } from 'src/app/services/background.service';
 import { StorageService } from 'src/app/services/storage.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-view-event',
@@ -68,7 +70,8 @@ export class ViewEventPage implements OnInit {
     public platform: Platform,
     private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
-    private storage: StorageService
+    private storage: StorageService,
+    public ThemeService: ThemeService
   ) {
     this.isEventEdited = false;
     this.loadedEvent = new Event();
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index c7cb6b850..d7599e7ee 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -84,12 +84,6 @@ export class ChatPage implements OnInit {
   @Output() getRoomInfo;
 
 
-  /*
-
-  Websockets variables
-
-  */
-
   subject: any;
   public messages: Subject<any>;
 
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 3d0f93cf1..73900b976 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -16,6 +16,8 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
 import { SqliteService } from '../../../../services/sqlite.service';
 import { BackgroundService } from '../../../../services/background.service';
 import { Platform } from '@ionic/angular';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-approve-event',
@@ -58,7 +60,8 @@ export class ApproveEventPage implements OnInit {
     private location: Location,
     private sqliteservice: SqliteService,
     private platform: Platform,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       // console.log(params["params"]);
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 25dbc352b..cb2d87625 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -276,7 +276,8 @@
                 </ion-item>
               </div>
               <div class="add-people" (click)="addParticipants()">
-                <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
@@ -297,7 +298,8 @@
                 </ion-item>
               </div>
               <div class="add-people" (click)="addParticipantsCc()">
-                <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index a563b56ee..7411339b3 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -19,6 +19,8 @@ import * as _moment from 'moment';
 import * as _rollupMoment from 'moment';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 const moment = _rollupMoment || _moment;
 
@@ -125,6 +127,7 @@ export class BookMeetingModalPage implements OnInit {
     authService: AuthService,
     private toastService: ToastService,
     private activatedRoute: ActivatedRoute,
+    public ThemeService: ThemeService
     ) {
       this.taskParticipants = [];
       this.loggeduser = authService.ValidatedUser;
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 3a830460c..8e1c308f6 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -143,7 +143,8 @@
                 </ion-item>
               </div>
               <div class="add-people" (click)="addParticipants();">
-                <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
@@ -164,7 +165,8 @@
                 </ion-item>
               </div>
               <div class="add-people" (click)="addParticipantsCc();">
-                <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
               </div>
             </div>
           </div>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 6e36b5227..66a2f128e 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -22,6 +22,8 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'
 import { task } from 'src/app/models/ExpedientTaskModalPage';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -106,7 +108,8 @@ export class ExpedientTaskModalPage implements OnInit {
     private alertController: AlertService,
     private userAuth: AuthService,
     private toastService: ToastService,
-    private despachoService: DespachoService
+    private despachoService: DespachoService,
+    public ThemeService: ThemeService
     ) {
 
       this.loggeduser = userAuth.ValidatedUser;
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
index 1c484cf20..ce3d140fa 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
@@ -290,7 +290,8 @@
                   </ion-item>
                 </div>
                 <div class="add-people cursor-pointer"  >
-                  <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>
             </div>
@@ -311,7 +312,8 @@
                   </ion-item>
                 </div>
                 <div class="add-people cursor-pointer" >
-                  <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>
             </div>
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index 347c6d60c..5570ca88b 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -13,6 +13,8 @@ import { ToastService } from 'src/app/services/toast.service';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { EventToApproveEdit } from 'src/app/models/event.model';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -125,6 +127,7 @@ export class EditEventToApprovePage implements OnInit {
     private attachmentsService: AttachmentsService,
     private processes:ProcessesService,
     private toastService: ToastService,
+    public ThemeService: ThemeService
   ) {
     this.isEventEdited = false;
   }
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 7005206c6..6d69a901a 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -230,7 +230,8 @@
           </div>
           <div class="add-people">
             <button class="btn-no-color cursor-pointer" (click)="addParticipants()">
-              <ion-icon class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
             </button>
           </div>
         </div>
@@ -253,7 +254,8 @@
           </div>
           <div class="add-people">
             <button class="btn-no-color cursor-pointer" (click)="addParticipantsCc()">
-              <ion-icon  class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  class="font-35" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
             </button>
           </div>
         </div>
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index ef090f493..682380246 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -12,6 +12,8 @@ import { Attachment } from 'src/app/models/attachment.model';
 import { ToastService } from 'src/app/services/toast.service';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-edit-event',
@@ -89,6 +91,7 @@ export class EditEventPage implements OnInit {
     public alertController: AlertController,
     private attachmentsService: AttachmentsService,
     private toastService: ToastService,
+    public ThemeService: ThemeService
   ) {}
 
   ngOnInit() {
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 0dce0afc6..c41132d62 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -248,7 +248,8 @@
           </div>
 
           <div class="add-people cursor-pointer" (click)="addParticipants()">
-            <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
           </div>
         </div>
       </div>
@@ -271,7 +272,8 @@
 
           </div>
           <div class="add-people cursor-pointer" (click)="addParticipantsCc()">
-            <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
           </div>
         </div>
       </div>
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index c3976d055..bcf7d5dc4 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -24,6 +24,8 @@ import { ThemePalette } from '@angular/material/core';
 import { ViewChild } from '@angular/core';
 import {  FormGroup, Validators } from '@angular/forms';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 const moment = _rollupMoment || _moment;
 
@@ -118,6 +120,7 @@ export class NewEventPage implements OnInit {
     private toastService: ToastService,
     private userService: AuthService,
     private dateAdapter: DateAdapter<any>,
+    public ThemeService: ThemeService
     // private translate: TranslateService
   ) {
     this.dateAdapter.setLocale('pt');
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 af3cd398f..a9e48023c 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -4,7 +4,8 @@
       <div class="title-content d-flex"  >
         <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-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="middle" (click)="openOptions()">
@@ -13,7 +14,8 @@
 
         <div class="div-icon d-flex align-base">
           <button class="btn-no-color" (click)="editEvent()">
-            <ion-icon class="edit" slot="end" src="assets/images/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>
           </button>
           <button class="btn-no-color" (click)="deleteEvent()">
             <ion-icon class="delete" name="trash-sharp"></ion-icon>
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index 8277b7ecf..cff1408fe 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -12,6 +12,8 @@ import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTas
 import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-view-event',
@@ -51,7 +53,8 @@ export class ViewEventPage implements OnInit {
     private processes: ProcessesService,
     private modalController: ModalController,
     public popoverController: PopoverController,
-    private toastService: ToastService
+    private toastService: ToastService,
+    public ThemeService: ThemeService
   ) {
     this.isEventEdited = false;
     this.loadedEvent = new Event();
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index 22d37ee80..9846fde37 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -284,7 +284,8 @@
                   </ion-item>
                 </div>
                 <div class="add-people cursor-pointer">
-                  <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>
             </div>
@@ -305,7 +306,8 @@
                   </ion-item>
                 </div>
                 <div class="add-people cursor-pointer" >
-                  <ion-icon  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
                 </div>
               </div>
             </div>
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index 78837cf93..2c00a6a17 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -12,7 +12,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { Event, EventToApproveEdit } from '../../../models/event.model';
 import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { NavigationExtras, Router } from '@angular/router';
-
+import { ThemeService } from 'src/app/services/theme.service'
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -117,6 +117,7 @@ export class EditEventToApproveComponent implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     private router:Router,
+    public ThemeService: ThemeService
   ) {
     // Edit event to approve
     this.serialNumber = this.navParams.get('serialNumber');
diff --git a/src/assets/images/theme/gov/icons-arrow-arrow-down.svg b/src/assets/images/theme/gov/icons-arrow-arrow-down.svg
new file mode 100644
index 000000000..b464cabbf
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-arrow-arrow-down.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 10L12.5 16L18 10" stroke="#FFB81C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/theme/gov/icons-arrow-forward.svg b/src/assets/images/theme/gov/icons-arrow-forward.svg
new file mode 100644
index 000000000..177a9f643
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-arrow-forward.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.5 7.5L15.5 13L9.5 18.5" stroke="#FFB81C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/theme/gov/icons-calendar-arrow-left.svg b/src/assets/images/theme/gov/icons-calendar-arrow-left.svg
new file mode 100644
index 000000000..e0763dca8
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-calendar-arrow-left.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22 9L13 18L22 27" stroke="#FFB81C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/theme/gov/icons-calendar-arrow-right.svg b/src/assets/images/theme/gov/icons-calendar-arrow-right.svg
new file mode 100644
index 000000000..0c68f3d31
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-calendar-arrow-right.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 9L22 18L13 27" stroke="#FFB81C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/theme/gov/icons-edit.svg b/src/assets/images/theme/gov/icons-edit.svg
new file mode 100644
index 000000000..38611c651
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-edit.svg
@@ -0,0 +1,8 @@
+<svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23.143V10.286H9V9Z" fill="#080808"/>
+<path d="M13.5 11.572C14.5654 11.572 15.429 10.7083 15.429 9.64299C15.429 8.57763 14.5654 7.71399 13.5 7.71399C12.4346 7.71399 11.571 8.57763 11.571 9.64299C11.571 10.7083 12.4346 11.572 13.5 11.572Z" fill="#080808"/>
+<path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
+<path d="M12.572 34.714H32.429C32.9813 34.714 33.429 35.1617 33.429 35.714V36.285C33.429 36.8373 32.9813 37.285 32.429 37.285H12.572C12.0197 37.285 11.572 36.8373 11.572 36.285V35.714C11.572 35.1617 12.0197 34.714 12.572 34.714Z" fill="#080808"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6657 13.2079L15.83 15.4224C15.352 15.6984 15.188 16.3104 15.464 16.7885L15.7495 17.283C16.026 17.7619 16.6375 17.925 17.1155 17.649L20.9512 15.4345C21.4292 15.1585 21.5937 14.5474 21.3172 14.0685L21.0317 13.574C20.7557 13.0959 20.1437 12.9319 19.6657 13.2079V13.2079Z" fill="#080808"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.579 8.714L14.589 9.286C13.633 9.838 13.305 11.061 13.857 12.018L24.107 29.771L27.941 31.269L28.561 27.199L18.311 9.446C17.759 8.49 16.536 8.162 15.579 8.714V8.714Z" stroke="#080808" stroke-width="2" stroke-linejoin="round"/>
+</svg>