diff --git a/html/css/styles.css b/html/css/styles.css
index 4de7e3ce0..49ba5343e 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1351,3 +1351,12 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover {
     box-shadow: #CCC 0 0 .25em;
     behavior: url(/css/PIE.htc);
 }
+
+.devicetable {
+    border-collapse: collapse;
+}
+
+.paddedcell {
+  padding: 7px;
+}
+
diff --git a/html/includes/hostbox.inc.php b/html/includes/hostbox.inc.php
index 8591bda38..3e23e6a98 100644
--- a/html/includes/hostbox.inc.php
+++ b/html/includes/hostbox.inc.php
@@ -38,8 +38,8 @@ $sensor_count = dbFetchCell("SELECT COUNT(*) FROM `sensors` WHERE `device_id` =
 echo('  <tr class="'.$class.'" bgcolor="' . $bg . '" onmouseover="this.style.backgroundColor=\'#fdd\';" onmouseout="this.style.backgroundColor=\'' . $bg . '\';"
           onclick="location.href=\'device/device='.$device['device_id'].'/\'" style="cursor: pointer;">
           <td width="1" style="background-color: '.$table_tab_colour.';"></td>
-          <td width="40" align="center" valign="middle">' . $image . '</td>
-          <td width="300"><span style="font-size: 15px;">' . generate_device_link($device) . '</span>
+          <td width="40" class="paddedcell" align="center" valign="middle">' . $image . '</td>
+          <td width="300" class="paddedcell"><span style="font-size: 15px;">' . generate_device_link($device) . '</span>
           <br />' . $device['sysName'] . '</td>'
         );
 
@@ -48,9 +48,9 @@ if ($port_count) { echo(' <img src="images/icons/port.png" align=absmiddle /> '.
 echo('<br />');
 if ($sensor_count) { echo(' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count); }
 echo ('</td>');
-echo('    <td>' . $device['hardware'] . '<br />' . $device['features'] . '</td>');
-echo('    <td>' . $device['os_text'] . '<br />' . $device['version'] . '</td>');
-echo('    <td>' . formatUptime($device['uptime'], 'short') . ' <br />');
+echo('    <td class="paddedcell">' . $device['hardware'] . '<br />' . $device['features'] . '</td>');
+echo('    <td class="paddedcell">' . $device['os_text'] . '<br />' . $device['version'] . '</td>');
+echo('    <td class="paddedcell">' . formatUptime($device['uptime'], 'short') . ' <br />');
 
 if (get_dev_attrib($device,'override_sysLocation_bool')) {  $device['location'] = get_dev_attrib($device,'override_sysLocation_string'); }
 echo('    ' . truncate($device['location'],32, '') . '</td>');
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 764ad7be1..5f0e06d78 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -263,10 +263,18 @@ if($format == "graph")
 
 } else {
 
-  echo('<table cellpadding="7" cellspacing="0" class="devicetable sortable" width="100%">');
+  echo('<table cellspacing="0" class="devicetable sortable" width="100%">');
   if ($subformat = "detail")
   {
-    echo('<tr class="tablehead"><th></th><th>Device</th><th></th><th>Operating System</th><th>Platform</th><th>Uptime/Location</th></tr>');
+    echo('<tr class="tablehead">
+    <th></th>
+    <th></th>
+    <th class="paddedcell">Device</th>
+    <th></th>
+    <th class="paddedcell">Operating System</th>
+    <th class="paddedcell">Platform</th>
+    <th class="paddedcell">Uptime/Location</th>
+  </tr>');
   }
 
   foreach (dbFetchRows($query, $sql_param) as $device)