diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 3b30a99550..d9046a41a5 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -408,8 +408,10 @@ if ($_SESSION['userlevel'] >= '5' && ($app_count) > "0")
   $app_list = dbFetchRows("SELECT `app_type` FROM `applications` GROUP BY `app_type` ORDER BY `app_type`");
   foreach ($app_list as $app)
   {
+    $image = $config['html_dir']."/images/icons/".$row['app_type'].".png";
+    $icon = (file_exists($image) ? $row['app_type'] : "apps");
 echo('
-        <li><a href="apps/app='.$app['app_type'].'/"><img src="images/icons/'.$app['app_type'].'.png" border="0" align="absmiddle" /> '.$app['app_type'].' </a></li>');
+        <li><a href="apps/app='.$app['app_type'].'/"><img src="images/icons/'.$icon.'.png" border="0" align="absmiddle" /> '.$app['app_type'].' </a></li>');
   }
 
 ?>
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index 437fd93787..cf28d81280 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -227,7 +227,7 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
-    if ($config['poller_modules']['unix-agent'] && @dbFetchCell("SELECT COUNT(*) FROM `packages` WHERE device_id = '".$device['device_id']."'") > '0')
+    if (@dbFetchCell("SELECT COUNT(*) FROM `packages` WHERE device_id = '".$device['device_id']."'") > '0')
     {
       echo('<li class="' . $select['packages'] . '">
     <a href="'.generate_device_url($device, array('tab' => 'packages')).'">