diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf
index eaeaa86c30..291180213e 100644
Binary files a/bin/baseset/openttd.grf and b/bin/baseset/openttd.grf differ
diff --git a/bin/baseset/orig_dos.obg b/bin/baseset/orig_dos.obg
index a97562f340..9872e93878 100644
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 17c542e2890b15a2ebd7cf80295f0942
+OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/baseset/orig_dos_de.obg b/bin/baseset/orig_dos_de.obg
index 939a451b39..339b0e2e72 100644
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 17c542e2890b15a2ebd7cf80295f0942
+OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/bin/baseset/orig_win.obg b/bin/baseset/orig_win.obg
index 4853b79206..159008a1f6 100644
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 17c542e2890b15a2ebd7cf80295f0942
+OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
diff --git a/media/extra_grf/fix_graphics.nfo b/media/extra_grf/fix_graphics.nfo
index bc91f4e679..4c540f534b 100644
--- a/media/extra_grf/fix_graphics.nfo
+++ b/media/extra_grf/fix_graphics.nfo
@@ -6,15 +6,17 @@
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
-   -1 * 0	 0C "Fixing (alignment) bugs in the original graphics. By Addi and PaulC."
-   -1 * 6	 07 83 01 \7= 03 7D
-// Different graphics for same wood truck
+   -1 * 0	 0C "Fix bugs in the original graphics. By Addi and PaulC."
+
+// Non-toyland specific
+   -1 * 6	 07 83 01 \7= 03 3D
+// Fix missing wheels on the wood trucks
    -1 * 14	 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E
    -1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7
    -1 sprites/fix_graphics.png 114 8 09 16 22 -14 -7
    -1 sprites/fix_graphics.png 146 8 09 16 22 -6 -7
    -1 sprites/fix_graphics.png 178 8 09 16 22 -14 -7
-// Different graphics for lots of trucks
+// Show correct graphics for various 3rd generation trucks
    -1 * 5	 0A 01 28 C4 0D
    -1 sprites/fix_graphics.png 226 8 01 18 8 -3 -10
    -1 sprites/fix_graphics.png 242 8 09 16 20 -14 -7
@@ -56,39 +58,70 @@
    -1 sprites/fix_graphics.png 610 40 09 16 20 -14 -7
    -1 sprites/fix_graphics.png 642 40 01 12 28 -14 -6
    -1 sprites/fix_graphics.png 690 40 09 16 20 -6 -7
-// Different graphics for same truck
+// Fix clipping on the 2nd generation paper truck
    -1 * 14	 0A 04 01 9D 0C 01 9F 0C 01 A1 0C 01 A3 0C
    -1 sprites/fix_graphics.png 738 40 09 16 22 -14 -7
    -1 sprites/fix_graphics.png 770 40 09 16 22 -6 -7
    -1 sprites/fix_graphics.png 2 72 09 16 22 -14 -7
    -1 sprites/fix_graphics.png 34 72 09 16 22 -6 -7
-// Different graphics for same paper truck
+// Fix clipping on the 1st generation paper truck
    -1 * 14	 0A 04 01 5D 0D 01 5F 0D 01 61 0D 01 63 0D
    -1 sprites/fix_graphics.png 82 72 09 16 22 -14 -7
    -1 sprites/fix_graphics.png 114 72 09 17 22 -5 -7
    -1 sprites/fix_graphics.png 146 72 09 17 22 -14 -8
    -1 sprites/fix_graphics.png 178 72 09 16 22 -6 -7
-// Different graphics for same paper truck (truck #2)
+// Fix clipping on the 3rd generation paper truck
    -1 * 14	 0A 04 01 1D 0E 01 1F 0E 01 21 0E 01 23 0E
    -1 sprites/fix_graphics.png 226 72 09 16 22 -14 -7
    -1 sprites/fix_graphics.png 258 72 09 16 22 -6 -7
    -1 sprites/fix_graphics.png 290 72 09 16 22 -14 -7
    -1 sprites/fix_graphics.png 322 72 09 16 22 -6 -7
-// Misaligned monorail bridge heads
+
+// Fix clipping on the toyland toy van in the German DOS graphics
+   -1 * 6 07 83 01 \7! 03 02
+   -1 * 5 0A 01 01 5D 0C
+   -1 sprites/fix_graphics.png 18 296 09 16 20 -14 -7
+
+// Non-toyland specific
+   -1 * 6	 07 83 01 \7= 03 08
+// Fix offsets for the monorail bridge heads
    -1 * 8	 0A 02 01 EA 10 02 EC 10
    -1 sprites/fix_graphics.png 370 72 09 35 48 -23 -7
    -1 sprites/fix_graphics.png 434 72 09 35 48 -23 -7
    -1 sprites/fix_graphics.png 498 72 09 21 49 -24 3
-// Misaligned maglev bridge heads
+// Fix offsets for the maglev bridge heads
    -1 * 8	 0A 02 01 12 11 02 14 11
    -1 sprites/fix_graphics.png 322 486 09 35 48 -23 -7
    -1 sprites/fix_graphics.png 386 486 09 35 48 -23 -7
    -1 sprites/fix_graphics.png 450 486 09 21 49 -24 3
-// Improperly cut cinema
+
+// Toyland specific
+   -1 * 6	 07 83 01 \7! 03 0F
+// Fix offsets for the toyland monorail bridge heads
+   -1 * 8	 0A 02 01 EA 10 02 EC 10
+   -1 sprites/fix_graphics.png 610 630 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 674 630 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 738 630 09 21 49 -24 3
+// Fix offsets for the toyland maglev bridge heads
+   -1 * 8	 0A 02 01 12 11 02 14 11
+   -1 sprites/fix_graphics.png 18 678 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 82 678 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 146 678 09 21 49 -24 3
+// Fix colours for toyland maglev junction overlays
+   -1 * 5	 0A 01 06 91 04
+   -1 sprites/fix_graphics.png 338 630 09 16 30 -14 8
+   -1 sprites/fix_graphics.png 386 630 09 16 30 -14 8
+   -1 sprites/fix_graphics.png 434 630 01 7 40 -19 4
+   -1 sprites/fix_graphics.png 482 630 01 7 40 -19 20
+   -1 sprites/fix_graphics.png 530 630 01 19 12 11 6
+   -1 sprites/fix_graphics.png 562 630 01 19 12 -21 6
+
+// Fix transparency of cinema
    -1 * 5	 0A 01 02 34 11
    -1 sprites/fix_graphics.png 578 72 09 31 64 -31 0
    -1 sprites/fix_graphics.png 658 72 09 47 50 -28 -20
-// Misaligned undergrounds for temperate monorail
+
+// Fix misaligned undergrounds for temperate monorail
    -1 * 6	 07 83 01 \7! 00 06
    -1 * 5	 0A 01 05 4C 04
    -1 sprites/fix_graphics.png 2 136 09 31 64 -31 0
@@ -96,7 +129,8 @@
    -1 sprites/fix_graphics.png 162 136 09 31 64 -31 0
    -1 sprites/fix_graphics.png 242 136 09 31 64 -31 0
    -1 sprites/fix_graphics.png 322 136 09 31 64 -31 0
-// Misaligned undergrounds for arctic monorail
+
+// Fix misaligned undergrounds for arctic monorail
    -1 * 6	 07 83 01 \7! 01 06
    -1 * 5	 0A 01 05 4C 04
    -1 sprites/fix_graphics.png 434 136 09 31 64 -31 0
@@ -104,7 +138,8 @@
    -1 sprites/fix_graphics.png 594 136 09 31 64 -31 0
    -1 sprites/fix_graphics.png 674 136 09 31 64 -31 0
    -1 sprites/fix_graphics.png 2 184 09 31 64 -31 0
-// Misaligned undergrounds for tropical/desert monorail/maglev
+
+// Fix misaligned undergrounds for tropical/desert monorail/maglev
    -1 * 6	 07 83 01 \7! 02 10
    -1 * 11	 0A 03 05 4C 04 05 66 04 05 B8 04
    -1 sprites/fix_graphics.png 114 184 09 31 64 -31 0
@@ -122,31 +157,29 @@
    -1 sprites/fix_graphics.png 322 232 09 31 64 -31 0
    -1 sprites/fix_graphics.png 402 232 09 31 64 -31 0
    -1 sprites/fix_graphics.png 482 232 09 31 64 -31 0
-// Misaligned monorail snowed X crossing
+
+// Fix misaligned X crossing for snow-covered monorail
    -1 * 6	 07 83 01 \7! 01 02
    -1 * 5	 0A 01 01 65 04
    -1 sprites/fix_graphics.png 594 232 09 31 64 -31 0
-// Floating tropical house
-   -1 * 6	 07 83 01 \7! 02 02
+
+// Fix offsets for the tropical house
    -1 * 5	 0A 01 01 FF 11
    -1 sprites/fix_graphics.png 706 232 09 47 64 -31 -16
-// Clipped vehicle in the original German DOS graphics
-   -1 * 6	 07 83 01 \7! 03 02
-   -1 * 5	 0A 01 01 5D 0C
-   -1 sprites/fix_graphics.png 18 296 09 16 20 -14 -7
+
 // Graphics metadata pixel higher than actual graphics
    -1 * 6	 12 01 00 01 AC E2
    -1 sprites/fix_graphics.png 66 296 01 10 9 0 0
 
 // Non-toyland specific
    -1 * 6	 07 83 01 \7= 03 0A
-// graphics for the tubular bridge pillars had incorrect offsets
+// Fix offsets for the tubular bridge pillars
    -1 * 5	 0A 01 04 05 0A
    -1 sprites/fix_graphics.png 98 296 09 9 4 2 -1
    -1 sprites/fix_graphics.png 114 296 09 9 4 2 -1
    -1 sprites/fix_graphics.png 130 296 09 9 4 -4 0
    -1 sprites/fix_graphics.png 146 296 09 9 4 -4 0
-// graphics for the cantilever bridge pillars had incorrect offsets
+// Fix offsets for the cantilever bridge pillars
    -1 * 5	 0A 01 04 DD 09
    -1 sprites/fix_graphics.png 178 296 09 11 10 2 -3
    -1 sprites/fix_graphics.png 194 296 09 12 10 2 -2
@@ -155,13 +188,13 @@
 
 // Toyland specific
    -1 * 6	 07 83 01 \7! 03 0A
-// Graphics for the toyland tubular bridge pillars had incorrect offsets
+// Fix offsets for the toyland tubular bridge pillars
    -1 * 5	 0A 01 04 05 0A
    -1 sprites/fix_graphics.png 248 296 09 9 4 2 -1
    -1 sprites/fix_graphics.png 264 296 09 9 4 2 -1
    -1 sprites/fix_graphics.png 280 296 09 9 4 -4 0
    -1 sprites/fix_graphics.png 296 296 09 9 4 -4 0
-// Graphics for the toyland cantilever bridge pillars had incorrect offsets
+// Fix offsets for the toyland cantilever bridge pillars
    -1 * 5	 0A 01 04 DD 09
    -1 sprites/fix_graphics.png 328 296 09 11 10 2 -3
    -1 sprites/fix_graphics.png 344 296 09 12 10 2 -2
@@ -173,7 +206,6 @@
 // this does not apply there;
 // Pillars are changed for all climates further up
    -1 * 6	 07 83 01 \7= 03 \b22
-
 // Main tubular bridge sprites
    -1 * 5	 0A 01 \b6 \w2559
    -1 sprites/fix_graphics.png 2 330 09 40 32 -30 -26
@@ -203,7 +235,8 @@
 // GUI sprite
    -1 * 5	 0A 01 01 \w2600
    -1 sprites/fix_graphics.png 433 298 09 15 40 0 5
-// Make level crossings in tropical climate look normal
+
+// Remove road markings from tropical rail crossings
    -1 * 6	 07 83 01 \7! 02 19
    -1 * 14	 0A 04 04 5A 05 08 62 05 08 6E 05 04 7A 05
    -1 sprites/fix_graphics.png 2 390 09 31 64 -31 0
@@ -230,55 +263,48 @@
    -1 sprites/fix_graphics.png 82 486 09 31 64 -31 0
    -1 sprites/fix_graphics.png 162 486 09 31 64 -31 0
    -1 sprites/fix_graphics.png 242 486 09 31 64 -31 0
+
 // Fix transparency of steel mill
-   -1 * 6	 07 83 01 \7! 00 0A
-   -1 * 5	 0A 01 04 4D 08
+   -1 * 5	 0A 01 06 46 08
+   -1 sprites/fix_graphics.png 162 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 242 870 09 51 64 -31 -21
+   -1 sprites/fix_graphics.png 322 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 402 870 09 58 49 -29 -29
+   -1 sprites/fix_graphics.png 466 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 546 870 09 42 45 -18 -12
+   -1 * 5	 0A 01 0A 4D 08
    -1 sprites/fix_graphics.png 610 486 09 31 64 -31 0
    -1 sprites/fix_graphics.png 690 486 09 61 59 -31 -33
    -1 sprites/fix_graphics.png 2 566 09 31 64 -31 0
    -1 sprites/fix_graphics.png 82 566 09 50 51 -25 -21
+   -1 sprites/fix_graphics.png 606 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 686 870 09 46 64 -31 -16
+   -1 sprites/fix_graphics.png 2 945 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 945 09 51 50 -29 -21
+   -1 sprites/fix_graphics.png 146 945 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 226 945 09 42 47 -18 -12
    -1 * 5	 0A 01 04 58 08
    -1 sprites/fix_graphics.png 162 566 09 31 64 -31 0
    -1 sprites/fix_graphics.png 242 566 09 52 59 -31 -24
    -1 sprites/fix_graphics.png 306 566 09 31 64 -31 0
    -1 sprites/fix_graphics.png 386 566 09 44 51 -25 -15
+
 // Fix transparency of oil well
-   -1 * 6	 07 83 01 \7= 03 10
-   -1 * 5	 0A 01 06 7E 08
+   -1 * 5	 0A 01 07 7D 08
+   -1 sprites/fix_graphics.png 2 630 09 31 64 -31 0
    -1 sprites/fix_graphics.png 482 566 09 50 31 -11 -28
    -1 sprites/fix_graphics.png 530 566 09 47 31 -11 -25
    -1 sprites/fix_graphics.png 578 566 09 47 31 -11 -25
    -1 sprites/fix_graphics.png 626 566 09 47 31 -11 -25
    -1 sprites/fix_graphics.png 674 566 09 49 31 -11 -27
    -1 sprites/fix_graphics.png 722 566 09 52 31 -11 -30
-   -1 * 6	 07 83 01 \7! 00 02
-   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 2 630 09 31 64 -31 0
    -1 * 6	 07 83 01 \7! 01 02
    -1 * 5	 0A 01 01 7D 08
    -1 sprites/fix_graphics.png 114 630 09 31 64 -31 0
    -1 * 6	 07 83 01 \7! 02 02
    -1 * 5	 0A 01 01 7D 08
    -1 sprites/fix_graphics.png 226 630 09 31 64 -31 0
-   -1 * 6	 07 83 01 \7! 03 0F
-   -1 * 5	 0A 01 06 91 04
-// Fix toyland overlay for PBS on maglev
-   -1 sprites/fix_graphics.png 338 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 386 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 434 630 01 7 40 -19 4
-   -1 sprites/fix_graphics.png 482 630 01 7 40 -19 20
-   -1 sprites/fix_graphics.png 530 630 01 19 12 11 6
-   -1 sprites/fix_graphics.png 562 630 01 19 12 -21 6
-// Fix toyland monorail bridge alignment
-   -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 610 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 674 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 738 630 09 21 49 -24 3
-// Fix toyland maglev bridge alignment
-   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 18 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 82 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 146 678 09 21 49 -24 3
+
 // Fix city airport's grass for temperate
    -1 * 6	 07 83 01 \7! 00 0A
    -1 * 5	 0A 01 09 4C 0A
@@ -291,6 +317,7 @@
    -1 sprites/fix_graphics.png 722 678 09 31 64 -31 0
    -1 sprites/fix_graphics.png 2 726 09 31 64 -31 0
    -1 sprites/fix_graphics.png 82 726 09 31 64 -31 0
+
 // Fix city airport's grass for arctic
    -1 * 6	 07 83 01 \7! 01 0A
    -1 * 5	 0A 01 09 4C 0A
@@ -303,6 +330,7 @@
    -1 sprites/fix_graphics.png 674 726 09 31 64 -31 0
    -1 sprites/fix_graphics.png 2 774 09 31 64 -31 0
    -1 sprites/fix_graphics.png 82 774 09 31 64 -31 0
+
 // Fix city airport's grass for tropical
    -1 * 6	 07 83 01 \7! 02 0A
    -1 * 5	 0A 01 09 4C 0A
@@ -315,6 +343,7 @@
    -1 sprites/fix_graphics.png 674 774 09 31 64 -31 0
    -1 sprites/fix_graphics.png 2 822 09 31 64 -31 0
    -1 sprites/fix_graphics.png 82 822 09 31 64 -31 0
+
 // Fix city airport's grass for toyland
    -1 * 6	 07 83 01 \7! 03 0A
    -1 * 5	 0A 01 09 4C 0A
@@ -327,6 +356,19 @@
    -1 sprites/fix_graphics.png 674 822 09 31 64 -31 0
    -1 sprites/fix_graphics.png 2 870 09 31 64 -31 0
    -1 sprites/fix_graphics.png 82 870 09 31 64 -31 0
+
+// Wrong, non-translated colours in arctic buildings
+   -1 * 8	 0A 02 01 1F 06 01 DB 11
+   -1 sprites/fix_graphics.png 305 945 09 29 59 -29 -12
+   -1 sprites/fix_graphics.png 369 945 09 29 59 -29 -12
+   -1 * 8	 0A 02 01 76 11 01 E6 11
+   -1 sprites/fix_graphics.png 449 945 09 69 64 -31 -38
+   -1 sprites/fix_graphics.png 529 945 09 69 64 -31 -38
+   -1 * 8	 0A 02 02 7E 11 01 E1 11
+   -1 sprites/fix_graphics.png 625 945 03 75 54 -25 -47
+   -1 sprites/fix_graphics.png 2 1037 09 75 54 -25 -47
+   -1 sprites/fix_graphics.png 66 1037 09 75 54 -25 -47
+
 // Fix buoy in-game; don't show black outline
    -1 * 4        01 05 01 \b1
    -1 sprites/fix_graphics.png 575 490 09 11 7 7 4
diff --git a/media/extra_grf/fix_graphics.png b/media/extra_grf/fix_graphics.png
index 57c9aac890..1dc7bad825 100644
Binary files a/media/extra_grf/fix_graphics.png and b/media/extra_grf/fix_graphics.png differ