diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html
index e5424b12e..1e1c3d8a3 100644
--- a/src/app/modals/document-detail/document-detail.page.html
+++ b/src/app/modals/document-detail/document-detail.page.html
@@ -9,7 +9,8 @@
             <ion-label class="title">{{LoadedDocument.Assunto}}</ion-label>
           </div>
           <div class="div-icon" (click)="openOptions()">
-            <ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-25 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
             <!-- <ion-icon class="font-25 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon> -->
           </div>
         </div>
diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts
index 0efb39141..feea81af0 100644
--- a/src/app/modals/document-detail/document-detail.page.ts
+++ b/src/app/modals/document-detail/document-detail.page.ts
@@ -11,6 +11,8 @@ import { PermissionService } from 'src/app/services/worker/permission.service';
 import { SearchedDocumentOptionsPage } from 'src/app/shared/popover/searched-document-options/searched-document-options.page';
 import { Location } from '@angular/common';
 import { ViewDocumentPage } from '../view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-document-detail',
@@ -45,6 +47,7 @@ export class DocumentDetailPage implements OnInit {
     public p: PermissionService,
     private popoverController: PopoverController,
     private location: Location,
+    public ThemeService: ThemeService
   ) {
     this.docId = this.navParams.get('docId');
     this.applicationId = this.navParams.get('applicationId');
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html
index 41cc8ee3f..9a6073e0d 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.html
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.html
@@ -60,7 +60,7 @@
 
         <div class="profile-title d-flex justify-space-between align-center width-100">
           <div class="d-flex align-center">
-            <div class="btn-close d-flex cursor-pointer" (click)="changeTheme('gov')">
+            <div class="btn-close d-flex cursor-pointer" (click)="changeTheme('gov')" style="background-color: red;">
               
               <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
             </div>
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 65b1a2ff9..ef098db37 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -98,7 +98,8 @@
                 </div>
 
                 <div (click)="docIndex(i);LoadDocumentDetails()" class="cursor-pointer" style="width: 35px; height: 41px;" autoHide="false">
-                  <ion-icon src="assets/images/icons-menu.svg"  ></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"  ></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"  ></ion-icon>
                 </div>
 
               </ion-label>
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 4d6196486..90991514d 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -23,7 +23,8 @@
         </div>
         <div hidden class="right">
           <button class="btn-no-color" (click)="openMessagesOptions()">
-            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </button>
         </div>
       </div>
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 265d76f02..52be9074d 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
@@ -13,7 +13,8 @@
             <div class="title">{{ task.Folio}}</div>
           </div>
           <div class="div-icon" (click)="openOptions()">
-            <ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-25 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </div>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 554908a6f..e80b51e2b 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -22,6 +22,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
 import { Platform } from '@ionic/angular';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-despacho-pr',
@@ -59,6 +60,7 @@ export class DespachoPrPage implements OnInit {
     private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
     private platform: Platform,
+    public ThemeService: ThemeService
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       if (params["params"].SerialNumber) {
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
index d77699ead..55252ed45 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -45,7 +45,8 @@
                   <ion-label>{{ task.Folio }}</ion-label>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 2b621b25f..80fa3d4be 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -20,6 +20,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-despachos-pr',
@@ -63,6 +64,7 @@ export class DespachosPrPage implements OnInit {
     private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
     private sortService: SortService,
+    public ThemeService: ThemeService
   ) {
 
     this.loggeduser = authService.ValidatedUser;
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 a938e4ed4..d1468db8e 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -14,7 +14,8 @@
             <ion-label class="title">{{ task.Folio}}</ion-label>
           </div>
           <div class="div-icon" (click)="openOptions()">
-            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </div>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 8a3f01708..15312a34a 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -22,6 +22,8 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { Platform } from '@ionic/angular';
 import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-despacho',
@@ -59,7 +61,8 @@ export class DespachoPage implements OnInit {
     public p: PermissionService,
     private sqliteservice: SqliteService,
     private platform: Platform,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService
 
 
   ) {
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 8718914d9..f8df32bb7 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -43,7 +43,8 @@
                   <ion-label>{{ task.Folio }}</ion-label>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index d55459f72..966c2deb1 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -7,6 +7,8 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { Platform } from '@ionic/angular';
 import { isThisHour } from 'date-fns';
 import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-despachos',
@@ -24,7 +26,8 @@ export class DespachosPage implements OnInit {
     private despachoRule: DespachoService,
     private sqliteservice: SqliteService,
     private platform: Platform,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService
   ) {
 
   }
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index fc68d323e..b2d4bfe92 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -48,7 +48,8 @@
                   <ion-label>{{ task.Folio }}</ion-label>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 51172c2f5..e9cfdf5ca 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -8,6 +8,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -33,7 +34,7 @@ export class DiplomasAssinarPage implements OnInit {
    private alertService: AlertService,
    private router: Router,
    private sortService: SortService,
-   ) {
+  public ThemeService: ThemeService) {
    }
 
   ngOnInit() {
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 4e016a8a6..99743d549 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -17,7 +17,8 @@
               <!-- <ion-menu-button autoHide="false">
                 <ion-icon name="ellipsis-vertical-outline"></ion-icon>
               </ion-menu-button> -->
-              <ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-25 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </div>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index 757cc5000..54c9862f8 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -15,6 +15,8 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
 import { Platform } from '@ionic/angular';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-diploma',
@@ -49,6 +51,7 @@ export class DiplomaPage implements OnInit {
     private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
     private platform: Platform,
+    public ThemeService: ThemeService
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       // console.log(params["params"]);
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index 5a7c32be9..b5b84d976 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -48,7 +48,8 @@
                     <ion-label>{{ task.Folio }}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                     <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                   </div>
                 </div>
@@ -84,7 +85,8 @@
                 <ion-label>{{ task.Folio }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index ef5613387..49a5df6e8 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -6,6 +6,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-diplomas',
@@ -31,6 +33,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
     private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
     private sortService: SortService,
+    public ThemeService: ThemeService
   ) {
     //Inicializar segment
 
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 894359f57..c55572e49 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
@@ -17,7 +17,8 @@
         </div>
         <div class="menu-ptions">
           <button class="btn-no-color" (click)="openOptions(loadedEvent)">
-            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </button>
         </div>
       </div>
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 73900b976..eb15015f1 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
@@ -61,7 +61,7 @@ export class ApproveEventPage implements OnInit {
     private sqliteservice: SqliteService,
     private platform: Platform,
     private backgroundservice: BackgroundService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       // console.log(params["params"]);
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 0b6798f7f..880c45f6c 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
@@ -19,7 +19,8 @@
           </div>
           <div class="menu-ptions">
             <button class="btn-no-color" (click)="openOptions()">
-              <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
             </button>
           </div>
         </div>
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index bd547bae4..b7fdd30e7 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -24,6 +24,7 @@ import { TaskService } from 'src/app/Rules/task.service';
 import { DocumentViewerPage } from 'src/app/modals/document-viewer/document-viewer.page';
 import { PermissionService } from 'src/app/services/worker/permission.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 
 import { SqliteService } from 'src/app/services/sqlite.service';
@@ -75,7 +76,8 @@ export class ExpedienteDetailPage implements OnInit {
     private expedienteService: ExpedienteService,
     public platform: Platform,
     private sqliteservice: SqliteService,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       if (params["params"].SerialNumber) {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index 533463cba..53d9879d8 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -43,7 +43,8 @@
               <ion-label>{{ task.Subject }}</ion-label>
             </div>
             <div class="exp-icon">
-              <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
               <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
             </div>
           </div>
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index a2fdf031d..21c9503fb 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -7,6 +7,8 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { Platform } from '@ionic/angular';
 import { BackgroundService } from '../../../services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-expediente',
@@ -34,7 +36,8 @@ export class ExpedientePage implements OnInit {
     private toastService: ToastService,
     public platform: Platform,
     private sqliteservice: SqliteService,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService
   ) { }
 
   ngOnInit() {
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 dee55234c..3c42341aa 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
@@ -19,7 +19,8 @@
           </div>
           <div class="menu-ptions">
             <button class="btn-no-color" (click)="openOptions()">
-              <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
             </button>
           </div>
         </div>
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index 00159506b..bdf1e1646 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -20,6 +20,7 @@ import { SearchList } from 'src/app/models/search-document';
 import { Location } from '@angular/common';
 import { AttachmentList } from 'src/app/models/Excludetask';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-expediente-pr',
@@ -57,7 +58,8 @@ export class ExpedientePrPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     private attachmentsService: AttachmentsService,
-    private location: Location
+    private location: Location,
+    public ThemeService: ThemeService
 
     ) {
       this.loggeduser = userAuth.ValidatedUser;
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 0d02b0a37..07c372c1a 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -39,7 +39,8 @@
                 <ion-label>{{ task.Subject }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 2ee19036a..f4da1f622 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -11,6 +11,8 @@ import { AuthService } from 'src/app/services/auth.service';
 import { Location } from '@angular/common'
 import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-expedientes-pr',
@@ -38,7 +40,8 @@ export class ExpedientesPrPage implements OnInit {
     private alertService: AlertService,
     private authService: AuthService,
     private router: Router,
-    private location: Location
+    private location: Location,
+    public ThemeService: ThemeService
     ) {
       this.loggeduser = authService.ValidatedUser;
     }
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 6bd12de63..f3413d165 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -48,7 +48,8 @@
                         <ion-label>{{ task.Folio }}</ion-label>
                       </div>
                       <div *ngIf="task.DocumentsQty != 0" class="item-icon">
-                        <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                         <label>{{task.DocumentsQty}}</label>
                       </div>
                     </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 31df012f0..d74544854 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -23,6 +23,7 @@ import { NotificationsService } from 'src/app/services/notifications.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ChangeProfileService } from 'src/app/services/change-profile.service';
 import { PermissionService } from 'src/app/services/worker/permission.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 
 import { SqliteService } from '../../services/sqlite.service';
@@ -128,7 +129,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     private sqliteservice: SqliteService,
     private platform: Platform,
     private changeProfileService: ChangeProfileService,
-    private backgroundservice: BackgroundService
+    private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService
   ) {
 
     this.loggeduser = authService.ValidatedUser;
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 dfc0d5016..46ffb24a0 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -16,7 +16,8 @@
           </div>
           <div class="div-icon">
             <div autoHide="false" class="d-flex" (click)="openOptions()">
-              <ion-icon class="font-30 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-30 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-30 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
             </div>
           </div>
         </div>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index a41a13c1a..a3bd8e8f7 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -25,6 +25,8 @@ import { BackgroundService } from 'src/app/services/background.service';
 
 import { PermissionService } from 'src/app/services/worker/permission.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-pedido',
@@ -63,7 +65,8 @@ export class PedidoPage implements OnInit {
     private pedidoService: PedidoService,
     private sqliteservice: SqliteService,
     private backgroundservices: BackgroundService,
-    private platform: Platform
+    private platform: Platform,
+    public ThemeService: ThemeService
   ) {
     this.loggeduser = authService.ValidatedUser;
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 81ac61849..002b4a1ac 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -55,7 +55,8 @@
                   <ion-label>{{ task.Folio }}</ion-label>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
@@ -92,7 +93,8 @@
                   <ion-label>{{ task.Folio }}</ion-label>
                 </div>
                 <div class="exp-icon">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                   <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
                 </div>
               </div>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 1195faae0..aa7f23bfb 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -11,6 +11,8 @@ import { ModalService } from 'src/app/services/modal.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-pedidos',
@@ -49,7 +51,8 @@ export class PedidosPage implements OnInit {
     private sqliteservice: SqliteService,
     private sortService: SortService,
     private backgroundservice: BackgroundService,
-    private platform: Platform
+    private platform: Platform,
+    public ThemeService: ThemeService
   ) {
     //Inicializar segment
     this.segment = 'parecer';
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 a9e48023c..aed6d02ca 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -94,7 +94,8 @@
             </div>
 
             <div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
-              <ion-icon src="assets/images/icons-menu.svg"  ></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"  ></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"  ></ion-icon>
             </div>
 
           </ion-label>
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 fd3607759..7e4946900 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -7,7 +7,8 @@
         </div>
         <div class="right">
           <button class="btn-no-color" (click)="openGroupMessagesOptions()">
-            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </button>
         </div>
       </div>
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 4f1188bf3..61631542a 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -8,7 +8,8 @@
         </div>
         <div hidden class="right">
           <button class="btn-no-color" (click)="_openMessagesOptions()">
-            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/icons-menu.svg"></ion-icon>
           </button>
         </div>
       </div>
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 1f371399a..59b18648e 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -37,7 +37,8 @@
                     <ion-label>{{ task.Folio }}</ion-label>
                   </div>
                   <div *ngIf="task.DocumentsQty != 0" class="item-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                     <label>{{task.DocumentsQty}}</label>
                   </div>
                 </div>
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 8e5c542e4..5ccb1343c 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -7,6 +7,8 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js';
 import { SqliteService } from '../../../services/sqlite.service';
 import { Platform } from '@ionic/angular';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-all-processes',
@@ -26,6 +28,7 @@ export class AllProcessesPage implements OnInit {
     private sqliteservice: SqliteService,
     private platform: Platform,
     private sortService: SortService,
+    public ThemeService: ThemeService
   ) {
     this.loggeduser = authService.ValidatedUser;
   }
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 1d878c9dd..f620b9cb4 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -41,7 +41,8 @@
                 <ion-label>{{ task.Folio }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 711f6b6d9..2292ba298 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -7,6 +7,8 @@ import { AlertService } from 'src/app/services/alert.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -28,6 +30,7 @@ export class DiplomasAssinarPage implements OnInit {
     private alertService: AlertService,
     private router: Router,
     private sortService: SortService,
+    public ThemeService: ThemeService
     ) { }
 
   ngOnInit() {
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index 753410ff1..648755c77 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -36,7 +36,8 @@
                 <ion-label>{{ task.Folio }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
@@ -72,7 +73,8 @@
                 <ion-label>1123{{ task.Folio }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 0f7cfaf72..53a5fdeb1 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -7,6 +7,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-diplomas',
@@ -33,6 +34,7 @@ constructor(
   private alertService: AlertService,
   private router: Router,
   private activatedRoute: ActivatedRoute,
+      public ThemeService: ThemeService
   ) {
 
   }
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 5e5ee7b7c..3abb6d9de 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -25,7 +25,8 @@
               <ion-label>{{ task.Subject }}</ion-label>
             </div>
             <div class="exp-icon">
-              <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default'"  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov'"  src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
               <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
             </div>
           </div>
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 53263290d..d03699f52 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -9,6 +9,8 @@ import { AuthService } from 'src/app/services/auth.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-expedientes-pr',
@@ -33,6 +35,7 @@ export class ExpedientesPrPage implements OnInit {
     private alertService: AlertService,
     private authService: AuthService,
     private router: Router,
+    public ThemeService: ThemeService
     ) {
       this.loggeduser = authService.ValidatedUser;
     }
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index e2c7c1c9b..815e34d9d 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -33,7 +33,8 @@
                 <ion-label>{{ task.Subject }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 348545c09..5a45c172b 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -4,6 +4,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { AlertService } from 'src/app/services/alert.service';
 import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-expedients',
@@ -26,6 +27,7 @@ export class ExpedientsPage implements OnInit {
     private processes:ProcessesService,
     private alertService: AlertService,
     private router: Router,
+    public ThemeService: ThemeService
     ) {
       this.profile = 'mdgpr';
 
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 1211313ae..0631bdc88 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
@@ -8,7 +8,8 @@
         <ion-label class="title">{{ task.Folio}}</ion-label>
       </div>
       <div class="div-icon" (click)="openOptions.emit()">
-        <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
       </div>
     </div>
   </div>
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts
index c959779e3..594f57c78 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts
@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
+import { ThemeService } from 'src/app/services/theme.service'
 
 @Component({
   selector: 'app-task-details',
@@ -18,7 +19,9 @@ export class TaskDetailsPage implements OnInit {
   @Output() goBack = new EventEmitter<any>();
   @Output() viewDocument = new EventEmitter<any>();
   
-  constructor() { }
+  constructor(
+    public ThemeService: ThemeService
+  ) { }
 
   ngOnInit() {
   }
diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
index 1358175c1..bbce2a065 100644
--- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
+++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
@@ -17,7 +17,8 @@
                 <ion-label>{{ task.Folio }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts
index 8395a7ff8..32d53b3c0 100644
--- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts
+++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { customTask } from 'src/app/models/dailyworktask.model';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-task-list',
@@ -12,7 +14,9 @@ export class TaskListPage implements OnInit {
   @Input() skeletonLoader: boolean = false
   @Output() viewTaskDetail = new EventEmitter<customTask>();
   
-  constructor() {
+  constructor(
+    public ThemeService: ThemeService
+  ) {
     console.log('taskList', this.taskList)
   }
 
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 48f9bed88..898c7c71c 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -47,7 +47,8 @@
                 <ion-label>{{ task.Folio }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
@@ -84,7 +85,8 @@
                 <ion-label>{{ task.Folio }} {{ task.Status }}</ion-label>
               </div>
               <div class="exp-icon">
-                <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
                 <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
               </div>
             </div>
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 654c7d20f..a3b37ab9b 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -10,6 +10,9 @@ import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido
 import { PedidosStore } from 'src/app/store/pedidos-store.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
+
 @Component({
   selector: 'app-pedidos',
   templateUrl: './pedidos.page.html',
@@ -45,6 +48,7 @@ export class PedidosPage implements OnInit {
     private modalController: ModalController,
     private alertService: AlertService,
     private sortService: SortService,
+    public ThemeService: ThemeService
     ) {
       this.profile = 'mdgpr';
     }
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index f056a7689..b3ebb7e55 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -5,7 +5,8 @@
     <div class="mobile d-flex  div-top-header justify-space-between">
       <div *ngIf="!hideSearchBtn" class="div-search">
         <div (click)="openSearch()">
-          <ion-icon class="font-45" src='assets/images/icons-search.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-45" src='assets/images/icons-search.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-45" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
         </div>
       </div>
       <div class="div-logo height-fit-content">
@@ -14,7 +15,8 @@
       </div>
       <div class="div-profile cursor-pointer" (click)="openProfile()">
         <div *ngIf="this.notificationLength > 0" class="icon-badge">{{this.notificationLength}}</div>
-        <ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src='assets/images/icons-profile.svg'></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
         <ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
       </div>
     </div>
@@ -99,7 +101,8 @@
 
           <div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
 
-            <ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src='assets/images/icons-profile.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
 
             <div class="profile-text">
               <ion-label>{{profileLabel(loggeduser.Profile)}}</ion-label>
diff --git a/src/assets/images/theme/gov/icons-expediente-attachment.svg b/src/assets/images/theme/gov/icons-expediente-attachment.svg
new file mode 100644
index 000000000..c392a5e9a
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-expediente-attachment.svg
@@ -0,0 +1,3 @@
+<svg width="29" height="25" viewBox="0 0 29 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.667 9.535V15.553C20.667 17.615 19.182 20 15.111 20C11.041 20 9.55603 17.615 9.55603 15.553V6.684C9.55603 4.228 10.746 3 13.127 3C15.508 3 16.699 4.228 16.699 6.684V13.387C16.752 14.462 16.223 15 15.111 15C14.001 15 13.471 14.462 13.524 13.387V9.535" stroke="#C63527" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/theme/gov/icons-profile.svg b/src/assets/images/theme/gov/icons-profile.svg
new file mode 100644
index 000000000..56b5e2a66
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-profile.svg
@@ -0,0 +1,9 @@
+<svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M45 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 45C34.9264 45 45 34.9264 45 22.5Z" fill="#C63527"/>
+<mask id="mask0_84:2" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="45" height="45">
+<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="white"/>
+</mask>
+<g mask="url(#mask0_84:2)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.5 10.5C28.299 10.5 33 15.537 33 21.75C33 25.652 31.146 29.09 28.33 31.108C34.565 33.57 39 39.868 39 47.25C39 56.777 31.613 64.5 22.5 64.5C13.387 64.5 6 56.777 6 47.25C6 39.869 10.435 33.57 16.67 31.108C13.854 29.09 12 25.652 12 21.75C12 15.537 16.701 10.5 22.5 10.5Z" fill="white"/>
+</g>
+</svg>