diff --git a/src/views/diagnosis/diagnosis_show.ms b/src/views/diagnosis/diagnosis_show.ms
index 820ac417..1b7382f8 100644
--- a/src/views/diagnosis/diagnosis_show.ms
+++ b/src/views/diagnosis/diagnosis_show.ms
@@ -19,11 +19,11 @@
         <h2 class="panel-title" style="display: inline-block; margin-right: 10px;">
         <a data-toggle="collapse" href="#category-{{id}}">{{ description }}</a>
         </h2>
-        {{#if noIssues}}<span class="label label-success">{{t 'everything_good'}}</span>{{/if}}
+        {{#if noIssues}}{{#if items}}<span class="label label-success">{{t 'everything_good'}}</span>{{/if}}{{/if}}
         {{#if errors}}<span class="label label-danger">{{t 'errors' errors }}</span>{{/if}}
         {{#if warnings}}<span class="label label-warning">{{t 'warnings' warnings }}</span>{{/if}}
         {{#if ignored}}<span class="label label-default">{{t 'ignored' ignored }}</span>{{/if}}
-        <button class="btn btn-sm btn-info pull-right" data-action="rerun-diagnosis" data-category="{{ id }}"><span class="fa-fw fa-refresh"></span> {{t 'rerun_diagnosis'}}</button>
+        <button class="btn btn-sm {{#if items}}btn-info{{else}}btn-success{{/if}} pull-right" data-action="rerun-diagnosis" data-category="{{ id }}"><span class="fa-fw fa-refresh"></span> {{t 'rerun_diagnosis'}}</button>
     </div>
     <div class="panel-body collapse {{#if errors}}in{{/if}}" id="category-{{id}}">
     <ul class="list-group" style="margin-bottom: 0px">