diff --git a/.gitignore b/.gitignore
index 01c40b0e4..a4dcb40e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,11 +38,7 @@ dump.rdb
 
 .vscode
 
-# Generated Files
-/dist/javascripts
-/dist/stylesheets
-/dist/fonts
-/dist/@types
+/dist
 
 # Yarn
 yarn-error.log
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index cac5fd170..c18278533 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,19 +1,10 @@
-# Be sure to restart your server when you modify this file.
-
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
-# Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
-
 Rails.application.config.assets.paths << Rails.root.join('vendor', 'assets')
-Rails.application.config.assets.paths << Rails.root.join('dist')
-
-Rails.application.config.assets.precompile += %w( fonts/ionicons.eot fonts/ionicons.svg fonts/ionicons.ttf fonts/ionicons.woff )
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w( stylesheets/app.css javascripts/app.js )
-
-# zip library
 Rails.application.config.assets.precompile += %w( zip/zip.js zip/z-worker.js zip/inflate.js zip/deflate.js )
+
+# Recursively add all files and folders in 'dist'.
+Rails.application.config.assets.paths << Rails.root.join('dist')
+files = Dir.glob('dist/**/*').map! { |file| file.sub('dist/', '') }
+Rails.application.config.assets.precompile += files