diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 77515791fd..bdf569625f 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 5343535992..8e95b9b63a 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -31471,6 +31471,10 @@ cont {
   name: "railway-tram_stop"
   element {
     scale: 15
+    symbol {
+      name: "tramway-mini"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
@@ -31480,13 +31484,13 @@ cont {
       }
       priority: 15000
     }
+  }
+  element {
+    scale: 16
     symbol {
       name: "tramway-mini"
       priority: 16000
     }
-  }
-  element {
-    scale: 16
     caption {
       primary {
         height: 11
@@ -31496,10 +31500,6 @@ cont {
       }
       priority: 15000
     }
-    symbol {
-      name: "tramway-mini"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -31507,14 +31507,14 @@ cont {
       name: "tramway"
       priority: 16000
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 16000
+      priority: 15000
     }
   }
 }
diff --git a/data/normal.mapcss b/data/normal.mapcss
index 089d5ee1a7..63352dc75e 100644
--- a/data/normal.mapcss
+++ b/data/normal.mapcss
@@ -3102,8 +3102,8 @@ line|z15[railway=siding]::d1p2
   width:	1.4;
   z-index:	396;
 }
-area|z15-16[railway=tram_stop]::d1p2,
-node|z15-16[railway=tram_stop]::d1p2
+area|z15-16[railway=tram_stop],
+node|z15-16[railway=tram_stop]
 {
   icon-image:	tramway-mini.svg;
 }
@@ -3868,7 +3868,6 @@ node|z15[railway=tram_stop]
   text-color:	#3050d8;
   text-offset:  14;
   text-halo-color:	white;
-  text-position: center;
 }
 area|z15-[amenity=fuel],
 node|z15-[amenity=fuel]
@@ -7128,6 +7127,7 @@ line[man_made=cutline]
 }
 
 [highway=bus_stop],
+[railway=tram_stop],
 [railway=station]
 {
   text-position: center;