diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts
index e9ebdc9c6..df1ece9a6 100644
--- a/src/app/modals/chat-options-features/chat-options-features.page.ts
+++ b/src/app/modals/chat-options-features/chat-options-features.page.ts
@@ -33,6 +33,7 @@ export class ChatOptionsFeaturesPage implements OnInit {
     private fileLoaderService: FileLoaderService,
     private fileToBase64Service: FileToBase64Service,
     private chatService: ChatService,
+    public ThemeService: ThemeService
   ) {
 
     this.members = this.navParams.get('members');
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 daa5336ad..54fa10719 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.html
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.html
@@ -24,7 +24,9 @@
 
       <div>
         <div class="d-flex align-center">
-          <ion-icon class="profile-pic" src="assets/images/icons-default-profile.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="profile-pic" src="assets/images/icons-default-profile.svg"></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="profile-pic" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
+          
         </div>
       </div>
 
@@ -61,20 +63,12 @@
 
         <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')" style="background-color: red;">
-              
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
+            <div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('default')" >
+              <img style="width: 40px;" src="assets/images/logo-removebg-preview.png"/>
             </div>
 
-            <div class="btn-close d-flex cursor-pointer" (click)="changeTheme('default')">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
-            </div>
-
-            <div class="btn-close d-flex cursor-pointer" (click)="close()">
-              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
-              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
+            <div class="btn-close d-flex cursor-pointer" (click)="changeTheme('gov')">
+              <img style="width: 40px;" src="assets/images/theme/gov/governoangola_A.png">
             </div>
 
           </div>
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 17f103e35..54b3467ea 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -107,7 +107,7 @@
             <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>
+              <!-- <ion-label>{{profileLabel(loggeduser.Profile)}}</ion-label> -->
               <div *ngIf="this.notificationLength > 0 && !production" class="icon-badge"
                 style="right: -18px;top: -9px;">
                 {{notificationLength}}</div>
diff --git a/src/assets/images/logo-removebg-preview.png b/src/assets/images/logo-removebg-preview.png
new file mode 100644
index 000000000..8b1d8a567
Binary files /dev/null and b/src/assets/images/logo-removebg-preview.png differ
diff --git a/src/assets/images/theme/gov/icons-profile.svg b/src/assets/images/theme/gov/icons-profile.svg
index 56b5e2a66..d6071763a 100644
--- a/src/assets/images/theme/gov/icons-profile.svg
+++ b/src/assets/images/theme/gov/icons-profile.svg
@@ -1,9 +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="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="#BDBDBD"/>
+<mask id="mask0_117:256" 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)">
+<g mask="url(#mask0_117:256)">
 <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>