diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index bb555611b..40e240658 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -34,10 +34,19 @@
           </div>
           <button class="btn-no-color" [routerLink]="['/home/agenda']">
             <ion-icon
+            *ngIf="ThemeService.currentTheme == 'default' "
             class="icon-next"
             slot="end"
             src="assets/images/icons-arrow-circle-arrow-right.svg"
             ></ion-icon>
+
+            <ion-icon
+            *ngIf="ThemeService.currentTheme == 'gov' "
+            class="icon-next"
+            slot="end"
+            src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
+            ></ion-icon>
+
           </button>
         </div>
         <div class="content overflow-y-auto flex-grow-1 height-100">
@@ -85,7 +94,19 @@
             <div class="text">Correspondência por ler</div>
           </div>
           <button (click)="viewExpedientListPage()" class="btn-no-color cursor-pointer">
-            <ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg"></ion-icon>
+            <ion-icon
+            *ngIf="ThemeService.currentTheme == 'default' "
+            class="icon-next"
+            slot="end"
+            src="assets/images/icons-arrow-circle-arrow-right.svg"
+            ></ion-icon>
+
+            <ion-icon
+            *ngIf="ThemeService.currentTheme == 'gov' "
+            class="icon-next"
+            slot="end"
+            src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
+            ></ion-icon>
           </button>
         </div>
         <div class="content overflow-y-auto flex-grow-1 height-100">
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 80f075a36..81d64aa56 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -20,7 +20,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { NetworkConnectionService } from 'src/app/services/network-connection.service'
 import { BackgroundService } from 'src/app/services/background.service';
 import { momentG } from 'src/plugin/momentG';
-
+import { ThemeService } from 'src/app/services/theme.service'
 @Component({
   selector: 'app-events',
   templateUrl: './events.page.html',
@@ -95,6 +95,7 @@ export class EventsPage implements OnInit {
     private sqliteservice: SqliteService,
     private networkconnection: NetworkConnectionService,
     private backgroundservice: BackgroundService,
+    public ThemeService: ThemeService
   ) {
     this.existingScreenOrientation = this.screenOrientation.type;
     console.log(this.existingScreenOrientation);
diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts
index 74f0e7012..a9726e021 100644
--- a/src/app/services/theme.service.ts
+++ b/src/app/services/theme.service.ts
@@ -10,6 +10,8 @@ export class ThemeService {
     'default'
   ]
 
+  currentTheme = 'gov'
+
   constructor() { }
 
   setTheme() {}
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index a63e6df67..b45c00feb 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -28,32 +28,40 @@
 
           <div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/events')"
             [class.active]="locationPathname() == '/home/events'">
-            <ion-icon class="font-40" src='assets/images/icons-nav-home-active-black.svg'></ion-icon>
-            
+
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-home-active-black.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-home-active-black.svg'></ion-icon>
+
             <span>Início</span>
           </div>
 
           <div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')"
             [class.active]="locationPathname() == '/home/agenda'">
-            <ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-agenda-inactive.svg'></ion-icon>
             <span>Agenda</span>
           </div>
 
           <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')"
             [class.active]="locationPathname() == '/home/gabinete-digital'">
-            <ion-icon class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
+
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-home-dk.svg'></ion-icon>
+
             <span>Gabinete</span>
           </div>
 
           <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')"
             [class.active]="locationPathname() == '/home/publications'">
-            <ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-a-es-inactive.svg'></ion-icon>
             <span>Acções</span>
           </div>
 
           <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')"
             [class.active]="locationPathname() == '/home/chat'">
-            <ion-icon class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
             <span>Chat</span>
           </div>
 
@@ -62,7 +70,8 @@
         <div class="header-btns d-flex">
           <div *ngIf="!hideSearchBtn" class="mr-10 d-flex align-center cursor-pointer">
             <div style="padding-top: 5px;" (click)="openSearch();showSearch=true" *ngIf="!showSearch">
-              <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>
             <button class="btn-no-color" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch">
               <ion-icon class="font-40" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 31ccac939..3a18327ce 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -9,6 +9,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { NotificationsService } from '../../services/notifications.service';
 import { environment } from 'src/environments/environment';
 import { EventTrigger } from '../../services/eventTrigger.service';
+import { ThemeService } from '../../services/theme.service';
 
 @Component({
   selector: 'app-header',
@@ -35,13 +36,15 @@ export class HeaderPage implements OnInit {
     private storageservice: StorageService,
     private platform: Platform,
     private notificationsService: NotificationsService,
-    private eventrigger: EventTrigger
+    private eventrigger: EventTrigger,
+    public ThemeService: ThemeService
   ) {
     this.loggeduser = SessionStore.user;
     router.events.subscribe((val) => {
       this.showSearch = false;
       //this.modalController.dismiss();
     });
+
   }
 
   ngOnInit() {
diff --git a/src/assets/images/theme/icons-arrow-circle-arrow-right 2.svg b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg
similarity index 100%
rename from src/assets/images/theme/icons-arrow-circle-arrow-right 2.svg
rename to src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg
diff --git a/src/assets/images/theme/icons-nav-a-es-inactive 3.svg b/src/assets/images/theme/gov/icons-nav-a-es-inactive.svg
similarity index 100%
rename from src/assets/images/theme/icons-nav-a-es-inactive 3.svg
rename to src/assets/images/theme/gov/icons-nav-a-es-inactive.svg
diff --git a/src/assets/images/theme/icons-nav-agenda-inactive 1.svg b/src/assets/images/theme/gov/icons-nav-agenda-inactive.svg
similarity index 100%
rename from src/assets/images/theme/icons-nav-agenda-inactive 1.svg
rename to src/assets/images/theme/gov/icons-nav-agenda-inactive.svg
diff --git a/src/assets/images/theme/icons-nav-grupos-inactive-dk-white 2.svg b/src/assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg
similarity index 100%
rename from src/assets/images/theme/icons-nav-grupos-inactive-dk-white 2.svg
rename to src/assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg
diff --git a/src/assets/images/theme/icons-nav-home-active-black 1.svg b/src/assets/images/theme/gov/icons-nav-home-active-black.svg
similarity index 100%
rename from src/assets/images/theme/icons-nav-home-active-black 1.svg
rename to src/assets/images/theme/gov/icons-nav-home-active-black.svg
diff --git a/src/assets/images/theme/icons-nav-home-dk 3.svg b/src/assets/images/theme/gov/icons-nav-home-dk.svg
similarity index 100%
rename from src/assets/images/theme/icons-nav-home-dk 3.svg
rename to src/assets/images/theme/gov/icons-nav-home-dk.svg
diff --git a/src/assets/images/theme/icons-search 2.svg b/src/assets/images/theme/gov/icons-search.svg
similarity index 100%
rename from src/assets/images/theme/icons-search 2.svg
rename to src/assets/images/theme/gov/icons-search.svg
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 4b807a945..6c0fb35a3 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -587,7 +587,7 @@ $app-theme: mat-light-theme((
     float: right;
     padding: 2.5px 13.5px 2.5px 13.5px;
     color: #fff;
-}
+  }
 }