diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_ne.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_ne.png
index d876cc93fb..69f31b8114 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_ne.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_ne.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_nw.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_nw.png
index 75a5cc8a12..9e797a9201 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_nw.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_nw.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_se.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_se.png
index e8d48238d4..5278c11b59 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_se.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_se.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_sw.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_sw.png
index 263d3eba46..cce3db92c0 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_sw.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_corner_sw.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_edge_ew.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_edge_ew.png
index 129515a8e8..af73e514d6 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_edge_ew.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_edge_ew.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_edge_ns.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_edge_ns.png
index 76acd92fd8..8bac06d7c1 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_edge_ns.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_edge_ns.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_e.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_e.png
index c7163ded15..99dcf45ca8 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_e.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_e.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_n.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_n.png
index da1559c265..fe2447ca00 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_n.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_n.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_s.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_s.png
index 94e6c30d3f..4766709fe6 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_s.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_s.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_w.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_w.png
index 79549cf673..b7b3695484 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_w.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_end_w.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_e.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_e.png
index caf6ddcc12..6e070f35a5 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_e.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_e.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_n.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_n.png
index e59f60c895..88f7fcaeb9 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_n.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_n.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_s.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_s.png
index 9cfabf8892..c06350413d 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_s.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_s.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_w.png b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_w.png
index 9b773de7c5..3df7e56956 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_w.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/railroad_track_small_t_connection_w.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/subway_rails.json b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/subway_rails.json
index b775de88e2..d77f11d299 100644
--- a/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/subway_rails.json	
+++ b/gfx/SurveyorsMap/pngs_overmap_24x24/alternate roads/rails/subway_rails.json	
@@ -1,68 +1,43 @@
 [
   {
-    "id": [ "subway_ew", "lab_subway_ew" ],
-    "fg": [ "railroad_track_small_edge_ew" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_ns", "lab_subway_ns" ],
-    "fg": [ "railroad_track_small_edge_ns" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_nsw", "lab_subway_nsw" ],
-    "fg": [ "railroad_track_small_t_connection_w" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_nes", "lab_subway_nes" ],
-    "fg": [ "railroad_track_small_t_connection_e" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_esw", "lab_subway_esw" ],
-    "fg": [ "railroad_track_small_t_connection_n" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_new", "lab_subway_new" ],
-    "fg": [ "railroad_track_small_t_connection_s" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_sw", "lab_subway_sw" ],
-    "fg": [ "railroad_track_small_corner_sw" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_se", "lab_subway_se" ],
-    "fg": [ "railroad_track_small_corner_se" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_nw", "lab_subway_nw" ],
-    "fg": [ "railroad_track_small_corner_nw" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_ne", "lab_subway_ne" ],
-    "fg": [ "railroad_track_small_corner_ne" ],
-    "bg": "solid_rock",
-    "rotates": true
-  },
-  {
-    "id": [ "subway_end", "lab_subway_end" ],
-    "fg": [ "railroad_track_small_end_n", "railroad_track_small_end_e", "railroad_track_small_end_s", "railroad_track_small_end_w" ],
-    "bg": "solid_rock",
-    "rotates": true
+    "id": [ "lab_subway", "subway" ],
+    "fg": "railroad_track_small_edge_ew",
+    "bg": "solid_earth",
+    "multitile": true,
+    "additional_tiles": [
+      { "id": "center", "fg": "railroad_track_small_edge_ew", "bg": "solid_earth" },
+      {
+        "id": "corner",
+        "fg": [
+          "railroad_track_small_corner_nw",
+          "railroad_track_small_corner_sw",
+          "railroad_track_small_corner_se",
+          "railroad_track_small_corner_ne"
+        ],
+        "bg": "solid_earth"
+      },
+      {
+        "id": "t_connection",
+        "fg": [
+          "railroad_track_small_t_connection_n",
+          "railroad_track_small_t_connection_w",
+          "railroad_track_small_t_connection_s",
+          "railroad_track_small_t_connection_e"
+        ],
+        "bg": "solid_earth"
+      },
+      { "id": "edge", "fg": [ "railroad_track_small_edge_ns", "railroad_track_small_edge_ew" ], "bg": "solid_earth" },
+      {
+        "id": "end_piece",
+        "fg": [
+          "railroad_track_small_end_n",
+          "railroad_track_small_end_w",
+          "railroad_track_small_end_s",
+          "railroad_track_small_end_e"
+        ],
+        "bg": "solid_earth"
+      },
+      { "id": "unconnected", "fg": "railroad_track_small_edge_ew", "bg": "solid_earth" }
+    ]
   }
 ]
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_E.png b/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_E.png
index 164d8105ee..6dac75225e 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_E.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_E.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_N.png b/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_N.png
index 7c36922ff9..b30b288cf9 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_N.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_N.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_S.png b/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_S.png
index e6ce5d32d6..d26ba5ee15 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_S.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_S.png differ
diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_W.png b/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_W.png
index 7b8b10bfcb..d503612d32 100644
Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_W.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/sub_station/underground_sub_station_W.png differ