diff --git a/media/baseset/orig_extra.grf b/media/baseset/orig_extra.grf
index 9adc6e04f8..25193b8020 100644
Binary files a/media/baseset/orig_extra.grf and b/media/baseset/orig_extra.grf differ
diff --git a/media/baseset/orig_extra.grf.hash b/media/baseset/orig_extra.grf.hash
index 3d6fe3d451..6ca3b2ee0c 100644
--- a/media/baseset/orig_extra.grf.hash
+++ b/media/baseset/orig_extra.grf.hash
@@ -1 +1 @@
-3e860a0e880e3dc90615facf5f455fc6
+5fdc049a7a0ada4c280239f15bc38174
diff --git a/media/baseset/orig_extra/CMakeLists.txt b/media/baseset/orig_extra/CMakeLists.txt
index ceae83ca70..997e309a16 100644
--- a/media/baseset/orig_extra/CMakeLists.txt
+++ b/media/baseset/orig_extra/CMakeLists.txt
@@ -10,6 +10,7 @@ if(GRFCODEC_FOUND)
${CMAKE_CURRENT_SOURCE_DIR}/rivers/rapids.nfo
${CMAKE_CURRENT_SOURCE_DIR}/rivers/temperate.nfo
${CMAKE_CURRENT_SOURCE_DIR}/rivers/toyland.nfo
+ ${CMAKE_CURRENT_SOURCE_DIR}/rivers/toyland_rapids.nfo
${CMAKE_CURRENT_SOURCE_DIR}/rivers/tropic.nfo
${CMAKE_CURRENT_SOURCE_DIR}/airports_orig_extra.nfo
${CMAKE_CURRENT_SOURCE_DIR}/canals_extra.nfo
@@ -24,6 +25,8 @@ if(GRFCODEC_FOUND)
${CMAKE_CURRENT_SOURCE_DIR}/rivers/rapids_shading.png
${CMAKE_CURRENT_SOURCE_DIR}/rivers/temperate.png
${CMAKE_CURRENT_SOURCE_DIR}/rivers/toyland.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/rivers/toyland_rapids.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/rivers/toyland_rapids_shading.png
${CMAKE_CURRENT_SOURCE_DIR}/rivers/tropic_desert.png
${CMAKE_CURRENT_SOURCE_DIR}/rivers/tropic_forest.png
${CMAKE_CURRENT_SOURCE_DIR}/fix_graphics.png
diff --git a/media/baseset/orig_extra/orig_extra.nfo b/media/baseset/orig_extra/orig_extra.nfo
index e6ecca8a00..ad1c7b72fb 100644
--- a/media/baseset/orig_extra/orig_extra.nfo
+++ b/media/baseset/orig_extra/orig_extra.nfo
@@ -79,6 +79,7 @@
#include "airports_orig_extra.nfo"
#include "canals_extra.nfo"
#include "rivers/rapids.nfo"
+#include "rivers/toyland_rapids.nfo"
#include "rivers/temperate.nfo"
#include "rivers/arctic.nfo"
#include "rivers/tropic.nfo"
diff --git a/media/baseset/orig_extra/rivers/toyland.nfo b/media/baseset/orig_extra/rivers/toyland.nfo
index 8b6dedd386..41d6ff5666 100644
--- a/media/baseset/orig_extra/rivers/toyland.nfo
+++ b/media/baseset/orig_extra/rivers/toyland.nfo
@@ -3,7 +3,7 @@
// 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 .
//
- -1 * 0 0C "Toyland river graphics by andythenorth (Andrew Parkhouse)"
+ -1 * 0 0C "Toyland river graphics by zephyris (Richard Wheeler)"
-1 * 4 01 05 01 3C
-1 sprites/toyland.png 8bpp 10 10 38 19 -5 0 normal
-1 sprites/toyland.png 8bpp 58 10 38 18 -5 13 normal
diff --git a/media/baseset/orig_extra/rivers/toyland.png b/media/baseset/orig_extra/rivers/toyland.png
index 61ff224301..80db3e2ab2 100644
Binary files a/media/baseset/orig_extra/rivers/toyland.png and b/media/baseset/orig_extra/rivers/toyland.png differ
diff --git a/media/baseset/orig_extra/rivers/toyland_rapids.nfo b/media/baseset/orig_extra/rivers/toyland_rapids.nfo
new file mode 100644
index 0000000000..fc61bcb239
--- /dev/null
+++ b/media/baseset/orig_extra/rivers/toyland_rapids.nfo
@@ -0,0 +1,73 @@
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// 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 .
+//
+ -1 * 0 0C "Toyland rapid graphics by zephyris (Richard Wheeler)"
+ -1 * 4 01 05 01 04
+ -1 sprites/toyland_rapids.png 8bpp 10 10 64 23 -31 0 normal
+ | sprites/toyland_rapids_shading.png 32bpp 10 10 64 23 -31 0 normal
+ | sprites/toyland_rapids.png mask 10 10
+ -1 sprites/toyland_rapids.png 8bpp 90 10 64 39 -31 -8 normal
+ | sprites/toyland_rapids_shading.png 32bpp 90 10 64 39 -31 -8 normal
+ | sprites/toyland_rapids.png mask 90 10
+ -1 sprites/toyland_rapids.png 8bpp 170 10 64 23 -31 0 normal
+ | sprites/toyland_rapids_shading.png 32bpp 170 10 64 23 -31 0 normal
+ | sprites/toyland_rapids.png mask 170 10
+ -1 sprites/toyland_rapids.png 8bpp 250 10 64 39 -31 -8 normal
+ | sprites/toyland_rapids_shading.png 32bpp 250 10 64 39 -31 -8 normal
+ | sprites/toyland_rapids.png mask 250 10
+ -1 * 7 02 05 00 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/toyland_rapids.png 8bpp 10 60 64 23 -31 0 normal
+ | sprites/toyland_rapids_shading.png 32bpp 10 60 64 23 -31 0 normal
+ | sprites/toyland_rapids.png mask 10 60
+ -1 sprites/toyland_rapids.png 8bpp 90 60 64 39 -31 -8 normal
+ | sprites/toyland_rapids_shading.png 32bpp 90 60 64 39 -31 -8 normal
+ | sprites/toyland_rapids.png mask 90 60
+ -1 sprites/toyland_rapids.png 8bpp 170 60 64 23 -31 0 normal
+ | sprites/toyland_rapids_shading.png 32bpp 170 60 64 23 -31 0 normal
+ | sprites/toyland_rapids.png mask 170 60
+ -1 sprites/toyland_rapids.png 8bpp 250 60 64 39 -31 -8 normal
+ | sprites/toyland_rapids_shading.png 32bpp 250 60 64 39 -31 -8 normal
+ | sprites/toyland_rapids.png mask 250 60
+ -1 * 7 02 05 01 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/toyland_rapids.png 8bpp 10 110 64 23 -31 0 normal
+ | sprites/toyland_rapids_shading.png 32bpp 10 110 64 23 -31 0 normal
+ | sprites/toyland_rapids.png mask 10 110
+ -1 sprites/toyland_rapids.png 8bpp 90 110 64 39 -31 -8 normal
+ | sprites/toyland_rapids_shading.png 32bpp 90 110 64 39 -31 -8 normal
+ | sprites/toyland_rapids.png mask 90 110
+ -1 sprites/toyland_rapids.png 8bpp 170 110 64 23 -31 0 normal
+ | sprites/toyland_rapids_shading.png 32bpp 170 110 64 23 -31 0 normal
+ | sprites/toyland_rapids.png mask 170 110
+ -1 sprites/toyland_rapids.png 8bpp 250 110 64 39 -31 -8 normal
+ | sprites/toyland_rapids_shading.png 32bpp 250 110 64 39 -31 -8 normal
+ | sprites/toyland_rapids.png mask 250 110
+ -1 * 7 02 05 02 01 00 00 00
+
+ -1 * 4 01 05 01 04
+ -1 sprites/toyland_rapids.png 8bpp 10 160 64 23 -31 0 normal
+ | sprites/toyland_rapids_shading.png 32bpp 10 160 64 23 -31 0 normal
+ | sprites/toyland_rapids.png mask 10 160
+ -1 sprites/toyland_rapids.png 8bpp 90 160 64 39 -31 -8 normal
+ | sprites/toyland_rapids_shading.png 32bpp 90 160 64 39 -31 -8 normal
+ | sprites/toyland_rapids.png mask 90 160
+ -1 sprites/toyland_rapids.png 8bpp 170 160 64 23 -31 0 normal
+ | sprites/toyland_rapids_shading.png 32bpp 170 160 64 23 -31 0 normal
+ | sprites/toyland_rapids.png mask 170 160
+ -1 sprites/toyland_rapids.png 8bpp 250 160 64 39 -31 -8 normal
+ | sprites/toyland_rapids_shading.png 32bpp 250 160 64 39 -31 -8 normal
+ | sprites/toyland_rapids.png mask 250 160
+ -1 * 7 02 05 03 01 00 00 00
+
+ -1 * 39 02 05 10 80 00 01 04
+ 00 00
+ 01 00
+ 02 00
+ 03 00
+ -1 * 6 07 83 01 \7! 03 01
+ -1 * 7 03 05 01 05 00 10 00
diff --git a/media/baseset/orig_extra/rivers/toyland_rapids.png b/media/baseset/orig_extra/rivers/toyland_rapids.png
new file mode 100644
index 0000000000..7216b1b448
Binary files /dev/null and b/media/baseset/orig_extra/rivers/toyland_rapids.png differ
diff --git a/media/baseset/orig_extra/rivers/toyland_rapids_shading.png b/media/baseset/orig_extra/rivers/toyland_rapids_shading.png
new file mode 100644
index 0000000000..946a0ef090
Binary files /dev/null and b/media/baseset/orig_extra/rivers/toyland_rapids_shading.png differ