diff --git a/Gemfile b/Gemfile
index a4ba77cf..481389f7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,7 @@ gem 'jbuilder'
 gem 'msgpack'
 gem 'octokit'
 gem 'bootstrap_sb_admin_base_v2'
+gem 'error_page_assets'
 
 group :development do
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index 94676ae2..d655a52a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,6 +106,7 @@ GEM
       safe_yaml (~> 1.0.0)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
+    error_page_assets (0.4)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.7.0)
@@ -334,6 +335,7 @@ DEPENDENCIES
   capybara-screenshot
   coffee-rails
   database_cleaner
+  error_page_assets
   factory_girl_rails
   haml
   highcharts-rails
@@ -374,4 +376,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.15.1
+   1.15.2
diff --git a/public/404.html b/app/assets/html/404.html.erb
similarity index 92%
rename from public/404.html
rename to app/assets/html/404.html.erb
index 032d93e1..84630289 100644
--- a/public/404.html
+++ b/app/assets/html/404.html.erb
@@ -6,8 +6,8 @@
   <meta content='width=device-width, initial-scale=1' name='viewport'>
   <!-- Loads Freight Sans Pro font with these font weights: 300, 400, 700 -->
 
-  <link rel="stylesheet" media="screen" href="https://fonts.googleapis.com/css?family=Montserrat:400,700" />
-  <link rel="stylesheet" media="all" href="/assets/application.self-745519abfad0a8dbde6e0cd8fe1492f9d36e30a9f06a1a1785b8c57805501903.css?body=1" />
+  <%= stylesheet_link_tag 'https://fonts.googleapis.com/css?family=Montserrat:400,700' %>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
 
 </head>