=== modified file 'dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/LegendItem.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/LegendItem.java	2013-07-24 12:38:12 +0000
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/LegendItem.java	2013-08-07 14:54:51 +0000
@@ -45,8 +45,8 @@
     private Interval interval;
 
     private static final int WIDTH = 22;
-
     private static final int HEIGHT = 20;
+    private static final int LABEL_MARGIN = 6;
 
     public LegendItem( Interval interval )
     {
@@ -68,7 +68,7 @@
 
         g.setColor( Color.BLACK );
         g.setFont( Legend.PLAIN_FONT );
-        g.drawString( label, WIDTH + 15, HEIGHT - 5 );
+        g.drawString( label, WIDTH + LABEL_MARGIN, HEIGHT - 5 );
     }
 
     public int getHeight()

=== modified file 'dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/LegendSet.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/LegendSet.java	2013-08-07 14:07:18 +0000
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/LegendSet.java	2013-08-07 14:54:51 +0000
@@ -46,7 +46,7 @@
 
     private Color backgroundColor = null;
 
-    private static final int LEGEND_WIDTH = 145;
+    private static final int LEGEND_WIDTH = 132;
     private static final int LEGEND_MARGIN_LEFT = 3;
     private static final int LEGEND_MARGIN_BOTTOM = 20;