diff --git a/rail_cmd.c b/rail_cmd.c
index 67dc936bc6..5943092ad5 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -1991,7 +1991,7 @@ static uint32 GetTileTrackStatus_Track(TileIndex tile, TransportType mode)
 		return ret;
 	} else {
 		if (GetRailTileSubtype(tile) == RAIL_SUBTYPE_DEPOT) {
-			return 0;
+			return (DiagDirToAxis(GetRailDepotDirection(tile)) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y) * 0x101;
 		} else {
 			return GetRailWaypointBits(tile) * 0x101;
 		}
diff --git a/table/track_land.h b/table/track_land.h
index 3ca8ca14bc..6d8d90d219 100644
--- a/table/track_land.h
+++ b/table/track_land.h
@@ -13,40 +13,40 @@ typedef struct DrawTrackSeqStruct {
 #define TILE_SEQ_END() { 0, 0, 0, 0, 0 }
 
 static const DrawTrackSeqStruct _track_depot_layout_table_0[] = {
-	TILE_SEQ_BEGIN(0xF8D)
-	TILE_SEQ_LINE(0x42B | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1)
+	TILE_SEQ_BEGIN(SPR_FLAT_GRASS_TILE)
+	TILE_SEQ_LINE(SPR_RAIL_DEPOT_NE | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1)
 	TILE_SEQ_END()
 };
 
 static const DrawTrackSeqStruct _track_depot_layout_table_1[] = {
-	TILE_SEQ_BEGIN(0x3F3 | PALETTE_MODIFIER_COLOR)
-	TILE_SEQ_LINE(0x427 | PALETTE_MODIFIER_COLOR, 2, 2, 1, 13)
-	TILE_SEQ_LINE(0x428 | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13)
+	TILE_SEQ_BEGIN(SPR_RAIL_TRACK_Y | PALETTE_MODIFIER_COLOR)
+	TILE_SEQ_LINE(SPR_RAIL_DEPOT_SE_1 | PALETTE_MODIFIER_COLOR,  2, 2, 1, 13)
+	TILE_SEQ_LINE(SPR_RAIL_DEPOT_SE_2 | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13)
 	TILE_SEQ_END()
 };
 
 static const DrawTrackSeqStruct _track_depot_layout_table_2[] = {
-	TILE_SEQ_BEGIN(0x3F4 | PALETTE_MODIFIER_COLOR)
-	TILE_SEQ_LINE(0x429 | PALETTE_MODIFIER_COLOR, 2, 2, 13, 1)
-	TILE_SEQ_LINE(0x42A | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1)
+	TILE_SEQ_BEGIN(SPR_RAIL_TRACK_X | PALETTE_MODIFIER_COLOR)
+	TILE_SEQ_LINE(SPR_RAIL_DEPOT_SW_1 | PALETTE_MODIFIER_COLOR, 2,  2, 13, 1)
+	TILE_SEQ_LINE(SPR_RAIL_DEPOT_SW_2 | PALETTE_MODIFIER_COLOR, 2, 13, 13, 1)
 	TILE_SEQ_END()
 };
 
 static const DrawTrackSeqStruct _track_depot_layout_table_3[] = {
-	TILE_SEQ_BEGIN(0xF8D)
-	TILE_SEQ_LINE(0x42C | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13)
+	TILE_SEQ_BEGIN(SPR_FLAT_GRASS_TILE)
+	TILE_SEQ_LINE(SPR_RAIL_DEPOT_NW | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13)
 	TILE_SEQ_END()
 };
 
 static const DrawTrackSeqStruct _track_waypoint_table_0[] = {
-	TILE_SEQ_BEGIN(0x3F4 | PALETTE_MODIFIER_COLOR)
+	TILE_SEQ_BEGIN(SPR_RAIL_TRACK_X | PALETTE_MODIFIER_COLOR)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_X_1,  0,  0,  16,  5)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_X_2,  0, 11,  16,  5)
 	TILE_SEQ_END()
 };
 
 static const DrawTrackSeqStruct _track_waypoint_table_1[] = {
-	TILE_SEQ_BEGIN(0x3F3 | PALETTE_MODIFIER_COLOR)
+	TILE_SEQ_BEGIN(SPR_RAIL_TRACK_Y | PALETTE_MODIFIER_COLOR)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_Y_1,   0,  0, 5, 16)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_Y_2,  11,  0, 5, 16)
 	TILE_SEQ_END()