diff --git a/data/classificator.txt b/data/classificator.txt
index fba346a4ec..a11c305707 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -811,6 +811,7 @@ world  +
         {}
     public_transport  +
         platform  -
+        stop_position  -
         {}
     railway  +
         abandoned  +
diff --git a/data/colors.txt b/data/colors.txt
index 3900f57260..dd28eacf07 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -76,6 +76,7 @@
 2828327
 2836760
 2894874
+3105945
 3155515
 3156522
 3158064
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index a6ba5a7d44..7a20f19e09 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 8bbabf1b3d..383418d38f 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -57638,6 +57638,33 @@ cont {
     }
   }
 }
+cont {
+  name: "public_transport-stop_position"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 12
+        color: 3105945
+        stroke_color: 452984831
+        text: "ref"
+      }
+      priority: 15592
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 12
+        color: 3105945
+        stroke_color: 452984831
+        text: "ref"
+      }
+      priority: 15592
+    }
+  }
+}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index ceae79d4e0..82161c4b92 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 09eda51253..b42f45e948 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -57140,6 +57140,33 @@ cont {
     }
   }
 }
+cont {
+  name: "public_transport-stop_position"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 12
+        color: 3105945
+        stroke_color: 452984831
+        text: "ref"
+      }
+      priority: 15592
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 12
+        color: 3105945
+        stroke_color: 452984831
+        text: "ref"
+      }
+      priority: 15592
+    }
+  }
+}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 859164d592..2d13421a8c 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 3a12b21413..cc5ce51182 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -57225,6 +57225,33 @@ cont {
     }
   }
 }
+cont {
+  name: "public_transport-stop_position"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 12
+        color: 3105945
+        stroke_color: 437326080
+        text: "ref"
+      }
+      priority: 15592
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 12
+        color: 3105945
+        stroke_color: 437326080
+        text: "ref"
+      }
+      priority: 15592
+    }
+  }
+}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 2b5997e898..614c0fcd5b 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -447,7 +447,7 @@ deprecated|deprecated;446;x
 railway|yard;447;
 deprecated|deprecated;448;x
 natural|meadow;449;landuse|meadow
-deprecated|deprecated;450;x
+public_transport|stop_position;[public_transport=stop_position];;ref;name;450;
 railway|razed;451;
 highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452;
 deprecated|deprecated;453;x
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 6833913126..63869b5a0e 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -156,7 +156,8 @@ area|z18-[craft],
 node[amenity=bbq],
 area[amenity=bbq],
 node[amenity=toilets],
-area[amenity=toilets]
+area[amenity=toilets],
+node[public_transport=stop_position]
 {z-index: 2400;}
 
 /* Bigger than leisure=playground, sports_centre, pitch */
@@ -721,6 +722,9 @@ node|z14-[railway=station][transport=subway]::int_name,
 node|z17-[railway=subway_entrance]::int_name,
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
+node|z18-[public_transport=stop_position],
+{text: ref;text-color: @train_stop_position;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
+
 node|z17-[railway=tram_stop],
 area|z17-[railway=tram_stop]
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
@@ -794,6 +798,9 @@ node|z17-[railway=station]::int_name,
 node|z17-[railway=halt]::int_name,
 {text-offset: 1;font-size: 12;text-halo-opacity: 0.9;}
 
+node|z18-[public_transport=stop_position],
+{text-offset: 0;font-size: 12;}
+
 /* 3.2 Subway Station */
 
 node|z13[railway=station][transport=subway]
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 2b8cf49886..5811036772 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -148,6 +148,7 @@
 @powerline: #969586;
 @tram: #7A7A7A;
 @ferry: #4499Bb;
+@train_stop_position: #2F6499;
 
 /* 6.LABELS COLORS */
 /* 6.1 Main labels */
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index 1b00cdff5d..dcca9fa26e 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -148,6 +148,7 @@
 @powerline: #333333;
 @tram: #5C5C51;
 @ferry: #2A4541;
+@train_stop_position: #2F6499;
 
 /* 6.LABELS COLORS */
 /* 6.1 Main labels */
diff --git a/data/types.txt b/data/types.txt
index bcfe0d7836..ad0e936f17 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -447,7 +447,7 @@ mapswithme
 *railway|yard
 mapswithme
 landuse|meadow
-mapswithme
+*public_transport|stop_position
 *railway|razed
 *highway|footway|demanding_mountain_hiking
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index 1d2353fbb2..13afb451b4 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -811,6 +811,7 @@ world  00000000000000000000  +
         {}
     public_transport  00000000000000000000  +
         platform  00000000000000000000  -
+        stop_position  00000000000000000000  -
         {}
     railway  00000000000000000000  +
         abandoned  00000000000000001111  +