Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 7385)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 7386)
@@ -1240,5 +1240,5 @@
         showIcons = paintSettings.getShowIconsDistance() > circum;
         isOutlineOnly = paintSettings.isOutlineOnly();
-        orderFont = new Font(Main.pref.get("mappaint.font", "Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
+        orderFont = new Font(Main.pref.get("mappaint.font", "Droid Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
 
         g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7385)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7386)
@@ -3590,5 +3590,4 @@
     font-size: 8;
     font-weight: bold;
-    font-family: "Droid Sans";
     text-color: black;
     text-anchor-horizontal: center;
@@ -3611,8 +3610,9 @@
     text: auto;
 }
-node|z16- {
+node|z16-[!is_prop_set("icon-image")] {
     symbol-size:1;
     symbol-shape: square;
     symbol-stroke-color: node_standard#ffff00;
+    major-z-index: 4.95; /* put node squares above line text */
 }
 node|z16-:connection {
@@ -3650,4 +3650,27 @@
 node|z19,area|z19   { font-size: 9; }
 node|z20-,area|z20-   { font-size: 10; }
+
+/*******************/
+/* way text labels */
+/*******************/
+
+way|z17-[highway=residential] {
+    text: auto;
+    text-color: black;
+    font-size: 9;
+    text-position: line;
+    text-halo-color: #ffffff;
+    text-halo-opacity: 1;
+    text-halo-radius: 1.5;
+}
+way|z18[highway=residential] {
+    font-size: 10;
+}
+way|z19[highway=residential] {
+    font-size: 11;
+}
+way|z20-[highway=residential] {
+    font-size: 12;
+}
 
 /**************/
@@ -3664,4 +3687,5 @@
     icon-image: "place/settlement/town.png";
     text: auto;
+    font-size: 10;
 }
 area[place=continent],
@@ -3689,8 +3713,10 @@
     icon-image: "place/settlement/capital.png";
     text: auto;
+    font-size: 10;
 }
 node|z11-[place=city] {
     icon-image: "place/settlement/city.png";
     text: auto;
+    font-size: 10;
 }
 node|z11-[place=town],
@@ -3702,16 +3728,20 @@
     icon-image: "place/settlement/town.png";
     text: auto;
+    font-size: 10;
 }
 node|z11-[place=locality] {
     icon-image: "place/locality.png";
     text: auto;
+    font-size: 10;
 }
 node|z11-[place=island] {
     icon-image: "place/island.png";
     text: auto;
+    font-size: 10;
 }
 node|z11-[place=islet] {
     icon-image: "place/islet.png";
     text: auto;
+    font-size: 10;
 }