diff --git a/client/src/app/admin/admin.component.ts b/client/src/app/admin/admin.component.ts
index f166c0084318802a83fd65189236c0ab5bf2be90..c66057c76e647be6b2d1d45557aa01eb6aa2fef7 100644
--- a/client/src/app/admin/admin.component.ts
+++ b/client/src/app/admin/admin.component.ts
@@ -31,6 +31,7 @@ import { AppConfigService } from 'src/app/app-config.service';
  * @implements OnInit
  */
 export class AdminComponent implements OnInit {
+    public favIcon: HTMLLinkElement = document.querySelector('#favicon');
     public links = [
         { label: 'Instances', icon: 'fas fa-object-group', routerLink: 'instance-list' },
         { label: 'Surveys', icon: 'fas fa-table', routerLink: 'survey-list'},
@@ -48,6 +49,7 @@ export class AdminComponent implements OnInit {
     }
 
     ngOnInit() {
+        this.favIcon.href = 'favicon.ico';
         Promise.resolve(null).then(() => this.store.dispatch(surveyActions.loadSurveyList()));
         Promise.resolve(null).then(() => this.store.dispatch(databaseActions.loadDatabaseList()));
         Promise.resolve(null).then(() => this.store.dispatch(selectActions.loadSelectList()));
diff --git a/client/src/app/instance/instance.component.ts b/client/src/app/instance/instance.component.ts
index 73849e9a730412f7b6d9c88d93550d4631c1aaec..b433bd32845d2904c6a6efe0e5c67c60ad4090bb 100644
--- a/client/src/app/instance/instance.component.ts
+++ b/client/src/app/instance/instance.component.ts
@@ -30,6 +30,7 @@ import { AppConfigService } from 'src/app/app-config.service';
  * @classdesc Instance container
  */
 export class InstanceComponent implements OnInit, OnDestroy {
+    public favIcon: HTMLLinkElement = document.querySelector('#favicon');
     public links = [
         { label: 'Home', icon: 'fas fa-home', routerLink: 'home' }
     ];
@@ -61,6 +62,7 @@ export class InstanceComponent implements OnInit, OnDestroy {
             if (instance.config.documentation.documentation_allowed) {
                 this.links.push({ label: 'Documentation', icon: 'fas fa-question', routerLink: 'documentation' });
             }
+            this.favIcon.href = `assets/${instance.name}-favicon.ico`;
         })
     }
 
diff --git a/client/src/app/portal/containers/portal-home.component.ts b/client/src/app/portal/containers/portal-home.component.ts
index 751d0d39cd78da337544ffae9b928ecde27b0d37..e64f8f617dc3ddf6a1b8acac4b709fb28c527a08 100644
--- a/client/src/app/portal/containers/portal-home.component.ts
+++ b/client/src/app/portal/containers/portal-home.component.ts
@@ -29,6 +29,7 @@ import { AppConfigService } from 'src/app/app-config.service';
  * @implements OnInit
  */
 export class PortalHomeComponent implements OnInit, OnDestroy {
+    public favIcon: HTMLLinkElement = document.querySelector('#favicon');
     public links = [
         { label: 'Home', icon: 'fas fa-home', routerLink: '/portal' }
     ];
@@ -47,6 +48,7 @@ export class PortalHomeComponent implements OnInit, OnDestroy {
     }
 
     ngOnInit() {
+        this.favIcon.href = 'favicon.ico';
         const adminLink = { label: 'Admin', icon: 'fas fa-tools', routerLink: '/admin' };
         if (!this.config.authenticationEnabled) {
             this.links.push(adminLink);
diff --git a/client/src/app/shared/components/navbar.component.html b/client/src/app/shared/components/navbar.component.html
index 5b8d95a4c713940664d2d2f53541876f4d45ad77..14be398008e56c8ba1ee9dcd4dc86ad31579cd08 100644
--- a/client/src/app/shared/components/navbar.component.html
+++ b/client/src/app/shared/components/navbar.component.html
@@ -5,7 +5,7 @@
     </a>
 
     <a *ngIf="instance" routerLink="/instance/{{ instance.name }}" class="navbar-brand">
-        <img  src="assets/{{ instance.name }}.png" alt="Instance logo" />
+        <img  src="assets/{{ instance.name }}-logo.png" alt="Instance logo" />
     </a>
 
     <!-- Right Navigation -->
diff --git a/client/src/assets/default-favicon.ico b/client/src/assets/default-favicon.ico
new file mode 100755
index 0000000000000000000000000000000000000000..fe0301e8a2cfb923d40a6d1af50ec1280db6948c
Binary files /dev/null and b/client/src/assets/default-favicon.ico differ
diff --git a/client/src/assets/default.png b/client/src/assets/default-logo.png
similarity index 100%
rename from client/src/assets/default.png
rename to client/src/assets/default-logo.png
diff --git a/client/src/assets/sdb-favicon.ico b/client/src/assets/sdb-favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..3c5447241705f2c51891bbe67789c6d11382d760
Binary files /dev/null and b/client/src/assets/sdb-favicon.ico differ
diff --git a/client/src/assets/sdb.png b/client/src/assets/sdb-logo.png
similarity index 100%
rename from client/src/assets/sdb.png
rename to client/src/assets/sdb-logo.png
diff --git a/client/src/index.html b/client/src/index.html
index a0167da6dcb624806b494ce0469b89e84a7ab238..82bcb25eaef1535bfdf72649fd25b94976825b6e 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -5,7 +5,7 @@
   <title>Anis - Client</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" id="favicon" type="image/x-icon" href="favicon.ico">
 </head>
 <body class="h-100">
   <app-root class="d-flex flex-column h-100"></app-root>