diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 35ae9787e..f2b97e047 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -18,10 +18,12 @@
             </div>
             <div class="div-icon">
               <button class="btn-no-color" (click)="openContactsPage()">
-                <ion-icon slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
               </button>
               <button class="btn-no-color" (click)="openNewGroupPage()">
-                <ion-icon slot="end" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
+                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-group.svg" ></ion-icon>
               </button>
               <button *ngIf="hideRefreshBtn" class="btn-no-color" (click)="refreshing()">
                 <ion-icon class="title-icon" name="reload-circle"></ion-icon>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 991abb5a2..c7cb6b850 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -28,6 +28,8 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { environment } from 'src/environments/environment';
 import { NotificationsService } from 'src/app/services/notifications.service';
 import { TimeService } from 'src/app/services/functions/time.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
 
 @Component({
   selector: 'app-chat',
@@ -119,6 +121,7 @@ export class ChatPage implements OnInit {
     private resolver: ComponentFactoryResolver,
     private route: Router,
     private timeService: TimeService,
+    public ThemeService: ThemeService
     ){
       this.loggedUserChat = authService.ValidatedUserChat['data'];
       this.headers = new HttpHeaders();
diff --git a/src/assets/images/theme/gov/icons-chat-new-conversation.svg b/src/assets/images/theme/gov/icons-chat-new-conversation.svg
new file mode 100644
index 000000000..08c91d1b9
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-chat-new-conversation.svg
@@ -0,0 +1,6 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z" fill="#FFB81C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 9C16.896 9 18.84 10.943 18.84 13.34V13.423C18.84 14.79 18.207 16.009 17.218 16.805C20.016 17.903 22 20.649 22 23.863C22 28.046 7 28.046 7 23.863C7 20.649 8.984 17.903 11.783 16.803C10.793 16.009 10.161 14.79 10.161 13.423V13.339C10.16 10.943 12.104 9 14.5 9Z" stroke="#080808" stroke-width="2" stroke-linejoin="round"/>
+<path d="M27 7C27 6.44772 26.5523 6 26 6C25.4477 6 25 6.44772 25 7V13C25 13.5523 25.4477 14 26 14C26.5523 14 27 13.5523 27 13V7Z" fill="#080808"/>
+<path d="M29 9H23C22.4477 9 22 9.44772 22 10C22 10.5523 22.4477 11 23 11H29C29.5523 11 30 10.5523 30 10C30 9.44772 29.5523 9 29 9Z" fill="#080808"/>
+</svg>
diff --git a/src/assets/images/theme/gov/icons-chat-new-group.svg b/src/assets/images/theme/gov/icons-chat-new-group.svg
new file mode 100644
index 000000000..c67dacd31
--- /dev/null
+++ b/src/assets/images/theme/gov/icons-chat-new-group.svg
@@ -0,0 +1,7 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 35C27.165 35 35 27.165 35 17.5C35 7.83502 27.165 0 17.5 0C7.83502 0 0 7.83502 0 17.5C0 27.165 7.83502 35 17.5 35Z" fill="#FFB81C"/>
+<path d="M27 7C27 6.44772 26.5523 6 26 6C25.4477 6 25 6.44772 25 7V13C25 13.5523 25.4477 14 26 14C26.5523 14 27 13.5523 27 13V7Z" fill="#080808"/>
+<path d="M29 9H23C22.4477 9 22 9.44772 22 10C22 10.5523 22.4477 11 23 11H29C29.5523 11 30 10.5523 30 10C30 9.44772 29.5523 9 29 9Z" fill="#080808"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5 12C15.104 12 13.16 13.943 13.16 16.34V16.423C13.16 17.79 13.793 19.009 14.782 19.805C11.984 20.903 10 23.649 10 26.863C10 31.046 25 31.046 25 26.863C25 23.649 23.016 20.903 20.217 19.803C21.207 19.009 21.839 17.79 21.839 16.423V16.339C21.84 13.943 19.896 12 17.5 12Z" stroke="#080808" stroke-width="2" stroke-linejoin="round"/>
+<path d="M7.406 24C5.527 23.514 4.182 22.658 4.182 21.432C4.182 18.386 6.452 15.884 9.1 14.768M15.182 8.983C14.427 7.792 13.087 7 11.56 7C9.202 7 7.291 8.886 7.291 11.213V11.294C7.291 12.64 7.931 13.839 8.927 14.61L15.182 8.983Z" stroke="#080808" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>