diff --git a/app/application.js b/app/application.js
index c0f54ff1d..a6d4ed199 100644
--- a/app/application.js
+++ b/app/application.js
@@ -1,7 +1,5 @@
import loadPolyfills from './soapbox/load_polyfills';
-require('fork-awesome/css/fork-awesome.css');
-
require.context('./images/', true);
loadPolyfills().then(() => {
diff --git a/app/fonts/montserrat/montserrat-extra-bold-800.eot b/app/fonts/montserrat/montserrat-extra-bold-800.eot
deleted file mode 100644
index 85c4c6f7a..000000000
Binary files a/app/fonts/montserrat/montserrat-extra-bold-800.eot and /dev/null differ
diff --git a/app/fonts/montserrat/montserrat-extra-bold-800.svg b/app/fonts/montserrat/montserrat-extra-bold-800.svg
deleted file mode 100644
index 350e53f53..000000000
--- a/app/fonts/montserrat/montserrat-extra-bold-800.svg
+++ /dev/null
@@ -1,327 +0,0 @@
-
-
-
diff --git a/app/fonts/montserrat/montserrat-extra-bold-800.ttf b/app/fonts/montserrat/montserrat-extra-bold-800.ttf
deleted file mode 100644
index 94514b21a..000000000
Binary files a/app/fonts/montserrat/montserrat-extra-bold-800.ttf and /dev/null differ
diff --git a/app/fonts/montserrat/montserrat-extra-bold-800.woff b/app/fonts/montserrat/montserrat-extra-bold-800.woff
deleted file mode 100644
index f236d6c99..000000000
Binary files a/app/fonts/montserrat/montserrat-extra-bold-800.woff and /dev/null differ
diff --git a/app/fonts/montserrat/montserrat-extra-bold-800.woff2 b/app/fonts/montserrat/montserrat-extra-bold-800.woff2
deleted file mode 100644
index 887107632..000000000
Binary files a/app/fonts/montserrat/montserrat-extra-bold-800.woff2 and /dev/null differ
diff --git a/app/fonts/roboto/roboto-bold-700.eot b/app/fonts/roboto/roboto-bold-700.eot
deleted file mode 100644
index f23076570..000000000
Binary files a/app/fonts/roboto/roboto-bold-700.eot and /dev/null differ
diff --git a/app/fonts/roboto/roboto-bold-700.svg b/app/fonts/roboto/roboto-bold-700.svg
deleted file mode 100644
index 11db87dd0..000000000
--- a/app/fonts/roboto/roboto-bold-700.svg
+++ /dev/null
@@ -1,309 +0,0 @@
-
-
-
diff --git a/app/fonts/roboto/roboto-bold-700.ttf b/app/fonts/roboto/roboto-bold-700.ttf
deleted file mode 100644
index 333022da4..000000000
Binary files a/app/fonts/roboto/roboto-bold-700.ttf and /dev/null differ
diff --git a/app/fonts/roboto/roboto-bold-700.woff b/app/fonts/roboto/roboto-bold-700.woff
deleted file mode 100644
index 8c9b02410..000000000
Binary files a/app/fonts/roboto/roboto-bold-700.woff and /dev/null differ
diff --git a/app/fonts/roboto/roboto-bold-700.woff2 b/app/fonts/roboto/roboto-bold-700.woff2
deleted file mode 100644
index 3768f0182..000000000
Binary files a/app/fonts/roboto/roboto-bold-700.woff2 and /dev/null differ
diff --git a/app/fonts/roboto/roboto-bold-italic-700.eot b/app/fonts/roboto/roboto-bold-italic-700.eot
deleted file mode 100644
index 77866f2d3..000000000
Binary files a/app/fonts/roboto/roboto-bold-italic-700.eot and /dev/null differ
diff --git a/app/fonts/roboto/roboto-bold-italic-700.svg b/app/fonts/roboto/roboto-bold-italic-700.svg
deleted file mode 100644
index 050bee0e4..000000000
--- a/app/fonts/roboto/roboto-bold-italic-700.svg
+++ /dev/null
@@ -1,325 +0,0 @@
-
-
-
diff --git a/app/fonts/roboto/roboto-bold-italic-700.ttf b/app/fonts/roboto/roboto-bold-italic-700.ttf
deleted file mode 100644
index 51df87709..000000000
Binary files a/app/fonts/roboto/roboto-bold-italic-700.ttf and /dev/null differ
diff --git a/app/fonts/roboto/roboto-bold-italic-700.woff b/app/fonts/roboto/roboto-bold-italic-700.woff
deleted file mode 100644
index 55befb695..000000000
Binary files a/app/fonts/roboto/roboto-bold-italic-700.woff and /dev/null differ
diff --git a/app/fonts/roboto/roboto-bold-italic-700.woff2 b/app/fonts/roboto/roboto-bold-italic-700.woff2
deleted file mode 100644
index 93ee346e5..000000000
Binary files a/app/fonts/roboto/roboto-bold-italic-700.woff2 and /dev/null differ
diff --git a/app/fonts/roboto/roboto-light-300.eot b/app/fonts/roboto/roboto-light-300.eot
deleted file mode 100644
index efa769588..000000000
Binary files a/app/fonts/roboto/roboto-light-300.eot and /dev/null differ
diff --git a/app/fonts/roboto/roboto-light-300.svg b/app/fonts/roboto/roboto-light-300.svg
deleted file mode 100644
index 4ded944a8..000000000
--- a/app/fonts/roboto/roboto-light-300.svg
+++ /dev/null
@@ -1,312 +0,0 @@
-
-
-
diff --git a/app/fonts/roboto/roboto-light-300.ttf b/app/fonts/roboto/roboto-light-300.ttf
deleted file mode 100644
index 89f0e4627..000000000
Binary files a/app/fonts/roboto/roboto-light-300.ttf and /dev/null differ
diff --git a/app/fonts/roboto/roboto-light-300.woff b/app/fonts/roboto/roboto-light-300.woff
deleted file mode 100644
index 983083c7f..000000000
Binary files a/app/fonts/roboto/roboto-light-300.woff and /dev/null differ
diff --git a/app/fonts/roboto/roboto-light-300.woff2 b/app/fonts/roboto/roboto-light-300.woff2
deleted file mode 100644
index 7438daebe..000000000
Binary files a/app/fonts/roboto/roboto-light-300.woff2 and /dev/null differ
diff --git a/app/fonts/roboto/roboto-light-italic-300.eot b/app/fonts/roboto/roboto-light-italic-300.eot
deleted file mode 100644
index a431b1166..000000000
Binary files a/app/fonts/roboto/roboto-light-italic-300.eot and /dev/null differ
diff --git a/app/fonts/roboto/roboto-light-italic-300.svg b/app/fonts/roboto/roboto-light-italic-300.svg
deleted file mode 100644
index 758402b65..000000000
--- a/app/fonts/roboto/roboto-light-italic-300.svg
+++ /dev/null
@@ -1,329 +0,0 @@
-
-
-
diff --git a/app/fonts/roboto/roboto-light-italic-300.ttf b/app/fonts/roboto/roboto-light-italic-300.ttf
deleted file mode 100644
index 712f868c4..000000000
Binary files a/app/fonts/roboto/roboto-light-italic-300.ttf and /dev/null differ
diff --git a/app/fonts/roboto/roboto-light-italic-300.woff b/app/fonts/roboto/roboto-light-italic-300.woff
deleted file mode 100644
index 1d4ce5212..000000000
Binary files a/app/fonts/roboto/roboto-light-italic-300.woff and /dev/null differ
diff --git a/app/fonts/roboto/roboto-light-italic-300.woff2 b/app/fonts/roboto/roboto-light-italic-300.woff2
deleted file mode 100644
index 2e45b8676..000000000
Binary files a/app/fonts/roboto/roboto-light-italic-300.woff2 and /dev/null differ
diff --git a/app/fonts/roboto/roboto-regular-400.eot b/app/fonts/roboto/roboto-regular-400.eot
deleted file mode 100644
index cdf3f0079..000000000
Binary files a/app/fonts/roboto/roboto-regular-400.eot and /dev/null differ
diff --git a/app/fonts/roboto/roboto-regular-400.svg b/app/fonts/roboto/roboto-regular-400.svg
deleted file mode 100644
index 627f5a368..000000000
--- a/app/fonts/roboto/roboto-regular-400.svg
+++ /dev/null
@@ -1,308 +0,0 @@
-
-
-
diff --git a/app/fonts/roboto/roboto-regular-400.ttf b/app/fonts/roboto/roboto-regular-400.ttf
deleted file mode 100644
index a36cdeed5..000000000
Binary files a/app/fonts/roboto/roboto-regular-400.ttf and /dev/null differ
diff --git a/app/fonts/roboto/roboto-regular-400.woff b/app/fonts/roboto/roboto-regular-400.woff
deleted file mode 100644
index 7245f5cae..000000000
Binary files a/app/fonts/roboto/roboto-regular-400.woff and /dev/null differ
diff --git a/app/fonts/roboto/roboto-regular-400.woff2 b/app/fonts/roboto/roboto-regular-400.woff2
deleted file mode 100644
index 2e3eefc89..000000000
Binary files a/app/fonts/roboto/roboto-regular-400.woff2 and /dev/null differ
diff --git a/app/fonts/roboto/roboto-regular-italic-400.eot b/app/fonts/roboto/roboto-regular-italic-400.eot
deleted file mode 100644
index e25ecbe0d..000000000
Binary files a/app/fonts/roboto/roboto-regular-italic-400.eot and /dev/null differ
diff --git a/app/fonts/roboto/roboto-regular-italic-400.svg b/app/fonts/roboto/roboto-regular-italic-400.svg
deleted file mode 100644
index 4d5979710..000000000
--- a/app/fonts/roboto/roboto-regular-italic-400.svg
+++ /dev/null
@@ -1,323 +0,0 @@
-
-
-
diff --git a/app/fonts/roboto/roboto-regular-italic-400.ttf b/app/fonts/roboto/roboto-regular-italic-400.ttf
deleted file mode 100644
index 0d2131121..000000000
Binary files a/app/fonts/roboto/roboto-regular-italic-400.ttf and /dev/null differ
diff --git a/app/fonts/roboto/roboto-regular-italic-400.woff b/app/fonts/roboto/roboto-regular-italic-400.woff
deleted file mode 100644
index cd91cce9c..000000000
Binary files a/app/fonts/roboto/roboto-regular-italic-400.woff and /dev/null differ
diff --git a/app/fonts/roboto/roboto-regular-italic-400.woff2 b/app/fonts/roboto/roboto-regular-italic-400.woff2
deleted file mode 100644
index bdeb9f5d7..000000000
Binary files a/app/fonts/roboto/roboto-regular-italic-400.woff2 and /dev/null differ
diff --git a/app/styles/application.scss b/app/styles/application.scss
index 45804b491..fdd2b470c 100644
--- a/app/styles/application.scss
+++ b/app/styles/application.scss
@@ -75,3 +75,10 @@
// Holiday
@import 'holiday/halloween';
+
+// Fonts from elsewhere
+@import '~fork-awesome/css/fork-awesome.css';
+@import '~fontsource-roboto/300.css';
+@import '~fontsource-roboto/400.css';
+@import '~fontsource-roboto/700.css';
+@import '~fontsource-montserrat/800.css';
diff --git a/app/styles/fonts.scss b/app/styles/fonts.scss
index 542e5e41e..eba472a5e 100644
--- a/app/styles/fonts.scss
+++ b/app/styles/fonts.scss
@@ -1,95 +1,3 @@
-// Roboto Regular
-@font-face {
- font-family: 'Roboto';
- font-weight: 400;
- font-style: normal;
- src: url('../fonts/roboto/roboto-regular-400.eot?#iefix');
- src: url('../fonts/roboto/roboto-regular-400.eot?#iefix') format('embedded-opentype'),
- url('../fonts/roboto/roboto-regular-400.woff2') format('woff2'),
- url('../fonts/roboto/roboto-regular-400.woff') format('woff'),
- url('../fonts/roboto/roboto-regular-400.ttf') format('truetype'),
- url('../fonts/roboto/roboto-regular-400.svg') format('svg');
-}
-
-// Roboto Regular Italic
-@font-face {
- font-family: 'Roboto';
- font-weight: 400;
- font-style: italic;
- src: url('../fonts/roboto/roboto-regular-italic-400.eot?#iefix');
- src: url('../fonts/roboto/roboto-regular-italic-400.eot?#iefix') format('embedded-opentype'),
- url('../fonts/roboto/roboto-regular-italic-400.woff2') format('woff2'),
- url('../fonts/roboto/roboto-regular-italic-400.woff') format('woff'),
- url('../fonts/roboto/roboto-regular-italic-400.ttf') format('truetype'),
- url('../fonts/roboto/roboto-regular-italic-400.svg') format('svg');
-}
-
-// Roboto Light
-@font-face {
- font-family: 'Roboto';
- font-weight: 300;
- font-style: normal;
- src: url('../fonts/roboto/roboto-light-300.eot?#iefix');
- src: url('../fonts/roboto/roboto-light-300.eot?#iefix') format('embedded-opentype'),
- url('../fonts/roboto/roboto-light-300.woff2') format('woff2'),
- url('../fonts/roboto/roboto-light-300.woff') format('woff'),
- url('../fonts/roboto/roboto-light-300.ttf') format('truetype'),
- url('../fonts/roboto/roboto-light-300.svg') format('svg');
-}
-
-// Roboto Light Italic
-@font-face {
- font-family: 'Roboto';
- font-weight: 300;
- font-style: italic;
- src: url('../fonts/roboto/roboto-light-italic-300.eot?#iefix');
- src: url('../fonts/roboto/roboto-light-italic-300.eot?#iefix') format('embedded-opentype'),
- url('../fonts/roboto/roboto-light-italic-300.woff2') format('woff2'),
- url('../fonts/roboto/roboto-light-italic-300.woff') format('woff'),
- url('../fonts/roboto/roboto-light-italic-300.ttf') format('truetype'),
- url('../fonts/roboto/roboto-light-italic-300.svg') format('svg');
-}
-
-// Roboto Bold
-@font-face {
- font-family: 'Roboto';
- font-weight: 700;
- font-style: normal;
- src: url('../fonts/roboto/roboto-bold-700.eot?#iefix');
- src: url('../fonts/roboto/roboto-bold-700.eot?#iefix') format('embedded-opentype'),
- url('../fonts/roboto/roboto-bold-700.woff2') format('woff2'),
- url('../fonts/roboto/roboto-bold-700.woff') format('woff'),
- url('../fonts/roboto/roboto-bold-700.ttf') format('truetype'),
- url('../fonts/roboto/roboto-bold-700.svg') format('svg');
-}
-
-// Roboto Bold Italic
-@font-face {
- font-family: 'Roboto';
- font-weight: 700;
- font-style: italic;
- src: url('../fonts/roboto/roboto-bold-italic-700.eot?#iefix');
- src: url('../fonts/roboto/roboto-bold-italic-700.eot?#iefix') format('embedded-opentype'),
- url('../fonts/roboto/roboto-bold-italic-700.woff2') format('woff2'),
- url('../fonts/roboto/roboto-bold-italic-700.woff') format('woff'),
- url('../fonts/roboto/roboto-bold-italic-700.ttf') format('truetype'),
- url('../fonts/roboto/roboto-bold-italic-700.svg') format('svg');
-}
-
-// Montserrat Extra Bold
-// Used for all bold number, scoreboard, count displays
-@font-face {
- font-family: 'Montserrat';
- font-weight: 800;
- font-style: normal;
- src: url('../fonts/montserrat/montserrat-extra-bold-800.eot?#iefix');
- src: url('../fonts/montserrat/montserrat-extra-bold-800.eot?#iefix') format('embedded-opentype'),
- url('../fonts/montserrat/montserrat-extra-bold-800.woff2') format('woff2'),
- url('../fonts/montserrat/montserrat-extra-bold-800.woff') format('woff'),
- url('../fonts/montserrat/montserrat-extra-bold-800.ttf') format('truetype'),
- url('../fonts/montserrat/montserrat-extra-bold-800.svg') format('svg');
-}
-
// OpenDyslexic
@font-face {
font-family: 'OpenDyslexic';
diff --git a/package.json b/package.json
index 2bbc7d1bc..3701f7718 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,8 @@
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",
"file-loader": "^6.0.0",
+ "fontsource-montserrat": "^3.0.9",
+ "fontsource-roboto": "^3.0.3",
"fork-awesome": "^1.1.7",
"html-webpack-harddisk-plugin": "^1.0.1",
"html-webpack-plugin": "^4.3.0",
diff --git a/yarn.lock b/yarn.lock
index b6c174a7a..d85fb875a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5385,6 +5385,16 @@ follow-redirects@^1.10.0:
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
+fontsource-montserrat@^3.0.9:
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/fontsource-montserrat/-/fontsource-montserrat-3.0.9.tgz#ff614725c420839c4aefbca6f2b49c6224050991"
+ integrity sha512-kSE4GwWoEKJlIp0UyuoYtBvjKv5kwOTK7EvCwdQ7ukvKvgIK1LR5+GpZC5c/juonasNtFTKav67Zd7/C7m+a5w==
+
+fontsource-roboto@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/fontsource-roboto/-/fontsource-roboto-3.0.3.tgz#99c312babeabce22b3e933b3edf2951d4508f4f7"
+ integrity sha512-kfsC9qAP6XhwnSDAhg2lhWeaUJfLGXZh7GcLxFiz/4lXdkV2pVhWv2Xp9ES3b3BHdc9UuPrWXXLOphzHIStcOw==
+
for-in@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"