diff --git a/package.json b/package.json
index 696cffe6016dd3e4936a84d5218e5edd24d0caba..41afb4977b5671840c8b427043aba8169a43a477 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,9 @@
     "lint": "yarn run lint:js && yarn run lint:html"
   },
   "dependencies": {
-    "@fortawesome/fontawesome": "^1.1.5",
-    "@fortawesome/fontawesome-free-solid": "^5.0.9",
-    "@fortawesome/react-fontawesome": "^0.0.18",
+    "@fortawesome/fontawesome-svg-core": "^1.2.2",
+    "@fortawesome/free-solid-svg-icons": "^5.2.0",
+    "@fortawesome/react-fontawesome": "^0.1.0",
     "aframe-billboard-component": "^1.0.0",
     "aframe-extras": "https://github.com/MozillaReality/aframe-extras#feature/precompute-nav-mesh",
     "aframe-input-mapping-component": "https://github.com/mozillareality/aframe-input-mapping-component#hubs/master",
diff --git a/src/react-components/2d-hud.js b/src/react-components/2d-hud.js
index 93ae3cc44237d8938443b59b9ad6b2990a7c9029..12e7abc171ac4c3e4c861e40e70cb08788661076 100644
--- a/src/react-components/2d-hud.js
+++ b/src/react-components/2d-hud.js
@@ -4,8 +4,8 @@ import cx from "classnames";
 
 import styles from "../assets/stylesheets/2d-hud.scss";
 
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faPlus from "@fortawesome/fontawesome-free-solid/faPlus";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faPlus } from "@fortawesome/free-solid-svg-icons/faPlus";
 
 const qs = new URLSearchParams(location.search);
 function qsTruthy(param) {
diff --git a/src/react-components/avatar-selector.js b/src/react-components/avatar-selector.js
index e4b27897e839eb53f99267b8b3bc70e2c81f8206..4915202400f8a0db66a593725175b445f4945e47 100644
--- a/src/react-components/avatar-selector.js
+++ b/src/react-components/avatar-selector.js
@@ -1,9 +1,9 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { injectIntl } from "react-intl";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faAngleLeft from "@fortawesome/fontawesome-free-solid/faAngleLeft";
-import faAngleRight from "@fortawesome/fontawesome-free-solid/faAngleRight";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faAngleLeft } from "@fortawesome/free-solid-svg-icons/faAngleLeft";
+import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight";
 
 // TODO: we should make a bundle for avatar picker with it's own geometry, for now just use the indoor part of the meting room
 const meetingSpace = "https://asset-bundles-prod.reticulum.io/rooms/meetingroom/MeetingSpace1_mesh-d48250ebc6.gltf";
diff --git a/src/react-components/footer.js b/src/react-components/footer.js
index e155bea128a151fd2013251ada9b94a5c67e6794..fbc40988748fba5a238f0fe807d115468cd79f38 100644
--- a/src/react-components/footer.js
+++ b/src/react-components/footer.js
@@ -1,14 +1,14 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faUsers from "@fortawesome/fontawesome-free-solid/faUsers";
-import faBars from "@fortawesome/fontawesome-free-solid/faBars";
-import faShareAlt from "@fortawesome/fontawesome-free-solid/faShareAlt";
-import faExclamation from "@fortawesome/fontawesome-free-solid/faExclamation";
-import faTimes from "@fortawesome/fontawesome-free-solid/faTimes";
-import faArrowDown from "@fortawesome/fontawesome-free-solid/faArrowDown";
-import faQuestion from "@fortawesome/fontawesome-free-solid/faQuestion";
-import faNewspaper from "@fortawesome/fontawesome-free-solid/faNewspaper";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faUsers } from "@fortawesome/free-solid-svg-icons/faUsers";
+import { faBars } from "@fortawesome/free-solid-svg-icons/faBars";
+import { faShareAlt } from "@fortawesome/free-solid-svg-icons/faShareAlt";
+import { faExclamation } from "@fortawesome/free-solid-svg-icons/faExclamation";
+import { faTimes } from "@fortawesome/free-solid-svg-icons/faTimes";
+import { faArrowDown } from "@fortawesome/free-solid-svg-icons/faArrowDown";
+import { faQuestion } from "@fortawesome/free-solid-svg-icons/faQuestion";
+import { faNewspaper } from "@fortawesome/free-solid-svg-icons/faNewspaper";
 
 import styles from "../assets/stylesheets/footer.scss";
 
diff --git a/src/react-components/hub-create-panel.js b/src/react-components/hub-create-panel.js
index 959a4a9331a1975a83a0ab315b7fa092c8f05418..b3aec47ab2d568180036d1c9a1bd932de0c46a25 100644
--- a/src/react-components/hub-create-panel.js
+++ b/src/react-components/hub-create-panel.js
@@ -3,9 +3,9 @@ import PropTypes from "prop-types";
 import { injectIntl, FormattedMessage } from "react-intl";
 import { generateHubName } from "../utils/name-generation";
 import classNames from "classnames";
-import faAngleLeft from "@fortawesome/fontawesome-free-solid/faAngleLeft";
-import faAngleRight from "@fortawesome/fontawesome-free-solid/faAngleRight";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
+import { faAngleLeft } from "@fortawesome/free-solid-svg-icons/faAngleLeft";
+import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { resolveURL, extractUrlBase } from "../utils/resolveURL";
 
 import default_scene_preview_thumbnail from "../assets/images/default_thumbnail.png";
diff --git a/src/react-components/profile-info-header.js b/src/react-components/profile-info-header.js
index f5c23dd6b0a7050aee50bcd44ec66f263ab9b827..4f0b8e65bd7d353defaac525c82d5e99778aa36e 100644
--- a/src/react-components/profile-info-header.js
+++ b/src/react-components/profile-info-header.js
@@ -1,8 +1,8 @@
 import React from "react";
 import PropTypes from "prop-types";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faQuestion from "@fortawesome/fontawesome-free-solid/faQuestion";
-import faShareAlt from "@fortawesome/fontawesome-free-solid/faShareAlt";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faQuestion } from "@fortawesome/free-solid-svg-icons/faQuestion";
+import { faShareAlt } from "@fortawesome/free-solid-svg-icons/faShareAlt";
 
 export const ProfileInfoHeader = props => (
   <div className="profile-info-header">
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index f398c263c205ce836ddf0ace3703a90de1972666..0ab4bf813f1872564c9891399f8c3c42a7268277 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -22,8 +22,8 @@ import InfoDialog from "./info-dialog.js";
 import TwoDHUD from "./2d-hud";
 import Footer from "./footer";
 
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faQuestion from "@fortawesome/fontawesome-free-solid/faQuestion";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faQuestion } from "@fortawesome/free-solid-svg-icons/faQuestion";
 
 addLocaleData([...en]);