diff --git a/.gitignore b/.gitignore
index 6ff593282ab..d4939081a95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ media/json
 media/man
 media/pdf
 media/static
+/static
 node_modules
 package-lock.json
 readthedocs/rtd_tests/builds
diff --git a/media/font/fontawesome_webfont.woff2 b/media/font/fontawesome_webfont.woff2
new file mode 120000
index 00000000000..d8b851262b1
--- /dev/null
+++ b/media/font/fontawesome_webfont.woff2
@@ -0,0 +1 @@
+../../readthedocs/core/static/core/font/fontawesome-webfont.woff2
\ No newline at end of file
diff --git a/media/fonts b/media/fonts
index e645d633d5d..fb346f06d29 120000
--- a/media/fonts
+++ b/media/fonts
@@ -1 +1 @@
-../readthedocs/core/static/core/font/
\ No newline at end of file
+../readthedocs/core/static/core/font
\ No newline at end of file
diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
index e6b3e400af2..a9113c7ee08 100644
--- a/readthedocs/settings/base.py
+++ b/readthedocs/settings/base.py
@@ -167,7 +167,7 @@ def USE_PROMOS(self):  # noqa
     PRODUCTION_MEDIA_ARTIFACTS = os.path.join(PRODUCTION_ROOT, 'media')
 
     # Assets and media
-    STATIC_ROOT = os.path.join(SITE_ROOT, 'media/static/')
+    STATIC_ROOT = os.path.join(SITE_ROOT, 'static')
     STATIC_URL = '/static/'
     MEDIA_ROOT = os.path.join(SITE_ROOT, 'media/')
     MEDIA_URL = '/media/'
diff --git a/readthedocs/templates/admin.html b/readthedocs/templates/admin.html
deleted file mode 100644
index 7487a941b2b..00000000000
--- a/readthedocs/templates/admin.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title></title>
-    <link rel="stylesheet" href="{{ MEDIA_URL }}css/pecan/base.css" />
-    <script type="text/javascript" src="{{ MEDIA_URL }}javascript/pecan/bundle.js"></script>
-</head>
-<body class="loading">
-    
-</body>
-</html>
diff --git a/readthedocs/templates/base.html b/readthedocs/templates/base.html
index 57d80a18f52..26b7aa6c13c 100644
--- a/readthedocs/templates/base.html
+++ b/readthedocs/templates/base.html
@@ -10,7 +10,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   {% block extra_metas %}{% endblock extra_metas %}
 
-  <link rel="icon" type="image/png" href="{{ MEDIA_URL }}images/favicon.png">
+  <link rel="icon" type="image/png" href="{% static 'images/favicon.png' %}">
 
   <!-- title -->
   <title>{% block title %}{% endblock %}{% block head_title %}{% endblock %} | {% block branding %}Read the Docs {% endblock %}</title>
@@ -47,7 +47,7 @@
   <!-- End Google Analytics -->
 
   <!-- css -->
-  <link rel="stylesheet" href="{{ MEDIA_URL }}css/core.css">
+  <link rel="stylesheet" href="{% static 'css/core.css' %}">
   {% block extra_links %}{% endblock %}
 
   <!-- jquery -->
@@ -58,7 +58,7 @@
     require('jquery');
   </script>
 
-  <script src="{{ MEDIA_URL }}javascript/base.js"></script>
+  <script src="{% static 'javascript/base.js' %}"></script>
   <script src="{% static 'core/js/site.js' %}"></script>
   <script>
     var site = require('core/site');
diff --git a/readthedocs/templates/builds/build_list.html b/readthedocs/templates/builds/build_list.html
index 77da12d8e4b..fce27df20ed 100644
--- a/readthedocs/templates/builds/build_list.html
+++ b/readthedocs/templates/builds/build_list.html
@@ -1,6 +1,7 @@
 {% extends "projects/base_project.html" %}
 
 {% load i18n %}
+{% load static %}
 
 {% load pagination_tags %}
 {% load privacy_tags %}
@@ -74,7 +75,7 @@ <h1>{% trans "Recent Builds" %}</h1>
 
 {% block extra_scripts %}
 {{ block.super }}
-  <script type="text/javascript" src="{{ MEDIA_URL }}javascript/build_updater.js"></script>
+  <script type="text/javascript" src="{% static 'javascript/build_updater.js' %}"></script>
 
   <script type="text/javascript">
     $(function() {
diff --git a/readthedocs/urls.py b/readthedocs/urls.py
index 19914cd72e7..e441bc94459 100644
--- a/readthedocs/urls.py
+++ b/readthedocs/urls.py
@@ -1,6 +1,7 @@
 # pylint: disable=missing-docstring
 from __future__ import absolute_import
 
+import os
 from functools import reduce
 from operator import add
 
@@ -8,7 +9,7 @@
 from django.contrib import admin
 from django.conf import settings
 from django.conf.urls.static import static
-from django.views.generic.base import TemplateView
+from django.views.generic.base import TemplateView, RedirectView
 from tastypie.api import Api
 
 from readthedocs.api.base import (ProjectResource, UserResource,
@@ -85,13 +86,20 @@
         TemplateView.as_view(template_name='dnt-policy.txt', content_type='text/plain')),
 ]
 
-debug_urls = add(
-    [
-        url('style-catalog/$',
-            TemplateView.as_view(template_name='style_catalog.html')),
-    ],
-    static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-)
+debug_urls = []
+for build_format in ('epub', 'htmlzip', 'json', 'pdf'):
+    debug_urls += static(
+        settings.MEDIA_URL + build_format,
+        document_root=os.path.join(settings.MEDIA_ROOT, build_format),
+    )
+debug_urls += [
+    url('style-catalog/$',
+        TemplateView.as_view(template_name='style_catalog.html')),
+
+    # This must come last after the build output files
+    url(r'^media/(?P<remainder>.+)$',
+        RedirectView.as_view(url=settings.STATIC_URL + '%(remainder)s'), name='media-redirect'),
+]
 
 # Export URLs
 groups = [basic_urls, rtd_urls, project_urls, api_urls, core_urls, i18n_urls, deprecated_urls]
