diff --git a/includes/discovery/os.inc.php b/includes/discovery/os.inc.php
index 088b08803f..e802eb7bea 100644
--- a/includes/discovery/os.inc.php
+++ b/includes/discovery/os.inc.php
@@ -2,18 +2,19 @@
 
 echo 'OS: ';
 
-// MYSQL Check - FIXME
-// 1 UPDATE
-$os = getHostOS($device);
-if ($os != $device['os'] || empty($device['icon'])) {
+$os   = getHostOS($device);
+$icon = getImageName(array('icon' => $os), false);
+if ($os != $device['os']) {
     $device['os'] = $os;
-
-    // update icon
-    $icon = getImageName($device, false);
-    $device['icon'] = $icon;
-
-
-    $sql = dbUpdate(array('os' => $os, 'icon' => $icon), 'devices', 'device_id=?', array($device['device_id']));
+    $sql = dbUpdate(array('os' => $os), 'devices', 'device_id=?', array($device['device_id']));
     echo "Changed OS! : $os\n";
     log_event('Device OS changed '.$device['os']." => $os", $device, 'system');
 }
+
+if ($icon != $device['icon']) {
+    $icon = getImageName($device, false);
+    $device['icon'] = $icon;
+    $sql = dbUpdate(array('icon' => $icon), 'devices', 'device_id=?', array($device['device_id']));
+    echo "Changed Icon! : $icon\n";
+    log_event('Device Icon changed '.$device['icon']." => $icon", $device, 'system');
+}