diff --git a/docs/THIRDPARTY b/docs/THIRDPARTY
index 59e8d3bd2b..d48fb670d1 100644
--- a/docs/THIRDPARTY
+++ b/docs/THIRDPARTY
@@ -86,7 +86,7 @@ Files: static/audio/zulip.*
 Copyright: 2011 Vidsyn
 License: CC-0-1.0
 
-Files: static/styles/thirdparty-fonts.css
+Files: static/third/thirdparty-fonts.css
 Copyright: 2012-2013 Dave Gandy
 License: Expat
 
diff --git a/docs/html_css.md b/docs/html_css.md
index 1592ac34da..75686c9e06 100644
--- a/docs/html_css.md
+++ b/docs/html_css.md
@@ -17,7 +17,7 @@ The CSS files are:
 * `pygments.css` - CSS for Python syntax highlighting
 * `activity.css` - CSS for the `activity` app
 * `fonts.css` - Fonts for text in the Zulip app
-* `static/styles/thirdparty-fonts.css` - Font Awesome (used for icons)
+* `static/third/thirdparty-fonts.css` - Font Awesome (used for icons)
 
 The CSS for the Zulip web application UI is primarily here:
 
diff --git a/docs/user-docs.md b/docs/user-docs.md
index 7bd5912d3a..028ddb85df 100644
--- a/docs/user-docs.md
+++ b/docs/user-docs.md
@@ -180,7 +180,7 @@ a new line to be formatted this way.
 You can refer to features in the Zulip UI by refrencing their names and
 their [FontAwesome](http://fontawesome.io) (version 3.0.2) text icons within
 parentheses. The source for the text icons is located in
-`static/styles/thirdparty-fonts.css`.
+`static/third/thirdparty-fonts.css`.
 
 * cog (<i class="fa fa-cog"></i>) icon — `cog (<i
 class="icon-vector-cog"></i>) icon`
diff --git a/frontend_tests/zjsunit/output.js b/frontend_tests/zjsunit/output.js
index 0fe5b53f28..1d8730be19 100644
--- a/frontend_tests/zjsunit/output.js
+++ b/frontend_tests/zjsunit/output.js
@@ -38,7 +38,7 @@ function stylesheets() {
     var data = '';
     data += '<link href="../../static/styles/fonts.css" rel="stylesheet">\n';
     data += '<link href="../../static/styles/portico.css" rel="stylesheet">\n';
-    data += '<link href="../../static/styles/thirdparty-fonts.css" rel="stylesheet">\n';
+    data += '<link href="../../static/third/thirdparty-fonts.css" rel="stylesheet">\n';
     data += '<link href="../../static/styles/zulip.css" rel="stylesheet">\n';
     data += '<link href="../../static/styles/settings.css" rel="stylesheet">\n';
     data += '<link href="../../static/styles/left-sidebar.css" rel="stylesheet">\n';
diff --git a/static/styles/thirdparty-fonts.css b/static/third/thirdparty-fonts.css
similarity index 100%
rename from static/styles/thirdparty-fonts.css
rename to static/third/thirdparty-fonts.css
diff --git a/tools/lint-all b/tools/lint-all
index cd2a74e056..5db725ffab 100755
--- a/tools/lint-all
+++ b/tools/lint-all
@@ -452,7 +452,7 @@ def build_custom_checkers(by_lang):
          'description': "Zulip CSS should have no dependencies on external resources"},
         {'pattern': '^[ ][ ][a-zA-Z0-9]',
          'description': "Incorrect 2-space indentation in CSS",
-         'exclude': set(['static/styles/thirdparty-fonts.css']),
+         'exclude': set(['static/third/thirdparty-fonts.css']),
          'strip': '\n'},
         {'pattern': '{\w',
          'description': "Missing whitespace after '{' in CSS (should be newline)."},
diff --git a/zproject/settings.py b/zproject/settings.py
index 4039fd60c9..7f55afb95f 100644
--- a/zproject/settings.py
+++ b/zproject/settings.py
@@ -675,7 +675,7 @@ PIPELINE = {
                 'third/zocial/zocial.css',
                 'styles/portico.css',
                 'styles/pygments.css',
-                'styles/thirdparty-fonts.css',
+                'third/thirdparty-fonts.css',
                 'styles/fonts.css',
             ),
             'output_filename': 'min/portico.css'
@@ -703,7 +703,7 @@ PIPELINE = {
                 'styles/right-sidebar.css',
                 'styles/lightbox.css',
                 'styles/pygments.css',
-                'styles/thirdparty-fonts.css',
+                'third/thirdparty-fonts.css',
                 'styles/media.css',
                 'styles/typing_notifications.css',
                 # We don't want fonts.css on QtWebKit, so its omitted here
@@ -727,7 +727,7 @@ PIPELINE = {
                 'styles/right-sidebar.css',
                 'styles/lightbox.css',
                 'styles/pygments.css',
-                'styles/thirdparty-fonts.css',
+                'third/thirdparty-fonts.css',
                 'styles/fonts.css',
                 'styles/media.css',
                 'styles/typing_notifications.css',