diff --git a/app/Http/Controllers/Table/DeviceController.php b/app/Http/Controllers/Table/DeviceController.php
index 3d9fdc4e86..8e5e40a6eb 100644
--- a/app/Http/Controllers/Table/DeviceController.php
+++ b/app/Http/Controllers/Table/DeviceController.php
@@ -120,7 +120,7 @@ class DeviceController extends TableController
     {
         return [
             'extra' => $this->getLabel($device),
-            'status' => $device->statusName(),
+            'status' => $this->getStatus($device),
             'icon' => '<img src="' . asset($device->icon) . '" title="' . pathinfo($device->icon, PATHINFO_FILENAME) . '">',
             'hostname' => $this->getHostname($device),
             'metrics' => $this->getMetrics($device),
@@ -132,6 +132,22 @@ class DeviceController extends TableController
         ];
     }
 
+    /**
+     * Get the device up/down status
+     * @param Device $device
+     * @return string
+     */
+    private function getStatus($device)
+    {
+        if ($device->disabled == 1) {
+            return 'disabled';
+        } elseif ($device->status == 0) {
+            return 'down';
+        }
+
+        return 'up';
+    }
+
     /**
      * Get the status label class
      * @param Device $device
@@ -139,15 +155,20 @@ class DeviceController extends TableController
      */
     private function getLabel($device)
     {
-        if ($device->disabled) {
+        if ($device->disabled == 1) {
+            return 'blackbg';
+        } elseif ($device->ignore == 1) {
             return 'label-default';
-        }
+        } elseif ($device->status == 0) {
+            return 'label-danger';
+        } else {
+            $warning_time = \LibreNMS\Config::get('uptime_warning', 84600);
+            if ($device->uptime < $warning_time && $device->uptime != 0) {
+                return 'label-warning';
+            }
 
-        if ($device->ignore) {
-            return 'label-default';
+            return 'label-success';
         }
-
-        return $device->status ? 'label-success' : 'label-danger';
     }
 
     /**
diff --git a/app/Models/Device.php b/app/Models/Device.php
index 10a53622c6..0559bcb0ea 100644
--- a/app/Models/Device.php
+++ b/app/Models/Device.php
@@ -334,27 +334,6 @@ class Device extends BaseModel
         $this->save();
     }
 
-    /**
-     * @return string
-     */
-    public function statusName()
-    {
-        if ($this->disabled == 1) {
-            return 'disabled';
-        } elseif ($this->ignore == 1) {
-            return 'ignore';
-        } elseif ($this->status == 0) {
-            return 'down';
-        } else {
-            $warning_time = \LibreNMS\Config::get('uptime_warning', 84600);
-            if ($this->uptime < $warning_time && $this->uptime != 0) {
-                return 'warn';
-            }
-
-            return 'up';
-        }
-    }
-
     // ---- Accessors/Mutators ----
 
     public function getIconAttribute($icon)
diff --git a/includes/html/pages/device.inc.php b/includes/html/pages/device.inc.php
index 27e09acbdf..8923dda19f 100644
--- a/includes/html/pages/device.inc.php
+++ b/includes/html/pages/device.inc.php
@@ -32,7 +32,7 @@ if (device_permitted($vars['device']) || $permitted_by_port) {
     $component_count = $component->getComponentCount($device['device_id']);
 
     $alert_class = '';
-    if ($device['disabled'] == '1' || $device['ignore'] == '1') {
+    if ($device['disabled'] == '1') {
         $alert_class = 'alert-info';
     } elseif ($device['status'] == '0') {
         $alert_class = 'alert-danger';
diff --git a/includes/html/pages/devices.inc.php b/includes/html/pages/devices.inc.php
index ddacc9e756..9eff3e38dd 100644
--- a/includes/html/pages/devices.inc.php
+++ b/includes/html/pages/devices.inc.php
@@ -285,7 +285,7 @@ if ($format == "graph") {
         </div>
     </div>
     <div class="table-responsive">
-        <table id="devices" class="table table-hover table-condensed table-striped">  
+        <table id="devices" class="table table-hover table-condensed table-striped">
             <thead>
                 <tr>
                     <th data-column-id="status" data-formatter="status" data-width="7px" data-searchable="false">&nbsp;</th>
@@ -318,12 +318,12 @@ if ($format == "graph") {
                     return "<span>" + row.hostname + "</span>";
                 },
                 "uptime": function (column, row) {
-                    if (isNaN(row.uptime.charAt(0))) {
-                        return row.uptime;
-                    } else if (row.status == 'down') {
-                        return "<span class='alert-status-small label-danger'></span><span>" + row.uptime + "</span>";
+                    if (row.status == 'down') {
+                        return "<span class='red'>" + row.uptime + "</span>"
+                    } else if(row.status == 'disabled') {
+                        return '';
                     } else {
-                        return "<span class='alert-status-small label-success'></span><span>" + row.uptime + "</span>";
+                        return row.uptime;
                     }
                 },
             },