diff --git a/html/includes/print-alerts.inc.php b/html/includes/print-alerts.inc.php
index a6a8c98801..2a6d71a471 100644
--- a/html/includes/print-alerts.inc.php
+++ b/html/includes/print-alerts.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $hostname = gethostbyid($alert_entry['device_id']);
+$alert_state = $alert_entry['state'];
 
 echo('<tr>
   <td>
@@ -14,8 +15,37 @@ if (!isset($alert_entry['device'])) {
   </td>");
 }
 
-echo("<td>".htmlspecialchars($alert_entry['name']) . "</td>
+echo("<td>".htmlspecialchars($alert_entry['name']) . "</td>");
 
-</tr>");
+if ($alert_state!='') {
+    if ($alert_state=='0') {
+        $glyph_icon = 'ok';
+        $glyph_color = 'green';
+        $text = 'Ok';
+    }
+    elseif ($alert_state=='1') {
+        $glyph_icon = 'remove';
+        $glyph_color = 'red';
+        $text = 'Alert';
+    }
+    elseif ($alert_state=='2') {
+        $glyph_icon = 'info-sign';
+        $glyph_color = 'lightgrey';
+        $text = 'Ack';
+    }
+    elseif ($alert_state=='3') {
+        $glyph_icon = 'arrow-down';
+        $glyph_color = 'orange';
+        $text = 'Worse';
+    }
+    elseif ($alert_state=='4') {
+        $glyph_icon = 'arrow-up';
+        $glyph_color = 'khaki';
+        $text = 'Better';
+    }
+    echo("<td><b><span class='glyphicon glyphicon-".$glyph_icon."' style='color:".$glyph_color."'></span> $text</b></td>");
+}
+
+echo("</tr>");
 
 ?>
diff --git a/html/pages/alert-log.inc.php b/html/pages/alert-log.inc.php
index fc9eacaa02..812097da54 100644
--- a/html/pages/alert-log.inc.php
+++ b/html/pages/alert-log.inc.php
@@ -60,7 +60,7 @@ if ($_SESSION['userlevel'] >= '5')
 }
 $count_query = "SELECT COUNT(time_logged) $query";
 $count = dbFetchCell($count_query,$param);
-$full_query = "SELECT D.device_id,name,time_logged,DATE_FORMAT(time_logged, '%D %b %Y %T') as humandate $query LIMIT $start,$numresults";
+$full_query = "SELECT D.device_id,name,state,time_logged,DATE_FORMAT(time_logged, '%D %b %Y %T') as humandate $query LIMIT $start,$numresults";
             echo('<div class="panel panel-default panel-condensed">
                 <div class="panel-heading">
                     <div class="row">
@@ -112,4 +112,4 @@ echo('</table>
         $('#page_number').val(page);
         $('#result_form').submit();
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/html/pages/front/default.php b/html/pages/front/default.php
index 2e6e34c268..12bdc52e90 100644
--- a/html/pages/front/default.php
+++ b/html/pages/front/default.php
@@ -199,10 +199,10 @@ if ($config['enable_syslog'])
   if ($_SESSION['userlevel'] >= '10')
   {
     $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %T') as humandate  FROM `eventlog` ORDER BY `datetime` DESC LIMIT 0,15";
-    $alertquery = "SELECT devices.device_id,name,time_logged FROM alert_log LEFT JOIN devices ON alert_log.device_id=devices.device_id RIGHT JOIN alert_rules ON alert_log.rule_id=alert_rules.id ORDER BY `time_logged` DESC LIMIT 0,15";
+    $alertquery = "SELECT devices.device_id,name,state,time_logged FROM alert_log LEFT JOIN devices ON alert_log.device_id=devices.device_id RIGHT JOIN alert_rules ON alert_log.rule_id=alert_rules.id ORDER BY `time_logged` DESC LIMIT 0,15";
   } else {
     $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %T') as humandate  FROM `eventlog` AS E, devices_perms AS P WHERE E.host = P.device_id AND P.user_id = " . $_SESSION['user_id'] . " ORDER BY `datetime` DESC LIMIT 0,15";
-    $alertquery = "SELECT devices.device_id,name,time_logged FROM alert_log LEFT JOIN devices ON alert_log.device_id=devices.device_id RIGHT JOIN alert_rules ON alert_log.rule_id=alert_rules.id RIGHT JOIN devices_perms ON alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " ORDER BY `time_logged` DESC LIMIT 0,15";
+    $alertquery = "SELECT devices.device_id,name,state,time_logged FROM alert_log LEFT JOIN devices ON alert_log.device_id=devices.device_id RIGHT JOIN alert_rules ON alert_log.rule_id=alert_rules.id RIGHT JOIN devices_perms ON alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " ORDER BY `time_logged` DESC LIMIT 0,15";
   }
 
   $data = mysql_query($query);