diff --git a/html/includes/graphs/device_toner.inc.php b/html/includes/graphs/device_toner.inc.php
index 4b51aad8ba..86a23eb94b 100644
--- a/html/includes/graphs/device_toner.inc.php
+++ b/html/includes/graphs/device_toner.inc.php
@@ -43,15 +43,15 @@ while($toner = mysql_fetch_array($sql))
         
   $hostname = gethostbyid($toner['device_id']);
   
-  $descr = substr(str_pad($toner['toner_descr'], 17),0,17);
+  $descr = substr(str_pad($toner['toner_descr'], 16),0,16);
   $rrd_filename  = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("toner-" . $toner['toner_descr'] . ".rrd");
   $toner_id = $toner['toner_id'];
 
   $rrd_options .= " DEF:toner$toner_id=$rrd_filename:toner:AVERAGE";
-  $rrd_options .= " LINE1:toner$toner_id#".$colour.":'" . $descr . "'";
-  $rrd_options .= " GPRINT:toner$toner_id:AVERAGE:%5.0lf\ ";
-  $rrd_options .= " GPRINT:toner$toner_id:MIN:%5.0lf\ ";
-  $rrd_options .= " GPRINT:toner$toner_id:MAX:%5.0lf\\\\l";
+  $rrd_options .= " LINE2:toner$toner_id#".$colour.":'" . $descr . "'";
+  $rrd_options .= " GPRINT:toner$toner_id:AVERAGE:'%5.0lf%%'";
+  $rrd_options .= " GPRINT:toner$toner_id:MIN:'%5.0lf%%'";
+  $rrd_options .= " GPRINT:toner$toner_id:MAX:%5.0lf%%\\\\l";
 
   $iter++;
 }