diff --git a/README.md b/README.md
index 0fc19aee..0f970df4 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,7 @@ on the Nix package manager. For more information, see the
 
 For development see [hacking instructions]
 (http://nixos.org/hydra/manual/#chap-hacking).
+
+---
+
+Icons provided free by [EmojiOne](http://emojione.com).
diff --git a/src/root/common.tt b/src/root/common.tt
index 043f84c0..4b0ca76b 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -192,28 +192,28 @@ BLOCK renderBuildStatusIcon;
   buildstatus = buildstatus != undef ? buildstatus : build.buildstatus;
   IF finished;
     IF buildstatus == 0 %]
-      <img src="[% c.uri_for("/static/images/checkmark_${size}.png") %]" title="Succeeded" alt="Succeeded" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-check-2714.svg") %]" height="[% size %]" width="[% size %]" title="Succeeded" alt="Succeeded" class="build-status" />
     [% ELSIF buildstatus == 1 %]
-      <img src="[% c.uri_for("/static/images/error_${size}.png") %]" title="Failed" alt="Failed" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="[% size %]" width="[% size %]" title="Failed" alt="Failed" class="build-status" />
     [% ELSIF buildstatus == 2 %]
-      <img src="[% c.uri_for("/static/images/dependency_${size}.png") %]" title="Dependency failed" alt="Dependency failed" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-gray-x-2716.svg") %]" height="[% size %]" width="[% size %]" title="Dependency failed" alt="Dependency failed" class="build-status" />
     [% ELSIF buildstatus == 3 || buildstatus == 9 %]
-      <img src="[% c.uri_for("/static/images/warning_${size}.png") %]" title="Aborted" alt="Aborted" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-stopsign-1f6d1.svg") %]" height="[% size %]" width="[% size %]" title="Aborted" alt="Aborted" class="build-status" />
     [% ELSIF buildstatus == 4 %]
-      <img src="[% c.uri_for("/static/images/forbidden_${size}.png") %]" title="Cancelled" alt="Cancelled" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-stopsign-1f6d1.svg") %]" height="[% size %]" width="[% size %]" title="Cancelled" alt="Cancelled" class="build-status" />
     [% ELSIF buildstatus == 6 %]
-      <img src="[% c.uri_for("/static/images/error_${size}.png") %]" title="Failed with output" alt="Failed with output" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="[% size %]" width="[% size %]" title="Failed with output" alt="Failed with output" class="build-status" />
     [% ELSIF buildstatus == 7 %]
-      <img src="[% c.uri_for("/static/images/warning_${size}.png") %]" title="Timed out" alt="Timed out" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="[% size %]" width="[% size %]" title="Timed out" alt="Timed out" class="build-status" />
     [% ELSIF buildstatus == 10 %]
-      <img src="[% c.uri_for("/static/images/warning_${size}.png") %]" title="Log limit exceeded" alt="Log limit exceeded" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="[% size %]" width="[% size %]" title="Log limit exceeded" alt="Log limit exceeded" class="build-status" />
     [% ELSIF buildstatus == 11 %]
-      <img src="[% c.uri_for("/static/images/warning_${size}.png") %]" title="Output size limit exceeded" alt="Output size limit exceeded" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="[% size %]" width="[% size %]" title="Output size limit exceeded" alt="Output size limit exceeded" class="build-status" />
     [% ELSE %]
-      <img src="[% c.uri_for("/static/images/error_${size}.png") %]" title="Failed" alt="Failed" class="build-status" />
+      <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="[% size %]" width="[% size %]" title="Failed" alt="Failed" class="build-status" />
     [% END;
   ELSE %]
-    <img src="[% c.uri_for("/static/images/help_${size}.png") %]" title="Queued" alt="Queued" class="build-status" />
+    <img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="[% size %]" width="[% size %]" title="Queued" alt="Queued" class="build-status" />
   [% END;
 END;
 
@@ -514,13 +514,13 @@ BLOCK renderJobsetOverview %]
       <tr>
         <td>
           [% IF j.get_column('nrscheduled') > 0 %]
-            <img src="[% c.uri_for("/static/images/help_16.png") %]" alt="Scheduled" />
+            <img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="16" width="16" title="Scheduled" alt="Scheduled" />
           [% ELSIF j.get_column('nrfailed') == 0  %]
-            <img src="[% c.uri_for("/static/images/checkmark_16.png") %]" alt="Succeeded" />
+            <img src="[% c.uri_for("/static/images/emojione-check-2714.svg") %]" height="16" width="16" title="Succeeded" alt="Succeeded" />
           [% ELSIF j.get_column('nrfailed') > 0 && j.get_column('nrsucceeded') > 0 %]
-            <img src="[% c.uri_for("/static/images/error_some_16.png") %]" alt="Some Failed" />
+            <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="16" width="16" title="Some Failed" alt="Some Failed" />
           [% ELSE %]
-            <img src="[% c.uri_for("/static/images/error_16.png") %]" alt="All Failed" />
+            <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="16" width="16" title="All Failed" alt="All Failed" />
           [% END %]
         </td>
         <td><span class="[% IF !j.enabled %]disabled-jobset[% END %] [%+ IF j.hidden %]hidden-jobset[% END %]">[% IF showProject; INCLUDE renderFullJobsetName project=j.get_column('project') jobset=j.name inRow=1; ELSE; INCLUDE renderJobsetName project=j.get_column('project') jobset=j.name inRow=1; END %]</span></td>
diff --git a/src/root/static/images/emojione-check-2714.svg b/src/root/static/images/emojione-check-2714.svg
new file mode 100644
index 00000000..281e0f3c
--- /dev/null
+++ b/src/root/static/images/emojione-check-2714.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64"><path fill="#61B329" d="M55.999 2L18.8 42.909 8 34.729H2L18.8 62 62 2z"/></svg>
diff --git a/src/root/static/images/emojione-gray-x-2716.svg b/src/root/static/images/emojione-gray-x-2716.svg
new file mode 100644
index 00000000..21e78fbe
--- /dev/null
+++ b/src/root/static/images/emojione-gray-x-2716.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64"><path fill="#4D5357" d="M62 10.571L53.429 2 32 23.429 10.571 2 2 10.571 23.429 32 2 53.429 10.571 62 32 40.571 53.429 62 62 53.429 40.571 32z"/></svg>
\ No newline at end of file
diff --git a/src/root/static/images/emojione-question-2754.svg b/src/root/static/images/emojione-question-2754.svg
new file mode 100644
index 00000000..5404b420
--- /dev/null
+++ b/src/root/static/images/emojione-question-2754.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64"><g fill-rule="evenodd" clip-rule="evenodd" fill="#A6AEB0"><path d="M30.249 2.065C18.612 2.789 12.531 9.379 12 21.296h11.739c.147-4.128 2.451-7.214 6.741-7.669 4.211-.447 8.206.556 9.416 3.435 1.307 3.11-1.627 6.724-3.022 8.241-2.582 2.813-6.776 4.865-8.95 7.9-2.131 2.974-2.51 6.887-2.674 11.676h10.346c.145-3.062.349-5.995 1.742-7.898 2.266-3.092 5.65-4.541 8.486-6.983 2.709-2.334 5.559-5.147 6.043-9.501C53.319 7.466 42.683 1.289 30.249 2.065z"/><ellipse cx="30.515" cy="55.567" rx="6.532" ry="6.433"/></g></svg>
\ No newline at end of file
diff --git a/src/root/static/images/emojione-red-x-274c.svg b/src/root/static/images/emojione-red-x-274c.svg
new file mode 100644
index 00000000..74dc8510
--- /dev/null
+++ b/src/root/static/images/emojione-red-x-274c.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64"><path fill="#FF5A79" d="M62 10.571L53.429 2 32 23.429 10.571 2 2 10.571 23.429 32 2 53.429 10.571 62 32 40.571 53.429 62 62 53.429 40.571 32z"/></svg>
\ No newline at end of file
diff --git a/src/root/static/images/emojione-stopsign-1f6d1.svg b/src/root/static/images/emojione-stopsign-1f6d1.svg
new file mode 100644
index 00000000..71a372e7
--- /dev/null
+++ b/src/root/static/images/emojione-stopsign-1f6d1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64"><path fill="#E9EDF2" d="M64 45.254L45.254 64H18.747L0 45.254V18.747L18.747 0h26.507L64 18.747z"/><path fill="#ED4C5C" d="M58 42.768L42.769 58H21.231L6 42.768V21.231L21.231 6h21.538L58 21.231z"/></svg>
\ No newline at end of file