diff --git a/src/angular/app.d.ts b/src/angular/app.d.ts
new file mode 100644
index 0000000000..7bf7506fcf
--- /dev/null
+++ b/src/angular/app.d.ts
@@ -0,0 +1 @@
+declare module '*.html';
diff --git a/src/angular/components/icon.component.html b/src/angular/components/icon.component.html
new file mode 100644
index 0000000000..fd42b99dde
--- /dev/null
+++ b/src/angular/components/icon.component.html
@@ -0,0 +1,4 @@
+<div class="icon">
+    <img [src]="image" appFallbackSrc="{{fallbackImage}}" *ngIf="imageEnabled && image" alt="" />
+    <i class="fa fa-fw fa-lg {{icon}}" *ngIf="!imageEnabled || !image"></i>
+</div>
diff --git a/src/angular/components/icon.component.ts b/src/angular/components/icon.component.ts
new file mode 100644
index 0000000000..7304bed83f
--- /dev/null
+++ b/src/angular/components/icon.component.ts
@@ -0,0 +1,91 @@
+import * as template from './icon.component.html';
+
+import {
+    Component,
+    Input,
+    OnChanges,
+} from '@angular/core';
+
+import { CipherType } from '../../enums/cipherType';
+
+import { EnvironmentService } from '../../abstractions/environment.service';
+import { StateService } from '../../abstractions/state.service';
+
+import { ConstantsService } from '../../services/constants.service';
+
+@Component({
+    selector: 'app-vault-icon',
+    template: template,
+})
+export class IconComponent implements OnChanges {
+    @Input() cipher: any;
+    icon: string;
+    image: string;
+    fallbackImage: string;
+    imageEnabled: boolean;
+
+    private iconsUrl: string;
+
+    constructor(private environmentService: EnvironmentService, private stateService: StateService) {
+        this.iconsUrl = environmentService.iconsUrl;
+        if (!this.iconsUrl) {
+            if (environmentService.baseUrl) {
+                this.iconsUrl = environmentService.baseUrl + '/icons';
+            } else {
+                this.iconsUrl = 'https://icons.bitwarden.com';
+            }
+        }
+    }
+
+    async ngOnChanges() {
+        this.imageEnabled = !(await this.stateService.get<boolean>(ConstantsService.disableFaviconKey));
+
+        switch (this.cipher.type) {
+            case CipherType.Login:
+                this.icon = 'fa-globe';
+                this.setLoginIcon();
+                break;
+            case CipherType.SecureNote:
+                this.icon = 'fa-sticky-note-o';
+                break;
+            case CipherType.Card:
+                this.icon = 'fa-credit-card';
+                break;
+            case CipherType.Identity:
+                this.icon = 'fa-id-card-o';
+                break;
+            default:
+                break;
+        }
+    }
+
+    private setLoginIcon() {
+        if (this.cipher.login.uri) {
+            let hostnameUri = this.cipher.login.uri;
+            let isWebsite = false;
+
+            if (hostnameUri.indexOf('androidapp://') === 0) {
+                this.icon = 'fa-android';
+                this.image = null;
+            } else if (hostnameUri.indexOf('iosapp://') === 0) {
+                this.icon = 'fa-apple';
+                this.image = null;
+            } else if (this.imageEnabled && hostnameUri.indexOf('://') === -1 && hostnameUri.indexOf('.') > -1) {
+                hostnameUri = 'http://' + hostnameUri;
+                isWebsite = true;
+            } else if (this.imageEnabled) {
+                isWebsite = hostnameUri.indexOf('http') === 0 && hostnameUri.indexOf('.') > -1;
+            }
+
+            if (this.imageEnabled && isWebsite) {
+                try {
+                    const url = new URL(hostnameUri);
+                    this.image = this.iconsUrl + '/' + url.hostname + '/icon.png';
+                    this.fallbackImage = 'images/fa-globe.png';
+                } catch (e) { }
+            }
+        } else {
+            this.image = null;
+        }
+    }
+}
diff --git a/src/angular/components/two-factor.component.ts b/src/angular/components/two-factor.component.ts
index 610aeb1841..7ab1608e70 100644
--- a/src/angular/components/two-factor.component.ts
+++ b/src/angular/components/two-factor.component.ts
@@ -59,8 +59,7 @@ export class TwoFactorComponent implements OnInit, OnDestroy {
             let customWebVaultUrl: string = null;
             if (this.environmentService.baseUrl) {
                 customWebVaultUrl = this.environmentService.baseUrl;
-            }
-            else if (this.environmentService.webVaultUrl) {
+            } else if (this.environmentService.webVaultUrl) {
                 customWebVaultUrl = this.environmentService.webVaultUrl;
             }