diff --git a/src/root/build.tt b/src/root/build.tt
index 20ecb04e..fb6cf94c 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -89,6 +89,12 @@
                                     <th>Build ID:</th>
                                     <td>[% build.id %]</td>
                                   </tr>
+                                  <tr>
+                                    <th>Status:</th>
+                                    <td>
+                                        [% INCLUDE renderStatus build=build icon=0 %]
+                                    </td>
+                                  </tr>
                                   [% IF build.releasename %]
                                     <tr>
                                       <th>Release name:</th>
@@ -100,12 +106,6 @@
                                             <td><tt>[% build.nixname %]</tt></td>
                                           </tr>
                                   [% END %]
-                                  <tr>
-                                    <th>Status:</th>
-                                    <td>
-                                        [% INCLUDE renderStatus build=build %]
-                                    </td>
-                                  </tr>
                                   <tr>
                                     <th>System:</th>
                                     <td><tt>[% build.system %]</tt></td>
diff --git a/src/root/common.tt b/src/root/common.tt
index e598985f..1f254866 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -263,7 +263,7 @@
 [% BLOCK renderStatus %]
   [% IF build.finished %]
     [% buildstatus = build.buildstatus %]
-    [% INCLUDE renderBuildStatusIcon size=16 %]
+    [% IF icon; INCLUDE renderBuildStatusIcon size=16; END %]
     [% IF buildstatus == 0 %]
       <strong>Success</strong>
     [% ELSIF buildstatus == 1 %]