diff --git a/html/includes/graphs/device/temperatures.inc.php b/html/includes/graphs/device/temperatures.inc.php
index 7fb407cd59..f8b1ba7773 100644
--- a/html/includes/graphs/device/temperatures.inc.php
+++ b/html/includes/graphs/device/temperatures.inc.php
@@ -7,7 +7,7 @@ $rrd_options .= " -l 0 -E ";
 
 $iter = "1";
 $sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='temperature' AND device_id = '$id' ORDER BY sensor_index");
-$rrd_options .= " COMMENT:'                           Cur   Min   Max\\n'";
+$rrd_options .= " COMMENT:'                          Cur     Min    Max\\n'";
 while($temperature = mysql_fetch_array($sql)) 
 {
   switch ($iter)
@@ -41,9 +41,9 @@ while($temperature = mysql_fetch_array($sql))
   $temprrd  = $config['rrd_dir'] . "/".$device['hostname']."/".safename("temp-" . $temperature['sensor_descr'] . ".rrd");
   $rrd_options .= " DEF:temp" . $temperature['sensor_id'] . "=$temprrd:temp:AVERAGE ";
   $rrd_options .= " LINE1:temp" . $temperature['sensor_id'] . "#" . $colour . ":'" . str_replace(':','\:',str_replace('\*','*',$temperature['sensor_descr_fixed'])) . "'";
-  $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":LAST:%3.0lfC ";
-  $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":MIN:%3.0lfC ";
-  $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":MAX:%3.0lfC\\\l ";
+  $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":LAST:%4.1lfC ";
+  $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":MIN:%4.1lfC ";
+  $rrd_options .= " GPRINT:temp" . $temperature['sensor_id'] . ":MAX:%4.1lfC\\\l ";
   $iter++;
 }
 
diff --git a/html/includes/graphs/sensor/temperature.inc.php b/html/includes/graphs/sensor/temperature.inc.php
index 50e084fad9..d825e6aff4 100644
--- a/html/includes/graphs/sensor/temperature.inc.php
+++ b/html/includes/graphs/sensor/temperature.inc.php
@@ -5,13 +5,13 @@ $scale_max = "40";
 
 include("includes/graphs/common.inc.php");
 
-  $rrd_options .= " COMMENT:'                                 Last   Min   Max\\n'";
+  $rrd_options .= " COMMENT:'                          Cur     Min    Max\\n'";
 
   $temperature = mysql_fetch_array(mysql_query("SELECT * FROM sensors where sensor_id = '".mres($_GET['id'])."'"));
 
   $hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $temperature['device_id'] . "'"),0);
 
-  $temperature['sensor_descr_fixed'] = substr(str_pad($temperature['sensor_descr'], 28),0,28);
+  $temperature['sensor_descr_fixed'] = substr(str_pad($temperature['sensor_descr'], 22),0,22);
 
   $rrd_filename  = $config['rrd_dir'] . "/".$hostname."/" . safename("temp-" . $temperature['sensor_descr'] . ".rrd");
 
@@ -32,8 +32,8 @@ include("includes/graphs/common.inc.php");
 #  $rrd_options .= " LINE1:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($temperature['sensor_descr_fixed'])))."'"; # Ugly hack :(
   $rrd_options .= " LINE1:temp#cc0000:'" . str_replace(':','\:',str_replace('\*','*',$temperature['sensor_descr_fixed']))."'"; # Ugly hack :(
   $rrd_options .= " LINE1:tempwarm#660000";
-  $rrd_options .= " GPRINT:temp:LAST:%3.0lfC";
-  $rrd_options .= " GPRINT:temp:MIN:%3.0lfC";
-  $rrd_options .= " GPRINT:temp:MAX:%3.0lfC\\\\l";
+  $rrd_options .= " GPRINT:temp:LAST:%4.1lfC";
+  $rrd_options .= " GPRINT:temp:MIN:%4.1lfC";
+  $rrd_options .= " GPRINT:temp:MAX:%4.1lfC\\\\l";
 
 ?>