diff --git a/HISTORY.rst b/HISTORY.rst
index a24e0c0d7f..4eca3175a4 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -159,6 +159,7 @@
   from 32 to 96 characters.
 - Add file_size and datetime fields to the DocumentPageCachedImage
   model.
+- Make icon classes file template based.
 
 3.0.3 (2018-08-17)
 ==================
diff --git a/docs/releases/3.1.rst b/docs/releases/3.1.rst
index fddc5f79aa..c0e9d2aa54 100644
--- a/docs/releases/3.1.rst
+++ b/docs/releases/3.1.rst
@@ -373,6 +373,9 @@ classes beyond the provide line chart.
 - Expose more document fields for use in smart links.
 - The size of the document type label field has been increased
   from 32 to 96 characters.
+- Add file_size and datetime fields to the DocumentPageCachedImage
+  model.
+- Make icon classes file template based.
 
 Removals
 --------
diff --git a/mayan/apps/appearance/classes.py b/mayan/apps/appearance/classes.py
index 77e977d8a6..53ee859a7f 100644
--- a/mayan/apps/appearance/classes.py
+++ b/mayan/apps/appearance/classes.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.template import Context, Template
+from django.template.loader import get_template
 
 
 class IconDriver(object):
@@ -17,27 +17,27 @@ class IconDriver(object):
 
 class FontAwesomeDriver(IconDriver):
     name = 'fontawesome'
-    template_text = '<i class="hidden-xs hidden-sm hidden-md fa fa-{{ symbol }}"></i>'
+    template_name = 'appearance/icons/font_awesome_symbol.html'
 
     def __init__(self, symbol):
         self.symbol = symbol
 
     def render(self):
-        return Template(self.template_text).render(
-            context=Context({'symbol': self.symbol})
+        return get_template(self.template_name).render(
+            context={'symbol': self.symbol}
         )
 
 
 class FontAwesomeCSSDriver(IconDriver):
     name = 'fontawesomecss'
-    template_text = '<i class="hidden-xs hidden-sm hidden-md fa {{ css_classes }}"></i>'
+    template_name = 'appearance/icons/font_awesome_css.html'
 
     def __init__(self, css_classes):
         self.css_classes = css_classes
 
     def render(self):
-        return Template(self.template_text).render(
-            context=Context({'css_classes': self.css_classes})
+        return get_template(self.template_name).render(
+            context={'css_classes': self.css_classes}
         )
 
 
diff --git a/mayan/apps/appearance/templates/appearance/icons/font_awesome_css.html b/mayan/apps/appearance/templates/appearance/icons/font_awesome_css.html
new file mode 100644
index 0000000000..5975cc6d66
--- /dev/null
+++ b/mayan/apps/appearance/templates/appearance/icons/font_awesome_css.html
@@ -0,0 +1 @@
+<i class="hidden-xs hidden-sm hidden-md fa {{ css_classes }}"></i>
diff --git a/mayan/apps/appearance/templates/appearance/icons/font_awesome_symbol.html b/mayan/apps/appearance/templates/appearance/icons/font_awesome_symbol.html
new file mode 100644
index 0000000000..8ddd586fdd
--- /dev/null
+++ b/mayan/apps/appearance/templates/appearance/icons/font_awesome_symbol.html
@@ -0,0 +1 @@
+<i class="hidden-xs hidden-sm hidden-md fa fa-{{ symbol }}"></i>