diff --git a/changelog b/changelog
index a47beac2836..a6aa5fa03f4 100644
--- a/changelog
+++ b/changelog
@@ -39,6 +39,8 @@ Version 1.11.0+svn:
    * Handle an exception in the SDL_net-based network code (bug #20205)
  * Terrains:
    * Added Unwalkable Overlay terrain (^Qov)
+   * Added Dense Palm (^Ftp), Savanna (^Fts) forest terrains
+   * Updated existing desert palms (^Ftd)
  * User interface:
    * Healing animations are now played when poison is cured.
    * Moving units to a selected hex field
diff --git a/data/core/images/terrain/forest/palm-beach-tile.png b/data/core/images/terrain/forest/palm-beach-tile.png
deleted file mode 100644
index 4015486d25e..00000000000
Binary files a/data/core/images/terrain/forest/palm-beach-tile.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-desert-tile.png b/data/core/images/terrain/forest/palm-desert-tile.png
deleted file mode 100644
index cf12cc79c97..00000000000
Binary files a/data/core/images/terrain/forest/palm-desert-tile.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-small.png b/data/core/images/terrain/forest/palm-small.png
deleted file mode 100644
index 1522d2ab1d2..00000000000
Binary files a/data/core/images/terrain/forest/palm-small.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-small2.png b/data/core/images/terrain/forest/palm-small2.png
deleted file mode 100644
index 96fc896f5da..00000000000
Binary files a/data/core/images/terrain/forest/palm-small2.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-small3.png b/data/core/images/terrain/forest/palm-small3.png
deleted file mode 100644
index 11542845fde..00000000000
Binary files a/data/core/images/terrain/forest/palm-small3.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-small4.png b/data/core/images/terrain/forest/palm-small4.png
deleted file mode 100644
index 00ca06a6e50..00000000000
Binary files a/data/core/images/terrain/forest/palm-small4.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-small5.png b/data/core/images/terrain/forest/palm-small5.png
deleted file mode 100644
index 2821846f77f..00000000000
Binary files a/data/core/images/terrain/forest/palm-small5.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-small6.png b/data/core/images/terrain/forest/palm-small6.png
deleted file mode 100644
index eb4135d6da3..00000000000
Binary files a/data/core/images/terrain/forest/palm-small6.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-sparse.png b/data/core/images/terrain/forest/palm-sparse.png
deleted file mode 100644
index ee5c0e4a773..00000000000
Binary files a/data/core/images/terrain/forest/palm-sparse.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-sparse2.png b/data/core/images/terrain/forest/palm-sparse2.png
deleted file mode 100644
index 51250f14f63..00000000000
Binary files a/data/core/images/terrain/forest/palm-sparse2.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-sparse3.png b/data/core/images/terrain/forest/palm-sparse3.png
deleted file mode 100644
index 1db68a26c57..00000000000
Binary files a/data/core/images/terrain/forest/palm-sparse3.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-sparse4.png b/data/core/images/terrain/forest/palm-sparse4.png
deleted file mode 100644
index 5f068d0d909..00000000000
Binary files a/data/core/images/terrain/forest/palm-sparse4.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-sparse5.png b/data/core/images/terrain/forest/palm-sparse5.png
deleted file mode 100644
index d820c2be5e2..00000000000
Binary files a/data/core/images/terrain/forest/palm-sparse5.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm-sparse6.png b/data/core/images/terrain/forest/palm-sparse6.png
deleted file mode 100644
index fa60b9ed015..00000000000
Binary files a/data/core/images/terrain/forest/palm-sparse6.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm.png b/data/core/images/terrain/forest/palm.png
deleted file mode 100644
index a33e5e996d8..00000000000
Binary files a/data/core/images/terrain/forest/palm.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm2.png b/data/core/images/terrain/forest/palm2.png
deleted file mode 100644
index 52585cac9b6..00000000000
Binary files a/data/core/images/terrain/forest/palm2.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm3.png b/data/core/images/terrain/forest/palm3.png
deleted file mode 100644
index fec51c0166f..00000000000
Binary files a/data/core/images/terrain/forest/palm3.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm4.png b/data/core/images/terrain/forest/palm4.png
deleted file mode 100644
index 131f935b0ca..00000000000
Binary files a/data/core/images/terrain/forest/palm4.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm5.png b/data/core/images/terrain/forest/palm5.png
deleted file mode 100644
index 1eb456db1c7..00000000000
Binary files a/data/core/images/terrain/forest/palm5.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palm6.png b/data/core/images/terrain/forest/palm6.png
deleted file mode 100644
index 4f51a863589..00000000000
Binary files a/data/core/images/terrain/forest/palm6.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/palms-on-dunes-tile.png b/data/core/images/terrain/forest/palms-on-dunes-tile.png
deleted file mode 100644
index 5f931eb9159..00000000000
Binary files a/data/core/images/terrain/forest/palms-on-dunes-tile.png and /dev/null differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-hills-tile.png b/data/core/images/terrain/forest/tropical/jungle-hills-tile.png
new file mode 100644
index 00000000000..839493d8bd3
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-hills-tile.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small.png b/data/core/images/terrain/forest/tropical/jungle-small.png
new file mode 100644
index 00000000000..fe95ad00181
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small2.png b/data/core/images/terrain/forest/tropical/jungle-small2.png
new file mode 100644
index 00000000000..6684b9b0319
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small2.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small3.png b/data/core/images/terrain/forest/tropical/jungle-small3.png
new file mode 100644
index 00000000000..76aefbce4b1
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small3.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small4.png b/data/core/images/terrain/forest/tropical/jungle-small4.png
new file mode 100644
index 00000000000..68f12f4f814
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small4.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small5.png b/data/core/images/terrain/forest/tropical/jungle-small5.png
new file mode 100644
index 00000000000..5b574270d09
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small5.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small6.png b/data/core/images/terrain/forest/tropical/jungle-small6.png
new file mode 100644
index 00000000000..89a49d10aeb
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small6.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small7.png b/data/core/images/terrain/forest/tropical/jungle-small7.png
new file mode 100644
index 00000000000..8b1cb007feb
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small7.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small8.png b/data/core/images/terrain/forest/tropical/jungle-small8.png
new file mode 100644
index 00000000000..402f05ce889
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small8.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-small9.png b/data/core/images/terrain/forest/tropical/jungle-small9.png
new file mode 100644
index 00000000000..dfb248cafc6
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-small9.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse-small.png b/data/core/images/terrain/forest/tropical/jungle-sparse-small.png
new file mode 100644
index 00000000000..86217545146
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse-small.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse-small2.png b/data/core/images/terrain/forest/tropical/jungle-sparse-small2.png
new file mode 100644
index 00000000000..698c93c9dbe
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse-small2.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse-small3.png b/data/core/images/terrain/forest/tropical/jungle-sparse-small3.png
new file mode 100644
index 00000000000..4d8ad8adb8f
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse-small3.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse-small4.png b/data/core/images/terrain/forest/tropical/jungle-sparse-small4.png
new file mode 100644
index 00000000000..8dc122ae598
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse-small4.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse-small5.png b/data/core/images/terrain/forest/tropical/jungle-sparse-small5.png
new file mode 100644
index 00000000000..072f977e0a6
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse-small5.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse-small6.png b/data/core/images/terrain/forest/tropical/jungle-sparse-small6.png
new file mode 100644
index 00000000000..c9755022c0f
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse-small6.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse.png b/data/core/images/terrain/forest/tropical/jungle-sparse.png
new file mode 100644
index 00000000000..35dd3880603
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse2.png b/data/core/images/terrain/forest/tropical/jungle-sparse2.png
new file mode 100644
index 00000000000..dcd54c53674
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse2.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse3.png b/data/core/images/terrain/forest/tropical/jungle-sparse3.png
new file mode 100644
index 00000000000..1794517e7d9
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse3.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse4.png b/data/core/images/terrain/forest/tropical/jungle-sparse4.png
new file mode 100644
index 00000000000..71441d6a2bd
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse4.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse5.png b/data/core/images/terrain/forest/tropical/jungle-sparse5.png
new file mode 100644
index 00000000000..742ac6a5b45
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse5.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-sparse6.png b/data/core/images/terrain/forest/tropical/jungle-sparse6.png
new file mode 100644
index 00000000000..64541073e60
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-sparse6.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle-tile.png b/data/core/images/terrain/forest/tropical/jungle-tile.png
new file mode 100644
index 00000000000..1f26880c3c5
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle-tile.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle.png b/data/core/images/terrain/forest/tropical/jungle.png
new file mode 100644
index 00000000000..4e3ca10e5e2
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle2.png b/data/core/images/terrain/forest/tropical/jungle2.png
new file mode 100644
index 00000000000..8b4d3abdbdb
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle2.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle3.png b/data/core/images/terrain/forest/tropical/jungle3.png
new file mode 100644
index 00000000000..2444f571881
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle3.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle4.png b/data/core/images/terrain/forest/tropical/jungle4.png
new file mode 100644
index 00000000000..1b53708be9c
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle4.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle5.png b/data/core/images/terrain/forest/tropical/jungle5.png
new file mode 100644
index 00000000000..f390102121d
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle5.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle6.png b/data/core/images/terrain/forest/tropical/jungle6.png
new file mode 100644
index 00000000000..c75a7d1a3c0
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle6.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle7.png b/data/core/images/terrain/forest/tropical/jungle7.png
new file mode 100644
index 00000000000..629f9e0d018
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle7.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle8.png b/data/core/images/terrain/forest/tropical/jungle8.png
new file mode 100644
index 00000000000..58cb65c9e9f
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle8.png differ
diff --git a/data/core/images/terrain/forest/tropical/jungle9.png b/data/core/images/terrain/forest/tropical/jungle9.png
new file mode 100644
index 00000000000..9a1394d1a1e
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/jungle9.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-small.png b/data/core/images/terrain/forest/tropical/palm-desert-small.png
new file mode 100644
index 00000000000..0a38938106c
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-small.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-small2.png b/data/core/images/terrain/forest/tropical/palm-desert-small2.png
new file mode 100644
index 00000000000..3dfc818d797
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-small2.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-small3.png b/data/core/images/terrain/forest/tropical/palm-desert-small3.png
new file mode 100644
index 00000000000..2ba20132d90
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-small3.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-small4.png b/data/core/images/terrain/forest/tropical/palm-desert-small4.png
new file mode 100644
index 00000000000..9eae2bd08eb
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-small4.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-small5.png b/data/core/images/terrain/forest/tropical/palm-desert-small5.png
new file mode 100644
index 00000000000..da3949f2a78
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-small5.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-small6.png b/data/core/images/terrain/forest/tropical/palm-desert-small6.png
new file mode 100644
index 00000000000..f57d5cfde76
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-small6.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-sparse.png b/data/core/images/terrain/forest/tropical/palm-desert-sparse.png
new file mode 100644
index 00000000000..2bdabaa7fe1
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-sparse.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-sparse2.png b/data/core/images/terrain/forest/tropical/palm-desert-sparse2.png
new file mode 100644
index 00000000000..632683250a6
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-sparse2.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-sparse3.png b/data/core/images/terrain/forest/tropical/palm-desert-sparse3.png
new file mode 100644
index 00000000000..8d8d96bb5c1
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-sparse3.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-sparse4.png b/data/core/images/terrain/forest/tropical/palm-desert-sparse4.png
new file mode 100644
index 00000000000..bc719d845be
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-sparse4.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-sparse5.png b/data/core/images/terrain/forest/tropical/palm-desert-sparse5.png
new file mode 100644
index 00000000000..b28fb2201d5
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-sparse5.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-sparse6.png b/data/core/images/terrain/forest/tropical/palm-desert-sparse6.png
new file mode 100644
index 00000000000..e56e943c57c
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-sparse6.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert-tile.png b/data/core/images/terrain/forest/tropical/palm-desert-tile.png
new file mode 100644
index 00000000000..6085e7a92e4
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert-tile.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert.png b/data/core/images/terrain/forest/tropical/palm-desert.png
new file mode 100644
index 00000000000..2e2c7267c3c
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert2.png b/data/core/images/terrain/forest/tropical/palm-desert2.png
new file mode 100644
index 00000000000..c26ea2477fd
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert2.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert3.png b/data/core/images/terrain/forest/tropical/palm-desert3.png
new file mode 100644
index 00000000000..631b9d08235
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert3.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert4.png b/data/core/images/terrain/forest/tropical/palm-desert4.png
new file mode 100644
index 00000000000..48ee3298e12
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert4.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert5.png b/data/core/images/terrain/forest/tropical/palm-desert5.png
new file mode 100644
index 00000000000..5b7c5f1c7ac
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert5.png differ
diff --git a/data/core/images/terrain/forest/tropical/palm-desert6.png b/data/core/images/terrain/forest/tropical/palm-desert6.png
new file mode 100644
index 00000000000..d62948a3384
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palm-desert6.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-on-dunes-tile.png b/data/core/images/terrain/forest/tropical/palms-on-dunes-tile.png
new file mode 100644
index 00000000000..2be384a901a
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-on-dunes-tile.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-on-hills-tile.png b/data/core/images/terrain/forest/tropical/palms-on-hills-tile.png
new file mode 100644
index 00000000000..01cf9fa8e39
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-on-hills-tile.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-small.png b/data/core/images/terrain/forest/tropical/palms-small.png
new file mode 100644
index 00000000000..8502d40f837
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-small.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-small2.png b/data/core/images/terrain/forest/tropical/palms-small2.png
new file mode 100644
index 00000000000..c031ce73b5b
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-small2.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-small3.png b/data/core/images/terrain/forest/tropical/palms-small3.png
new file mode 100644
index 00000000000..75e7c1425cc
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-small3.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-small4.png b/data/core/images/terrain/forest/tropical/palms-small4.png
new file mode 100644
index 00000000000..07e7f418c8e
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-small4.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-small5.png b/data/core/images/terrain/forest/tropical/palms-small5.png
new file mode 100644
index 00000000000..dbb0c49b038
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-small5.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-small6.png b/data/core/images/terrain/forest/tropical/palms-small6.png
new file mode 100644
index 00000000000..2f046ccf5d0
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-small6.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse-small.png b/data/core/images/terrain/forest/tropical/palms-sparse-small.png
new file mode 100644
index 00000000000..2b1e2943fd2
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse-small.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse-small2.png b/data/core/images/terrain/forest/tropical/palms-sparse-small2.png
new file mode 100644
index 00000000000..80926453c5f
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse-small2.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse-small3.png b/data/core/images/terrain/forest/tropical/palms-sparse-small3.png
new file mode 100644
index 00000000000..2e19d367f6b
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse-small3.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse-small4.png b/data/core/images/terrain/forest/tropical/palms-sparse-small4.png
new file mode 100644
index 00000000000..df83957f82c
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse-small4.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse-small5.png b/data/core/images/terrain/forest/tropical/palms-sparse-small5.png
new file mode 100644
index 00000000000..1e70c86ad5f
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse-small5.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse-small6.png b/data/core/images/terrain/forest/tropical/palms-sparse-small6.png
new file mode 100644
index 00000000000..2377d590e8c
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse-small6.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse.png b/data/core/images/terrain/forest/tropical/palms-sparse.png
new file mode 100644
index 00000000000..d802a17ff3f
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse2.png b/data/core/images/terrain/forest/tropical/palms-sparse2.png
new file mode 100644
index 00000000000..477fd4c0678
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse2.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse3.png b/data/core/images/terrain/forest/tropical/palms-sparse3.png
new file mode 100644
index 00000000000..6e278df3152
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse3.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse4.png b/data/core/images/terrain/forest/tropical/palms-sparse4.png
new file mode 100644
index 00000000000..5ee75c94bfc
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse4.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse5.png b/data/core/images/terrain/forest/tropical/palms-sparse5.png
new file mode 100644
index 00000000000..04dad48911d
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse5.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-sparse6.png b/data/core/images/terrain/forest/tropical/palms-sparse6.png
new file mode 100644
index 00000000000..acaba2b68a4
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-sparse6.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms-tile.png b/data/core/images/terrain/forest/tropical/palms-tile.png
new file mode 100644
index 00000000000..480d6c842f3
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms-tile.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms.png b/data/core/images/terrain/forest/tropical/palms.png
new file mode 100644
index 00000000000..8c91c99d0c6
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms2.png b/data/core/images/terrain/forest/tropical/palms2.png
new file mode 100644
index 00000000000..4d60ecf9958
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms2.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms3.png b/data/core/images/terrain/forest/tropical/palms3.png
new file mode 100644
index 00000000000..a9fcfdd0e55
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms3.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms4.png b/data/core/images/terrain/forest/tropical/palms4.png
new file mode 100644
index 00000000000..c92528d5306
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms4.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms5.png b/data/core/images/terrain/forest/tropical/palms5.png
new file mode 100644
index 00000000000..bc01f6bc560
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms5.png differ
diff --git a/data/core/images/terrain/forest/tropical/palms6.png b/data/core/images/terrain/forest/tropical/palms6.png
new file mode 100644
index 00000000000..e3693a455cf
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/palms6.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-hills-tile.png b/data/core/images/terrain/forest/tropical/savanna-hills-tile.png
new file mode 100644
index 00000000000..b38ec472da1
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-hills-tile.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-small.png b/data/core/images/terrain/forest/tropical/savanna-small.png
new file mode 100644
index 00000000000..eded48e7a78
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-small.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-small2.png b/data/core/images/terrain/forest/tropical/savanna-small2.png
new file mode 100644
index 00000000000..b41976a63e7
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-small2.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-small3.png b/data/core/images/terrain/forest/tropical/savanna-small3.png
new file mode 100644
index 00000000000..16783ef996e
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-small3.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-small4.png b/data/core/images/terrain/forest/tropical/savanna-small4.png
new file mode 100644
index 00000000000..0137f1d1102
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-small4.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-small5.png b/data/core/images/terrain/forest/tropical/savanna-small5.png
new file mode 100644
index 00000000000..aa54cf616b3
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-small5.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-small6.png b/data/core/images/terrain/forest/tropical/savanna-small6.png
new file mode 100644
index 00000000000..ea4fea4e76a
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-small6.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse-small.png b/data/core/images/terrain/forest/tropical/savanna-sparse-small.png
new file mode 100644
index 00000000000..94a4da8a36a
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse-small.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse-small2.png b/data/core/images/terrain/forest/tropical/savanna-sparse-small2.png
new file mode 100644
index 00000000000..4b26a6af8ef
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse-small2.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse-small3.png b/data/core/images/terrain/forest/tropical/savanna-sparse-small3.png
new file mode 100644
index 00000000000..be1a32dd404
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse-small3.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse-small4.png b/data/core/images/terrain/forest/tropical/savanna-sparse-small4.png
new file mode 100644
index 00000000000..a9ce7e69a9a
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse-small4.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse-small5.png b/data/core/images/terrain/forest/tropical/savanna-sparse-small5.png
new file mode 100644
index 00000000000..713752359f2
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse-small5.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse-small6.png b/data/core/images/terrain/forest/tropical/savanna-sparse-small6.png
new file mode 100644
index 00000000000..bec55624978
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse-small6.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse.png b/data/core/images/terrain/forest/tropical/savanna-sparse.png
new file mode 100644
index 00000000000..4d69b5b2d80
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse2.png b/data/core/images/terrain/forest/tropical/savanna-sparse2.png
new file mode 100644
index 00000000000..d9c291a0e26
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse2.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse3.png b/data/core/images/terrain/forest/tropical/savanna-sparse3.png
new file mode 100644
index 00000000000..1f36d4423e9
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse3.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse4.png b/data/core/images/terrain/forest/tropical/savanna-sparse4.png
new file mode 100644
index 00000000000..7a863491469
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse4.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse5.png b/data/core/images/terrain/forest/tropical/savanna-sparse5.png
new file mode 100644
index 00000000000..f0c07d75a1c
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse5.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-sparse6.png b/data/core/images/terrain/forest/tropical/savanna-sparse6.png
new file mode 100644
index 00000000000..7b4f3ee79b8
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-sparse6.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna-tile.png b/data/core/images/terrain/forest/tropical/savanna-tile.png
new file mode 100644
index 00000000000..d15a1a79e36
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna-tile.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna.png b/data/core/images/terrain/forest/tropical/savanna.png
new file mode 100644
index 00000000000..cb730f9d06f
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna10.png b/data/core/images/terrain/forest/tropical/savanna10.png
new file mode 100644
index 00000000000..24899c322b8
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna10.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna11.png b/data/core/images/terrain/forest/tropical/savanna11.png
new file mode 100644
index 00000000000..c352ea327d3
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna11.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna12.png b/data/core/images/terrain/forest/tropical/savanna12.png
new file mode 100644
index 00000000000..cb29137b055
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna12.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna2.png b/data/core/images/terrain/forest/tropical/savanna2.png
new file mode 100644
index 00000000000..33042d01859
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna2.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna3.png b/data/core/images/terrain/forest/tropical/savanna3.png
new file mode 100644
index 00000000000..545223bd266
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna3.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna4.png b/data/core/images/terrain/forest/tropical/savanna4.png
new file mode 100644
index 00000000000..1909a647073
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna4.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna5.png b/data/core/images/terrain/forest/tropical/savanna5.png
new file mode 100644
index 00000000000..a6c3c9ee4dd
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna5.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna6.png b/data/core/images/terrain/forest/tropical/savanna6.png
new file mode 100644
index 00000000000..1c811ff0cc5
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna6.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna7.png b/data/core/images/terrain/forest/tropical/savanna7.png
new file mode 100644
index 00000000000..ed630db0d9f
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna7.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna8.png b/data/core/images/terrain/forest/tropical/savanna8.png
new file mode 100644
index 00000000000..50fa31a00f7
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna8.png differ
diff --git a/data/core/images/terrain/forest/tropical/savanna9.png b/data/core/images/terrain/forest/tropical/savanna9.png
new file mode 100644
index 00000000000..82f8aded507
Binary files /dev/null and b/data/core/images/terrain/forest/tropical/savanna9.png differ
diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg
index b473dd18981..3545c376ee8 100644
--- a/data/core/terrain-graphics.cfg
+++ b/data/core/terrain-graphics.cfg
@@ -137,8 +137,14 @@
 {NEW:FOREST             H*^Ft,M*^Ft     (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical-sparse}
 {NEW:FOREST             *^Ft            (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical}
 
-{NEW:FOREST             H*^Ftd,M*^Ftd   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/palm-sparse}
-{NEW:FOREST             *^Ftd           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/palm}
+{NEW:FOREST             H*^Ftd,M*^Ftd   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/palm-desert-sparse}
+{NEW:FOREST             *^Ftd           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/palm-desert}
+
+{NEW:FOREST             H*^Ftp,M*^Ftp   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/palms-sparse}
+{NEW:FOREST             *^Ftp           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/palms}
+
+{NEW:FOREST             H*^Fts,M*^Fts   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/savanna-sparse}
+{NEW:FOREST             *^Fts           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/savanna}
 
 {NEW:FOREST             H*^Fpa,M*^Fpa   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/snow-forest-sparse}
 {NEW:FOREST             *^Fpa           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/snow-forest}
diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg
index 8424d53991a..e8f64221e3d 100644
--- a/data/core/terrain.cfg
+++ b/data/core/terrain.cfg
@@ -491,8 +491,8 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=forest/palm-desert-tile
-    id=palm_forest
+    symbol_image=forest/tropical/palm-desert-tile
+    id=palm_desert_forest
     name= _ "Forest"
     editor_name= _ "Palm Forest"
     string=^Ftd
@@ -502,6 +502,30 @@
     editor_group=forest,desert
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=forest/tropical/palms-tile
+    id=palm_forest
+    name= _ "Forest"
+    editor_name= _ "Dense Palm Forest"
+    string=^Ftp
+    default_base=Gs
+    aliasof=_bas,Ft
+    mvt_alias=-,_bas,Ft
+    editor_group=forest
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/tropical/savanna-tile
+    id=savanna_forest
+    name= _ "Forest"
+    editor_name= _ "Savanna"
+    string=^Fts
+    default_base=Gd
+    aliasof=_bas,Ft
+    mvt_alias=-,_bas,Ft
+    editor_group=forest,desert
+[/terrain_type]
+
 [terrain_type]
     symbol_image=forest/pine-tile
     id=pine_forest
@@ -825,8 +849,8 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=forest/palms-on-dunes-tile
-    id=forest_palm_hills
+    symbol_image=forest/tropical/palms-on-dunes-tile
+    id=forest_palm_desert_hills
     name= _ "Hills"
     editor_name= _ "Palm Forested Hills"
     string=Hd^Ftd
diff --git a/players_changelog b/players_changelog
index efe74c47068..baa0e7d4954 100644
--- a/players_changelog
+++ b/players_changelog
@@ -26,6 +26,9 @@ Version 1.11.0+svn:
      French, Galician, German, Hungarian, Italian, Latin, Polish,
      Portuguese (Brazil), Russian, Slovak, Ukrainian.
 
+ * Terrain:
+   * New Unwalkable Overlay (^Qov), Dense Palm (^Ftp), Savanna (^Fts) terrains.
+
  * User interface:
    * Healing animations are now played when poison is cured.
    * Moving units to a selected hex field