diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php
index 4f631567a..3aae5f5f8 100644
--- a/html/pages/device/overview/processors.inc.php
+++ b/html/pages/device/overview/processors.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-$graph_type = 'processor_usage';
-
 $processors = dbFetchRows('SELECT * FROM `processors` WHERE device_id = ?', array($device['device_id']));
 
 if (count($processors)) {
@@ -16,44 +14,90 @@ if (count($processors)) {
     echo '</div>
         <table class="table table-hover table-condensed table-striped">';
 
+    $graph_array           = array();
+    $graph_array['to']     = $config['time']['now'];
+    $graph_array['type']   = 'processor_usage';
+    $graph_array['from']   = $config['time']['day'];
+    $graph_array['legend'] = 'no';
+
+    $totalPercent=0;
+
     foreach ($processors as $proc) {
         $text_descr = rewrite_entity_descr($proc['processor_descr']);
 
-        // disable short hrDeviceDescr. need to make this prettier.
-        // $text_descr = short_hrDeviceDescr($proc['processor_descr']);
         $percent      = $proc['processor_usage'];
-        $background   = get_percentage_colours($percent);
-        $graph_colour = str_replace('#', '', $row_colour);
+        if ($config['cpu_details_overview'] === true)
+        {
 
-        $graph_array           = array();
+            $background   = get_percentage_colours($percent);
+
+            $graph_array['id']     = $proc['processor_id'];
+
+            //Generate tooltip graphs
+            $graph_array['height'] = '100';
+            $graph_array['width']  = '210';
+            $link_array         = $graph_array;
+            $link_array['page'] = 'graphs';
+            unset($link_array['height'], $link_array['width'], $link_array['legend']);
+            $link = generate_url($link_array);
+            $overlib_content = generate_overlib_content($graph_array, $device['hostname'].' - '.$text_descr);
+
+            //Generate the minigraph
+            $graph_array['width']  = 80;
+            $graph_array['height'] = 20;
+            $graph_array['bg']     = 'ffffff00'; // the 00 at the end makes the area transparent.
+            $minigraph =  generate_lazy_graph_tag($graph_array);
+
+            echo '<tr>
+                <td>'.overlib_link($link, $text_descr, $overlib_content).'</td>
+                <td>'.overlib_link($link, $minigraph, $overlib_content).'</td>
+                <td>'.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
+                </a></td>
+              </tr>';
+        }
+        else {
+            $totalPercent = $totalPercent + $percent;
+        }
+
+    }//end foreach
+
+    if ($config['cpu_details_overview'] === false)
+    {
+
+        //Generate average cpu graph
         $graph_array['height'] = '100';
-        $graph_array['width']  = '210';
-        $graph_array['to']     = $config['time']['now'];
-        $graph_array['id']     = $proc['processor_id'];
-        $graph_array['type']   = $graph_type;
-        $graph_array['from']   = $config['time']['day'];
-        $graph_array['legend'] = 'no';
+        $graph_array['width']  = '485';
+        $graph_array['device'] = $device['device_id'];
+        $graph_array['type']   = 'device_processor';
+        $graph = generate_lazy_graph_tag($graph_array);
 
+        //Generate link to graphs
         $link_array         = $graph_array;
         $link_array['page'] = 'graphs';
-        unset($link_array['height'], $link_array['width'], $link_array['legend']);
+        unset($link_array['height'], $link_array['width']);
         $link = generate_url($link_array);
 
-        $overlib_content = generate_overlib_content($graph_array, $device['hostname'].' - '.$text_descr);
-
-        $graph_array['width']  = 80;
-        $graph_array['height'] = 20;
-        $graph_array['bg']     = 'ffffff00';
-        // the 00 at the end makes the area transparent.
-        $minigraph =  generate_lazy_graph_tag($graph_array);
+        //Generate tooltip
+        $graph_array['width'] = '210';
+        $overlib_content      = generate_overlib_content($graph_array, $device['hostname'].' - CPU usage');
 
         echo '<tr>
-           <td>'.overlib_link($link, $text_descr, $overlib_content).'</td>
-           <td>'.overlib_link($link, $minigraph, $overlib_content).'</td>
-           <td>'.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
-           </a></td>
-         </tr>';
-    }//end foreach
+              <td colspan="4">';
+        echo overlib_link($link, $graph, $overlib_content, null);
+        echo '  </td>
+            </tr>';
+
+        //Add a row with CPU desc, count and percent graph
+        $totalPercent=$totalPercent/count($processors);
+        $background   = get_percentage_colours($totalPercent);
+
+         echo '<tr>
+             <td>'.overlib_link($link, $text_descr, $overlib_content).'</td>
+             <td>'.overlib_link($link,'x'.count($processors),$overlib_content).'</td>
+             <td>'.overlib_link($link, print_percentage_bar(200, 20, $totalPercent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'</td>
+           </tr>';
+
+    }
 
     echo '</table>
         </div>
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index e1ca10d69..0e936861b 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -408,6 +408,8 @@ $config['network_map_vis_options'] = '{
 // Device page options
 $config['show_overview_tab'] = true;
 
+$config['cpu_details_overview'] = false; //By default show only average cpu in device overview
+
 // The device overview page options
 $config['overview_show_sysDescr'] = true;