diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index fa9664636..237727278 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -485,10 +485,10 @@ function generate_lazy_graph_tag($args) {
     }
 
     if ($config['enable_lazy_load'] === true) {
-        return '<img class="lazy graphs" width="'.$w.'" height="'.$h.'" data-original="graph.php?' . implode('&amp;',$urlargs).'" border="0" />';
+        return '<img class="lazy img-responsive" data-original="graph.php?' . implode('&amp;',$urlargs).'" border="0" />';
     }
     else {
-        return '<img class="graphs" width="'.$w.'" height="'.$h.'" src="graph.php?' . implode('&amp;',$urlargs).'" border="0" />';
+        return '<img class="img-responsive" src="graph.php?' . implode('&amp;',$urlargs).'" border="0" />';
     }
 
 }//end generate_lazy_graph_tag()
diff --git a/html/includes/print-device-graph.php b/html/includes/print-device-graph.php
index d713859c6..da85f4e63 100644
--- a/html/includes/print-device-graph.php
+++ b/html/includes/print-device-graph.php
@@ -18,9 +18,9 @@ echo '<div class="panel panel-default">
     </div>
     <div class="panel-body">
 ';
-
+echo "<div class='row'>";
 require 'includes/print-graphrow.inc.php';
-
+echo '</div>';
 echo '</div>';
 echo '</div>';
 $g_i++;
diff --git a/html/includes/print-graphrow.inc.php b/html/includes/print-graphrow.inc.php
index f6157a953..9b98a8039 100644
--- a/html/includes/print-graphrow.inc.php
+++ b/html/includes/print-graphrow.inc.php
@@ -71,6 +71,8 @@ foreach ($periods as $period) {
         $graph_data[] = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL);
     }
     else {
+        echo "<div class='col-md-3'>";
         echo(overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
+        echo "</div>";
     }
 }