diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 6363f9172..17ef6bfbc 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -25,6 +25,9 @@ require("jquery-ui/themes/base/draggable.css");
 require("jquery-ui/themes/base/resizable.css");
 require("jquery-ui/themes/base/theme.css");
 
+require("@fortawesome/fontawesome-free/css/all.css");
+require("@fortawesome/fontawesome-free/js/all.js");
+
 importAll(require.context('../src/javascripts', true, /\.js(\.erb)?$/));
 importAll(require.context('../src/styles', true, /\.s?css(?:\.erb)?$/));
 
diff --git a/app/views/layouts/blank.html.erb b/app/views/layouts/blank.html.erb
index 2e0e215eb..3f2c22863 100644
--- a/app/views/layouts/blank.html.erb
+++ b/app/views/layouts/blank.html.erb
@@ -8,7 +8,6 @@
   <%= auto_discovery_link_tag :atom, posts_path(:format => "atom", :tags => params[:tags]) %>
   <%= raw Danbooru.config.custom_html_header_content %>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
   <%= javascript_pack_tag "application" %>
   <%= stylesheet_pack_tag "application" %>
   <%= yield :html_header %>
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 61e0ad7fc..28c618d5e 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -68,12 +68,6 @@
     "url" : "<%= root_url %>"
   }
   </script>
-  <% if request.domain =~ /donmai\.us/ %>
-    <!-- this is only usable on danbooru.donmai.us -->
-    <link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-6jHF7Z3XI3fF4XZixAuSu0gGKrXwoX/w3uFPxC56OtjChio7wtTGJWRW53Nhx6Ev" crossorigin="anonymous">
-  <% else %>
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
-<% end %>
   <script>
     if (typeof window.Danbooru !== "object") {
       window.Danbooru = {};
diff --git a/package.json b/package.json
index 938fc80b2..bfeb84797 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "license": "MIT",
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.11.2",
     "@rails/webpacker": "^4.0.0",
     "debug-loader": "^0.0.1",
     "dropzone": "^5.5.1",
diff --git a/yarn.lock b/yarn.lock
index 5e06c66d0..db79cc0ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -757,6 +757,11 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
+"@fortawesome/fontawesome-free@^5.11.2":
+  version "5.11.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz#8644bc25b19475779a7b7c1fc104bc0a794f4465"
+  integrity sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ==
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"