diff --git a/entries/kinds.py b/entries/kinds.py
index f0cade7..e55ddc6 100644
--- a/entries/kinds.py
+++ b/entries/kinds.py
@@ -25,41 +25,41 @@ class Entry:
 
 Note = Entry(
     id='note',
-    icon='fa fa-paper-plane',
+    icon='fas fa-paper-plane',
     plural='notes',
 )
 
 
 Article = Entry(
     id='article',
-    icon='fa fa-file-text',
+    icon='fas fa-file-alt',
     plural='articles',
     slug=True,
 )
 
 Photo = Entry(
     id='photo',
-    icon='fa fa-camera',
+    icon='fas fa-camera',
     plural='photos',
 )
 
 Reply = Entry(
     id='reply',
-    icon='fa fa-comment',
+    icon='fas fa-comment',
     plural='replies',
     on_home=False,
 )
 
 Like = Entry(
     id='like',
-    icon='fa fa-heart',
+    icon='fas fa-heart',
     plural='likes',
     on_home=False,
 )
 
 Repost = Entry(
     id='repost',
-    icon='fa fa-retweet',
+    icon='fas fa-retweet',
     plural='reposts',
 )
 
diff --git a/entries/templates/entries/h-entry.html b/entries/templates/entries/h-entry.html
index 7dcf043..a92baa2 100644
--- a/entries/templates/entries/h-entry.html
+++ b/entries/templates/entries/h-entry.html
@@ -25,17 +25,17 @@
 		</a>
 		<a class="u-uid u-url" href="{{ entry.url }}">
 			<time class="dt-published" datetime="{{ entry.published.isoformat }}">
-				<i class="fa fa-calendar"></i>
+				<i class="fas fa-calendar"></i>
 				{{ entry.published | naturaltime }}
 			</time>
 		</a>
 		{% if entry.updated != entry.published %}
 		<time class="dt-updated" datetime="{{ entry.updated.isoformat }}">
-			<i class="fa fa-pencil"></i>
+			<i class="fas fa-pencil-alt"></i>
 			{{ entry.updated | naturaltime }}
 		</time>
 		{% shortlink entry as short %}<a class="u-url" href="{{ short }}">
-			<i class="fa fa-link"></i>
+			<i class="fas fa-link"></i>
 			{{ short | friendly_url }}
 		</a>
 		{% endif %}
@@ -45,7 +45,7 @@
 	<div class="card-footer">
 		{% for c in entry.cats.all %}
 		<a class="p-category" href="{{ c.url }}">
-			<i class="fa fa-paw"></i>
+			<i class="fas fa-paw"></i>
 			{{ c.name }}
 		</a>
 		{% endfor %}
diff --git a/home/templates/home/index.html b/home/templates/home/index.html
index 732099e..dc3e8f4 100644
--- a/home/templates/home/index.html
+++ b/home/templates/home/index.html
@@ -24,7 +24,7 @@
 		<div class="card-footer">
 			<ul class="profiles">
 				<li><a class="u-email" rel="me" href="mailto:{{ user.email }}">
-						<i class="fa fa-envelope"></i> {{ user.email }}
+						<i class="fas fa-envelope"></i> {{ user.email }}
 				</a></li>
 				{% if user.xmpp %}<li><a class="u-impp" rel="me" href="xmpp:{{ user.xmpp }}">
 						<i class="openwebicons-xmpp"></i> {{ user.xmpp }}
@@ -36,7 +36,7 @@
 			<ul class="profiles">
 				{% for key in user.keys.all %}<li>
 					<a class="u-key" href="{{ key.file.url }}">
-						<i class="fa fa-key"></i> {{ key.pretty_print }}
+						<i class="fas fa-key"></i> {{ key.pretty_print }}
 					</a>
 				</li>
 				{% endfor %}
diff --git a/lemonauth/templates/lemonauth/indie.html b/lemonauth/templates/lemonauth/indie.html
index d13a48c..86e0b1d 100644
--- a/lemonauth/templates/lemonauth/indie.html
+++ b/lemonauth/templates/lemonauth/indie.html
@@ -14,9 +14,9 @@
 			{% if app %}{{ app.name | first }}{% endif %}
 			{% if app %}({% endif %}<a class="u-url code{% if not app %} p-name{% endif %}" href="{{ params.client_id }}">{{ params.client_id }}</a>{% if app %}){% endif %}?
 			{% if verified %}
-			<i class="fa fa-check-circle verified-success" data-tooltip data-theme="success" data-html="#verified-success"></i>
+			<i class="fas fa-check-circle verified-success" data-tooltip data-theme="success" data-html="#verified-success"></i>
 			{% else %}
-			<i class="fa fa-question-circle verified-warning" data-tooltip data-theme="warning" data-html="#verified-warning"></i>
+			<i class="fas fa-question-circle verified-warning" data-tooltip data-theme="warning" data-html="#verified-warning"></i>
 			{% endif %}
 		</h4>
 
@@ -39,7 +39,7 @@
 
 		<div class="card-footer">
 			<button class="btn btn-success" type="submit">
-				<i class="fa fa-check"></i>
+				<i class="fas fa-check"></i>
 				approve
 			</button>
 		</div>
diff --git a/lemonauth/templates/lemonauth/login.html b/lemonauth/templates/lemonauth/login.html
index d29e864..6bf2bf1 100644
--- a/lemonauth/templates/lemonauth/login.html
+++ b/lemonauth/templates/lemonauth/login.html
@@ -42,7 +42,7 @@
 
 		<div class="card-footer">
 			<button class="btn btn-primary" type="submit">
-				<i class="fa fa-sign-in"></i>
+				<i class="fas fa-sign-in-alt"></i>
 				log in
 			</button>
 		</div>
diff --git a/lemoncurry/templates/lemoncurry/layout.html b/lemoncurry/templates/lemoncurry/layout.html
index 58d7dbb..e8171da 100644
--- a/lemoncurry/templates/lemoncurry/layout.html
+++ b/lemoncurry/templates/lemoncurry/layout.html
@@ -37,7 +37,7 @@
 		<link rel="stylesheet" type="text/stylus" href="{% static 'lemoncurry/css/layout.styl' %}" />
 		{% block styles %}{% endblock %}
 		{% endcompress %}
-		<script type="text/javascript" src="https://use.fontawesome.com/4fbab4ae27.js"></script>
+		<script type="text/javascript" defer src="https://use.fontawesome.com/releases/v5.0.0/js/all.js"></script>
 		{% analytical_head_bottom %}
 	</head>
 	<body>
diff --git a/lemoncurry/templatetags/lemoncurry_tags.py b/lemoncurry/templatetags/lemoncurry_tags.py
index 9295f34..e92da3b 100644
--- a/lemoncurry/templatetags/lemoncurry_tags.py
+++ b/lemoncurry/templatetags/lemoncurry_tags.py
@@ -52,12 +52,12 @@ def nav_left(request):
 def nav_right(request):
     if request.user.is_authenticated():
         items = (
-            MenuItem(label='admin', icon='fa fa-gear', url='admin:index'),
-            MenuItem(label='log out', icon='fa fa-sign-out', url='lemonauth:logout'),
+            MenuItem(label='admin', icon='fas fa-cog', url='admin:index'),
+            MenuItem(label='log out', icon='fas fa-sign-out-alt', url='lemonauth:logout'),
         )
     else:
         items = (
-            MenuItem(label='log in', icon='fa fa-sign-in', url='lemonauth:login'),
+            MenuItem(label='log in', icon='fas fa-sign-in-alt', url='lemonauth:login'),
         )
     return {'items': items, 'request': request}