diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf
index dd27160339..dec5be7b10 100644
Binary files a/bin/data/openttd.grf and b/bin/data/openttd.grf differ
diff --git a/bin/data/orig_dos.obg b/bin/data/orig_dos.obg
index 7a6e59ef2b..4a84fdd041 100644
--- a/bin/data/orig_dos.obg
+++ b/bin/data/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 066f0ce5500e0e8f5332aee42e2451a2
+OPENTTD.GRF  = 768051d1eb451c682d6f4e936a89caa5
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/data/orig_dos_de.obg b/bin/data/orig_dos_de.obg
index dac856d751..b0df8f006d 100644
--- a/bin/data/orig_dos_de.obg
+++ b/bin/data/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 066f0ce5500e0e8f5332aee42e2451a2
+OPENTTD.GRF  = 768051d1eb451c682d6f4e936a89caa5
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/data/orig_win.obg b/bin/data/orig_win.obg
index 2ddea07ed4..fd9aa875ec 100644
--- a/bin/data/orig_win.obg
+++ b/bin/data/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 066f0ce5500e0e8f5332aee42e2451a2
+OPENTTD.GRF  = 768051d1eb451c682d6f4e936a89caa5
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/media/extra_grf/airport_preview.png b/media/extra_grf/airport_preview.png
index 646a0b31fc..cfa41f2c70 100644
Binary files a/media/extra_grf/airport_preview.png and b/media/extra_grf/airport_preview.png differ
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 78ec9cc1f9..29b21d66da 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -587,4 +587,5 @@ static void ShowBuildAirportPicker(Window *parent)
 void InitializeAirportGui()
 {
 	_selected_airport_class = APC_BEGIN;
+	_selected_airport_index = -1;
 }
diff --git a/src/network/core/tcp_admin.h b/src/network/core/tcp_admin.h
index 7f875c1552..72aa2cf878 100644
--- a/src/network/core/tcp_admin.h
+++ b/src/network/core/tcp_admin.h
@@ -295,6 +295,7 @@ protected:
 	 * uint64  Money.
 	 * uint64  Loan.
 	 * uint64  Income.
+	 * uint16  Delivered cargo (this quarter).
 	 * uint64  Company value (last quarter).
 	 * uint16  Performance (last quarter).
 	 * uint16  Delivered cargo (last quarter).
diff --git a/src/newgrf_storage.h b/src/newgrf_storage.h
index a85bbbde6d..0686a1ab1c 100644
--- a/src/newgrf_storage.h
+++ b/src/newgrf_storage.h
@@ -63,6 +63,12 @@ struct PersistentStorageArray : BaseStorageArray {
 		free(this->prev_storage);
 	}
 
+	/** Resets all values to zero. */
+	void ResetToZero()
+	{
+		memset(this->storage, 0, sizeof(this->storage));
+	}
+
 	/**
 	 * Stores some value at a given position.
 	 * If there is no backup of the data that backup is made and then
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 418056d1f9..6dafe74b4c 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2184,6 +2184,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 		st->airport.layout = layout;
 		st->airport.flags = 0;
 		st->airport.rotation = rotation;
+		st->airport.psa.ResetToZero();
 
 		st->rect.BeforeAddRect(tile, w, h, StationRect::ADD_TRY);
 
@@ -2280,6 +2281,7 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
 
 		st->airport.Clear();
 		st->facilities &= ~FACIL_AIRPORT;
+		st->airport.psa.ResetToZero();
 
 		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, SVW_PLANES);
 
diff --git a/src/table/airport_defaults.h b/src/table/airport_defaults.h
index 9600094993..f4b4cd4beb 100644
--- a/src/table/airport_defaults.h
+++ b/src/table/airport_defaults.h
@@ -245,8 +245,8 @@ static AirportTileTable _tile_table_intercontinental_0[] = {
 	MK(6, 1, APT_RUNWAY_2),
 	MK(7, 1, APT_RUNWAY_END_FENCE_SE_SW),
 	MK(8, 1, APT_APRON_FENCE_NE_SW),
-	MK(0, 2, APT_APRON_FENCE_NE),
-	MK(1, 2, APT_SMALL_BUILDING_1),
+	MK(0, 2, APT_APRON_FENCE_NE_SW),
+	MK(1, 2, APT_EMPTY),
 	MK(2, 2, APT_APRON_FENCE_NE),
 	MK(3, 2, APT_APRON),
 	MK(4, 2, APT_APRON),