diff --git a/src/root/Makefile.am b/src/root/Makefile.am
index ddfd8c65..4ea4f85e 100644
--- a/src/root/Makefile.am
+++ b/src/root/Makefile.am
@@ -10,8 +10,9 @@ STATIC = \
 
 FLOT = flot-0.8.3.zip
 BOOTSTRAP = bootstrap-4.3.1-dist.zip
+FONTAWESOME = fontawesome-free-5.10.2-web.zip
 
-ZIPS = $(FLOT) $(BOOTSTRAP)
+ZIPS = $(FLOT) $(BOOTSTRAP) $(FONTAWESOME)
 
 EXTRA_DIST = $(TEMPLATES) $(STATIC) $(ZIPS)
 
@@ -22,9 +23,14 @@ all:
 	mkdir -p $(srcdir)/static/js
 	unzip -u -d $(srcdir)/static $(BOOTSTRAP)
 	unzip -u -d $(srcdir)/static/js $(FLOT)
+	unzip -u -d $(srcdir)/static $(FONTAWESOME)
 
 install-data-local: $(ZIPS)
 	mkdir -p $(hydradir)/static/js
 	cp -prvd $(srcdir)/static/js/* $(hydradir)/static/js
 	mkdir -p $(hydradir)/static/bootstrap
 	cp -prvd $(srcdir)/static/$(basename $(BOOTSTRAP))/* $(hydradir)/static/bootstrap
+	mkdir -p $(hydradir)/static/fontawesome/css
+	cp -prvd $(srcdir)/static/$(basename $(FONTAWESOME))/css/all.css $(hydradir)/static/fontawesome/css
+	mkdir -p $(hydradir)/static/fontawesome/webfonts
+	cp -prvd $(srcdir)/static/$(basename $(FONTAWESOME))/webfonts/* $(hydradir)/static/fontawesome/webfonts
diff --git a/src/root/edit-jobset.tt b/src/root/edit-jobset.tt
index 2b26558a..66eef42a 100644
--- a/src/root/edit-jobset.tt
+++ b/src/root/edit-jobset.tt
@@ -9,7 +9,7 @@
 [% BLOCK renderJobsetInput %]
   <tr class="input [% extraClass %]" [% IF id %]id="[% id %]"[% END %]>
     <td>
-      <button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="icon-trash icon-white"></i></button>
+      <button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="fas fa-trash"></i></button>
     </td>
     <td>
       <input type="text" id="[% baseName %]-name" name="[% baseName %]-name" [% HTML.attributes(value => input.name) %]/>
@@ -51,7 +51,7 @@
         [% INCLUDE renderJobsetInput input=input baseName="input-$input.name" %]
       [% END %]
       <tr>
-        <td colspan="4" style="text-align: center;"><button type="button" class="add-input btn btn-success"><i class="icon-plus icon-white"></i> Add a new input</button></td>
+        <td colspan="4" style="text-align: center;"><button type="button" class="add-input btn btn-success"><i class="fas fa-plus"></i> Add a new input</button></td>
       </tr>
     </tbody>
   </table>
@@ -182,7 +182,7 @@
 
   [% INCLUDE renderJobsetInputs %]
 
-  <button id="submit-jobset" type="submit" class="btn btn-primary"><i class="icon-ok icon-white"></i> [%IF !edit %]Create jobset[% ELSE %]Apply changes[% END %]</button>
+  <button id="submit-jobset" type="submit" class="btn btn-primary"><i class="fas fa-check"></i> [%IF !edit %]Create jobset[% ELSE %]Apply changes[% END %]</button>
 
   <table style="display: none">
     [% INCLUDE renderJobsetInput input="" extraClass="template" id="input-template" baseName="input-template" %]
diff --git a/src/root/edit-project.tt b/src/root/edit-project.tt
index 4d7f82a4..eda5b3d3 100644
--- a/src/root/edit-project.tt
+++ b/src/root/edit-project.tt
@@ -71,7 +71,7 @@
   </div>
 
   <button id="submit-project" type="submit" class="btn btn-primary">
-    <i class="icon-ok icon-white"></i>
+    <i class="fas fa-check"></i>
     [%IF create %]Create project[% ELSE %]Apply changes[% END %]
   </button>
 
diff --git a/src/root/fontawesome-free-5.10.2-web.zip b/src/root/fontawesome-free-5.10.2-web.zip
new file mode 100644
index 00000000..35aa5b2a
Binary files /dev/null and b/src/root/fontawesome-free-5.10.2-web.zip differ
diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt
index b43bf410..74d2c7ff 100644
--- a/src/root/jobset-eval.tt
+++ b/src/root/jobset-eval.tt
@@ -2,7 +2,7 @@
 [% PROCESS common.tt %]
 
 <div class="btn-group pull-right">
-  <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-white icon-eye-open"></i> Compare to...</a>
+  <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><i class="fas fa-eye"></i> Compare to...</a>
   <ul class="dropdown-menu">
     <li><a href="?">Preceding evaluation in this jobset</a></li>
     <li class="divider"></li>
diff --git a/src/root/layout.tt b/src/root/layout.tt
index 74af3dcb..4109585e 100644
--- a/src/root/layout.tt
+++ b/src/root/layout.tt
@@ -17,6 +17,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+    <link href="[% c.uri_for("/static/fontawesome/css/all.css") %]" rel="stylesheet" />
     <script type="text/javascript" src="[% c.uri_for("/static/js/popper.min.js") %]"></script>
     <script type="text/javascript" src="[% c.uri_for("/static/bootstrap/js/bootstrap.min.js") %]"></script>
     <link href="[% c.uri_for("/static/bootstrap/css/bootstrap.min.css") %]" rel="stylesheet" />
diff --git a/src/root/news.tt b/src/root/news.tt
index bb837bdf..1380f48c 100644
--- a/src/root/news.tt
+++ b/src/root/news.tt
@@ -30,7 +30,7 @@
   </div>
 
   <button type="submit" class="btn btn-primary">
-    <i class="icon-ok icon-white"></i>
+    <i class="fas fa-check"></i>
     Post
   </button>
 </form>
diff --git a/src/root/user.tt b/src/root/user.tt
index e1515b53..3535bf26 100644
--- a/src/root/user.tt
+++ b/src/root/user.tt
@@ -100,18 +100,18 @@
   [% END %]
 
   <button id="submit-user" class="btn btn-primary">
-    <i class="icon-ok icon-white"></i>
+    <i class="fas fa-check"></i>
     [%IF create %]Create[% ELSE %]Apply changes[% END %]
   </button>
   [% IF !create && c.check_user_roles('admin') && user.type == 'hydra' %]
     <button id="reset-password" class="btn btn-warning">
-      <i class="icon-trash icon-white"></i>
+      <i class="fas fa-lock"></i>
       Reset password
     </button>
   [% END %]
   [% IF !create %]
     <button id="delete-user" class="btn btn-danger">
-      <i class="icon-trash icon-white"></i>
+      <i class="fas fa-trash"></i>
       Delete this user
     </button>
   [% END %]
diff --git a/src/root/users.tt b/src/root/users.tt
index 6d7fcc7a..19d96d11 100644
--- a/src/root/users.tt
+++ b/src/root/users.tt
@@ -25,7 +25,7 @@
 </table>
 
 <a class="btn btn-primary" href="[% c.uri_for(c.controller('Root').action_for('register')) %]">
-  <i class="icon-plus"></i> Add a new user
+  <i class="fas fa-plus"></i> Add a new user
 </a>
 
 [% END %]