diff --git a/public/styles/normal.css b/public/styles/normal.css
index 410d733..1cf8ea1 100644
--- a/public/styles/normal.css
+++ b/public/styles/normal.css
@@ -165,3 +165,11 @@ margin: 0 0 0px;
  border: 1px solid #DDD;
 
 }
+
+dl.help dt {
+    margin-top: 1em;
+}
+
+dl.help dd {
+    padding: 0.5em;
+}
diff --git a/source/webui/templates/fragments/icon-help.tpl b/source/webui/templates/fragments/icon-help.tpl
index 0899cc0..2027795 100644
--- a/source/webui/templates/fragments/icon-help.tpl
+++ b/source/webui/templates/fragments/icon-help.tpl
@@ -1,16 +1,12 @@
-<dl>
-<dt><img src="{$base_uri}images/Status_Icons/tick-circle.png" /><b>&nbsp;Resolved</b></dt>
-<dd>The service is operating normally</dd>
-</dl>
-<dl>
-<dt><img src="{$base_uri}images/Status_Icons/traffic-cone.png" /><b>&nbsp;Maintenance</b></dt>
-<dd>The service is undergoing scheduled maintenance</dd>
-</dl>
-<dl>
-<dt><img src="{$base_uri}images/Status_Icons/exclamation.png" /><b>&nbsp;Minor/Significant</b></dt>
-<dd>The service is experiencing minor issues affecting some customers or significant issues affecting many customers.</dd>
-</dl>
-<dl>
-<dt><img src="{$base_uri}images/Status_Icons/cross-circle.png" /><b>&nbsp;Major</b></dt>
-<dd>The service is experiencing a major outage affecting all customers.</dd>
+{$statuses=StatusBoard_Status::available()}
+<dl class="help">
+    {foreach from=$statuses item=status}
+        <dt>
+            {include file="fragments/image-status-icon.tpl"}
+            <strong>{StatusBoard_Status::name($status)}</strong>
+        </dt>
+        <dd>
+            {StatusBoard_Status::description($status)}
+        </dd>
+    {/foreach}
 </dl>
\ No newline at end of file
diff --git a/source/webui/templates/fragments/image-status-icon.tpl b/source/webui/templates/fragments/image-status-icon.tpl
new file mode 100644
index 0000000..fa34248
--- /dev/null
+++ b/source/webui/templates/fragments/image-status-icon.tpl
@@ -0,0 +1,18 @@
+{switch $status}
+    {case StatusBoard_Status::STATUS_Resolved}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/tick-circle.png"}
+    {/case}
+    {case StatusBoard_Status::STATUS_Maintenance}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/traffic-cone.png"}
+    {/case}
+    {case StatusBoard_Status::STATUS_Minor}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/exclamation.png"}
+    {/case}
+    {case StatusBoard_Status::STATUS_Significant}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/exclamation.png"}
+    {/case}
+    {case StatusBoard_Status::STATUS_Major}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/cross-circle.png"}
+    {/case}
+{/switch}
+<img src="{$img_src}" alt="{StatusBoard_Status::name($status)}" />
\ No newline at end of file
diff --git a/source/webui/templates/fragments/site-status.tpl b/source/webui/templates/fragments/site-status.tpl
index c1f667a..3ddff08 100644
--- a/source/webui/templates/fragments/site-status.tpl
+++ b/source/webui/templates/fragments/site-status.tpl
@@ -1,20 +1,3 @@
-{switch $status}
-    {case StatusBoard_Status::STATUS_Resolved}
-        {assign var=img_src value="{$base_uri}images/Status_Icons/tick-circle.png"}
-    {/case}
-    {case StatusBoard_Status::STATUS_Maintenance}
-        {assign var=img_src value="{$base_uri}images/Status_Icons/traffic-cone.png"}
-    {/case}
-    {case StatusBoard_Status::STATUS_Minor}
-        {assign var=img_src value="{$base_uri}images/Status_Icons/exclamation.png"}
-    {/case}
-    {case StatusBoard_Status::STATUS_Significant}
-        {assign var=img_src value="{$base_uri}images/Status_Icons/exclamation.png"}
-    {/case}
-    {case StatusBoard_Status::STATUS_Major}
-        {assign var=img_src value="{$base_uri}images/Status_Icons/cross-circle.png"}
-    {/case}
-{/switch}
 <a href="{$base_uri}status/service/{$service->id}/id/{$site->id}/{if $start}start/{$start}/{/if}{if $end}end/{$end}/{/if}" class="" rel="popover" data-content="{include file="fragments/site-status-details.tpl"}" data-original-title="{StatusBoard_Status::name($status)|escape:html}">
-    <img src="{$img_src}" />
+    {include file="fragments/image-status-icon.tpl"}
 </a>
\ No newline at end of file