From cf2e5ebb1224802ba81287cbf5375adef39276f4 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Thu, 3 Feb 2022 10:25:38 -0600
Subject: [PATCH] [Icons] FF - requested icon changes (#2306)

* [Icons] Remove FA

* Icon changes
---
 package-lock.json                        | 14 --------------
 package.json                             |  1 -
 src/popup/tabs.component.html            |  2 +-
 src/popup/vault/add-edit.component.html  |  2 +-
 src/popup/vault/ciphers.component.html   |  6 +-----
 src/popup/vault/groupings.component.html |  5 +----
 6 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7be4b1d6fe..3c811edf02 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,6 @@
         "@bitwarden/jslib-common": "file:jslib/common",
         "core-js": "^3.11.0",
         "date-input-polyfill": "^2.14.0",
-        "font-awesome": "4.7.0",
         "mousetrap": "^1.6.5",
         "ngx-toastr": "14.1.4",
         "nord": "^0.2.1",
@@ -4173,14 +4172,6 @@
         }
       }
     },
-    "node_modules/font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
-      "engines": {
-        "node": ">=0.10.3"
-      }
-    },
     "node_modules/for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -14411,11 +14402,6 @@
       "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
       "dev": true
     },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
diff --git a/package.json b/package.json
index dc8aea8b90..f89fc0f9c7 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,6 @@
     "@bitwarden/jslib-common": "file:jslib/common",
     "core-js": "^3.11.0",
     "date-input-polyfill": "^2.14.0",
-    "font-awesome": "4.7.0",
     "mousetrap": "^1.6.5",
     "ngx-toastr": "14.1.4",
     "nord": "^0.2.1",
diff --git a/src/popup/tabs.component.html b/src/popup/tabs.component.html
index c8f1094ef7..94163d9b0f 100644
--- a/src/popup/tabs.component.html
+++ b/src/popup/tabs.component.html
@@ -19,7 +19,7 @@
       </li>
       <li routerLinkActive="active">
         <a routerLink="generator" appA11yTitle="{{ 'passGen' | i18n }}">
-          <i class="bwi bwi-generate bwi-2x" aria-hidden="true"></i>{{ "generator" | i18n }}
+          <i class="bwi bwi-generate-f bwi-2x" aria-hidden="true"></i>{{ "generator" | i18n }}
         </a>
       </li>
       <li routerLinkActive="active">
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index bc528e8816..95b250297e 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -464,7 +464,7 @@
                 appA11yTitle="{{ 'toggleOptions' | i18n }}"
                 (click)="toggleUriOptions(u)"
               >
-                <i class="bwi bwi-lg bwi-cog-f" aria-hidden="true"></i>
+                <i class="bwi bwi-lg bwi-cog" aria-hidden="true"></i>
               </button>
             </div>
           </div>
diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html
index 3af1c9859b..8b27666522 100644
--- a/src/popup/vault/ciphers.component.html
+++ b/src/popup/vault/ciphers.component.html
@@ -41,11 +41,7 @@
         >
           <div class="row-main">
             <div class="icon">
-              <i
-                class="bwi bwi-fw bwi-lg"
-                aria-hidden="true"
-                [ngClass]="{ 'bwi-bw-folder-open-f': f.node.id, 'bwi-folder-open': !f.node.id }"
-              ></i>
+              <i class="bwi bwi-fw bwi-lg bwi-folder" aria-hidden="true"></i>
             </div>
             <span class="text">{{ f.node.name }}</span>
           </div>
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index 754652bf31..afaa79b551 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -130,10 +130,7 @@
         >
           <div class="row-main">
             <div class="icon">
-              <i
-                class="bwi bwi-fw bwi-lg"
-                [ngClass]="{ 'bwi-bw-folder-open-f': f.node.id, 'bwi-folder-open': !f.node.id }"
-              ></i>
+              <i class="bwi bwi-fw bwi-lg bwi-folder"></i>
             </div>
             <span class="text">{{ f.node.name }}</span>
           </div>