diff --git a/src/net/i2p/itoopie/gui/component/BandwidthChart.java b/src/net/i2p/itoopie/gui/component/BandwidthChart.java
index 712060dbe..aae008416 100644
--- a/src/net/i2p/itoopie/gui/component/BandwidthChart.java
+++ b/src/net/i2p/itoopie/gui/component/BandwidthChart.java
@@ -16,6 +16,7 @@ import java.awt.BasicStroke;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Container;
+import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 
@@ -32,7 +33,6 @@ public class BandwidthChart extends Chart2D{
 	private static ConfigurationManager _conf = ConfigurationManager.getInstance();
 	private final static int DEFAULT_UPDATE_INTERVAL = 10000; // Update every 2500th ms
 	private final static int DEFAULT_GRAPH_INTERVAL = 3600*1000; // The graph will cover a maximum of this time
-	private final static String DATE_FORMAT = "HH:mm";
 	private ObjRecorder2Trace2DAdapter bwInAdapter;
 	private ObjRecorder2Trace2DAdapter bwOutAdapter;
 	private InboundBandwidthTracker bwInTracker;
@@ -63,11 +63,17 @@ public class BandwidthChart extends Chart2D{
 	    dataBWOut.setTracePainter(dotPainter);
 	    addTrace(dataBWOut);
 	    
-	    final SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
+	    final SimpleDateFormat sdf = (SimpleDateFormat) DateFormat.getTimeInstance(DateFormat.SHORT);
+	    String pattern = sdf.toLocalizedPattern();
+	    if (pattern.endsWith(" a")) {
+		// no room for AM/PM
+		sdf.applyLocalizedPattern(pattern.substring(0, pattern.length() - 2));
+	    }
 	    
 	    getAxisX().setFormatter(new LabelFormatterDate(sdf));
 	    getAxisX().setPaintGrid(true);
-	    getAxisX().setAxisTitle(new AxisTitle(Transl._t("Time")));
+	    //getAxisX().setAxisTitle(new AxisTitle(Transl._t("Time")));
+	    getAxisX().setAxisTitle(new AxisTitle(""));
 	
 	    DecimalFormat df = new DecimalFormat("0 ; 0");
 	    getAxisY().setFormatter(new LabelFormatterNumber(df));
diff --git a/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java b/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java
index fe8f4cf87..8da1132d6 100644
--- a/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java
+++ b/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java
@@ -16,6 +16,7 @@ import java.awt.BasicStroke;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Container;
+import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 
@@ -31,7 +32,6 @@ public class ParticipatingTunnelsChart extends Chart2D {
 	private static ConfigurationManager _conf = ConfigurationManager.getInstance();
 	private final static int DEFAULT_UPDATE_INTERVAL = 10000; // Update every 1000th ms
 	private final static int DEFAULT_GRAPH_INTERVAL = 3600*1000; // The graph will cover a maximum of this time
-	private final static String DATE_FORMAT = "HH:mm";
 	private ParticipatingTunnelsTracker partTunnelTracker;	
 	private ObjRecorder2Trace2DAdapter partTunnelAdapter;
 	
@@ -51,11 +51,17 @@ public class ParticipatingTunnelsChart extends Chart2D {
 	    dataPartTunnels.setTracePainter(dotPainter);
 	    addTrace(dataPartTunnels);
 
-	    final SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
+	    final SimpleDateFormat sdf = (SimpleDateFormat) DateFormat.getTimeInstance(DateFormat.SHORT);
+	    String pattern = sdf.toLocalizedPattern();
+	    if (pattern.endsWith(" a")) {
+		// no room for AM/PM
+		sdf.applyLocalizedPattern(pattern.substring(0, pattern.length() - 2));
+	    }
 	    
 	    getAxisX().setFormatter(new LabelFormatterDate(sdf));
 	    getAxisX().setPaintGrid(true);
-	    getAxisX().setAxisTitle(new AxisTitle(Transl._t("Time")));
+	    //getAxisX().setAxisTitle(new AxisTitle(Transl._t("Time")));
+	    getAxisX().setAxisTitle(new AxisTitle(""));
 	
 	    DecimalFormat df = new DecimalFormat("0 ; 0");
 	    getAxisY().setFormatter(new LabelFormatterNumber(df));