diff --git a/lib/gui/app/components/drive-selector/drive-selector.tsx b/lib/gui/app/components/drive-selector/drive-selector.tsx
index 338e5c5c..c911d02f 100644
--- a/lib/gui/app/components/drive-selector/drive-selector.tsx
+++ b/lib/gui/app/components/drive-selector/drive-selector.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import ExclamationTriangleSvg from "@fortawesome/fontawesome-free/svgs/solid/exclamation-triangle.svg";
+import ExclamationTriangleSvg from "@fortawesome/fontawesome-free/svgs/solid/triangle-exclamation.svg";
 import ChevronDownSvg from "@fortawesome/fontawesome-free/svgs/solid/chevron-down.svg";
 import * as sourceDestination from "etcher-sdk/build/source-destination/";
 import * as React from "react";
diff --git a/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx b/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
index c1e5fad8..281a4b28 100644
--- a/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
+++ b/lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx
@@ -1,4 +1,4 @@
-import ExclamationTriangleSvg from "@fortawesome/fontawesome-free/svgs/solid/exclamation-triangle.svg";
+import ExclamationTriangleSvg from "@fortawesome/fontawesome-free/svgs/solid/triangle-exclamation.svg";
 import * as _ from "lodash";
 import * as React from "react";
 import { Badge, Flex, Txt, ModalProps } from "rendition";
diff --git a/lib/gui/app/components/flash-results/flash-results.tsx b/lib/gui/app/components/flash-results/flash-results.tsx
index 3bba7ec1..b0aebde2 100644
--- a/lib/gui/app/components/flash-results/flash-results.tsx
+++ b/lib/gui/app/components/flash-results/flash-results.tsx
@@ -15,8 +15,8 @@
  */
 
 import CircleSvg from "@fortawesome/fontawesome-free/svgs/solid/circle.svg";
-import CheckCircleSvg from "@fortawesome/fontawesome-free/svgs/solid/check-circle.svg";
-import TimesCircleSvg from "@fortawesome/fontawesome-free/svgs/solid/times-circle.svg";
+import CheckCircleSvg from "@fortawesome/fontawesome-free/svgs/solid/circle-check.svg";
+import TimesCircleSvg from "@fortawesome/fontawesome-free/svgs/solid/circle-xmark.svg";
 import * as React from "react";
 import { Flex, FlexProps, Link, TableColumn, Txt } from "rendition";
 import styled from "styled-components";
diff --git a/lib/gui/app/components/source-selector/source-selector.tsx b/lib/gui/app/components/source-selector/source-selector.tsx
index 50050213..de25d84c 100644
--- a/lib/gui/app/components/source-selector/source-selector.tsx
+++ b/lib/gui/app/components/source-selector/source-selector.tsx
@@ -17,7 +17,7 @@
 import CopySvg from "@fortawesome/fontawesome-free/svgs/solid/copy.svg";
 import FileSvg from "@fortawesome/fontawesome-free/svgs/solid/file.svg";
 import LinkSvg from "@fortawesome/fontawesome-free/svgs/solid/link.svg";
-import ExclamationTriangleSvg from "@fortawesome/fontawesome-free/svgs/solid/exclamation-triangle.svg";
+import ExclamationTriangleSvg from "@fortawesome/fontawesome-free/svgs/solid/triangle-exclamation.svg";
 import ChevronDownSvg from "@fortawesome/fontawesome-free/svgs/solid/chevron-down.svg";
 import ChevronRightSvg from "@fortawesome/fontawesome-free/svgs/solid/chevron-right.svg";
 import { ipcRenderer, IpcRendererEvent } from "electron";
diff --git a/lib/gui/app/components/target-selector/target-selector-button.tsx b/lib/gui/app/components/target-selector/target-selector-button.tsx
index 2272df4f..6c6822a0 100644
--- a/lib/gui/app/components/target-selector/target-selector-button.tsx
+++ b/lib/gui/app/components/target-selector/target-selector-button.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import ExclamationTriangleSvg from "@fortawesome/fontawesome-free/svgs/solid/exclamation-triangle.svg";
+import ExclamationTriangleSvg from "@fortawesome/fontawesome-free/svgs/solid/triangle-exclamation.svg";
 import * as React from "react";
 import { Flex, FlexProps, Txt } from "rendition";
 
diff --git a/lib/gui/app/pages/main/MainPage.tsx b/lib/gui/app/pages/main/MainPage.tsx
index 81101258..8d129bd6 100644
--- a/lib/gui/app/pages/main/MainPage.tsx
+++ b/lib/gui/app/pages/main/MainPage.tsx
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import CogSvg from '@fortawesome/fontawesome-free/svgs/solid/cog.svg';
-import QuestionCircleSvg from '@fortawesome/fontawesome-free/svgs/solid/question-circle.svg';
+import CogSvg from '@fortawesome/fontawesome-free/svgs/solid/gear.svg';
+import QuestionCircleSvg from '@fortawesome/fontawesome-free/svgs/solid/circle-question.svg';
 
 import * as path from 'path';
 import prettyBytes from 'pretty-bytes';
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b47484cf..b0022972 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -13,7 +13,7 @@
         "@balena/lint": "5.4.2",
         "@balena/sudo-prompt": "9.2.1-workaround-windows-amperstand-in-username-0849e215b947987a643fe5763902aea201255534",
         "@electron/remote": "^2.0.12",
-        "@fortawesome/fontawesome-free": "5.15.4",
+        "@fortawesome/fontawesome-free": "6.4.2",
         "@sentry/electron": "^4.14.0",
         "@svgr/webpack": "8.1.0",
         "@types/chai": "4.3.9",
@@ -3198,10 +3198,11 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "5.15.4",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
+      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
       "engines": {
         "node": ">=6"
       }
@@ -20616,7 +20617,9 @@
       "dev": true
     },
     "@fortawesome/fontawesome-free": {
-      "version": "5.15.4",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
+      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==",
       "dev": true
     },
     "@fortawesome/fontawesome-svg-core": {
diff --git a/package.json b/package.json
index 48bd60ba..96100d72 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@balena/lint": "5.4.2",
     "@balena/sudo-prompt": "9.2.1-workaround-windows-amperstand-in-username-0849e215b947987a643fe5763902aea201255534",
     "@electron/remote": "^2.0.12",
-    "@fortawesome/fontawesome-free": "5.15.4",
+    "@fortawesome/fontawesome-free": "6.4.2",
     "@sentry/electron": "^4.14.0",
     "@svgr/webpack": "8.1.0",
     "@types/chai": "4.3.9",