diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 26f42b18..f35f812f 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -1100,8 +1100,8 @@ class Server(object):
 			"css/bootstrap-modal.css",
 			"css/bootstrap-slider.css",
 			"css/bootstrap-tabdrop.css",
-			"assets/vendor/font-awesome-3.2.1/css/font-awesome.min.css",
-			"assets/vendor/font-awesome-4.7.0/css/font-awesome.min.css",
+			"vendor/font-awesome-3.2.1/css/font-awesome.min.css",
+			"vendor/font-awesome-4.7.0/css/font-awesome.min.css",
 			"css/jquery.fileupload-ui.css",
 			"css/pnotify.core.min.css",
 			"css/pnotify.buttons.min.css",
diff --git a/src/octoprint/static/assets/vendor/font-awesome-3.2.1/css/font-awesome.css b/src/octoprint/static/vendor/font-awesome-3.2.1/css/font-awesome.css
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-3.2.1/css/font-awesome.css
rename to src/octoprint/static/vendor/font-awesome-3.2.1/css/font-awesome.css
diff --git a/src/octoprint/static/assets/vendor/font-awesome-3.2.1/css/font-awesome.min.css b/src/octoprint/static/vendor/font-awesome-3.2.1/css/font-awesome.min.css
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-3.2.1/css/font-awesome.min.css
rename to src/octoprint/static/vendor/font-awesome-3.2.1/css/font-awesome.min.css
diff --git a/src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/FontAwesome.otf b/src/octoprint/static/vendor/font-awesome-3.2.1/fonts/FontAwesome.otf
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/FontAwesome.otf
rename to src/octoprint/static/vendor/font-awesome-3.2.1/fonts/FontAwesome.otf
diff --git a/src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.eot b/src/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.eot
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.eot
rename to src/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.eot
diff --git a/src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.svg b/src/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.svg
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.svg
rename to src/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.svg
diff --git a/src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.ttf b/src/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.ttf
rename to src/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.ttf
diff --git a/src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.woff b/src/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.woff
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.woff
rename to src/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.woff
diff --git a/src/octoprint/static/assets/vendor/font-awesome-4.7.0/css/font-awesome.css b/src/octoprint/static/vendor/font-awesome-4.7.0/css/font-awesome.css
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-4.7.0/css/font-awesome.css
rename to src/octoprint/static/vendor/font-awesome-4.7.0/css/font-awesome.css
diff --git a/src/octoprint/static/assets/vendor/font-awesome-4.7.0/css/font-awesome.min.css b/src/octoprint/static/vendor/font-awesome-4.7.0/css/font-awesome.min.css
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-4.7.0/css/font-awesome.min.css
rename to src/octoprint/static/vendor/font-awesome-4.7.0/css/font-awesome.min.css
diff --git a/src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/FontAwesome.otf b/src/octoprint/static/vendor/font-awesome-4.7.0/fonts/FontAwesome.otf
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/FontAwesome.otf
rename to src/octoprint/static/vendor/font-awesome-4.7.0/fonts/FontAwesome.otf
diff --git a/src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.eot b/src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
rename to src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
diff --git a/src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.svg b/src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
rename to src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
diff --git a/src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf b/src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
rename to src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
diff --git a/src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff b/src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
rename to src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
diff --git a/src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 b/src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from src/octoprint/static/assets/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
rename to src/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2