diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml
index 69c48d4c3e..3dda71898a 100644
--- a/.github/workflows/buildAndDeploy.yml
+++ b/.github/workflows/buildAndDeploy.yml
@@ -33,6 +33,15 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: '8'
+          
+        # Cache gradle to improve runtime. For comparison, 20.08.21 - ~8m for full build.
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          key: "Gradle cache"
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
 
       # Runs a set of commands using the runners shell
       - name: check
diff --git a/android/Images/TileSets/FantasyHex/Tiles/City center-Atomic era.png b/android/Images/TileSets/FantasyHex/Tiles/City center-Atomic era.png
new file mode 100644
index 0000000000..cba815f241
Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/City center-Atomic era.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/Mount Kailash.png b/android/Images/TileSets/FantasyHex/Tiles/Mount Kailash.png
new file mode 100644
index 0000000000..bf46651120
Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Mount Kailash.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/Mount Sinai.png b/android/Images/TileSets/FantasyHex/Tiles/Mount Sinai.png
new file mode 100644
index 0000000000..d400344d80
Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Mount Sinai.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/Polder.png b/android/Images/TileSets/FantasyHex/Tiles/Polder.png
index a0f0f8f346..67c890e07e 100644
Binary files a/android/Images/TileSets/FantasyHex/Tiles/Polder.png and b/android/Images/TileSets/FantasyHex/Tiles/Polder.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/Sri Pada.png b/android/Images/TileSets/FantasyHex/Tiles/Sri Pada.png
new file mode 100644
index 0000000000..5382b908de
Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Sri Pada.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/Uluru.png b/android/Images/TileSets/FantasyHex/Tiles/Uluru.png
new file mode 100644
index 0000000000..06824e3ca2
Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Uluru.png differ
diff --git a/android/Images/TileSets/FantasyHex/Units/Inquisitor.png b/android/Images/TileSets/FantasyHex/Units/Inquisitor.png
new file mode 100644
index 0000000000..80c268aa12
Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Units/Inquisitor.png differ
diff --git a/android/Images/TileSets/FantasyHex/Units/Mechanized Infantry.png b/android/Images/TileSets/FantasyHex/Units/Mechanized Infantry.png
index cf19a6dc98..c7a80440d6 100644
Binary files a/android/Images/TileSets/FantasyHex/Units/Mechanized Infantry.png and b/android/Images/TileSets/FantasyHex/Units/Mechanized Infantry.png differ
diff --git a/android/Images/TileSets/FantasyHex/Units/Mobile SAM.png b/android/Images/TileSets/FantasyHex/Units/Mobile SAM.png
index ad9705106c..35f1715538 100644
Binary files a/android/Images/TileSets/FantasyHex/Units/Mobile SAM.png and b/android/Images/TileSets/FantasyHex/Units/Mobile SAM.png differ
diff --git a/android/Images/TileSets/FantasyHex/Units/Modern Armor.png b/android/Images/TileSets/FantasyHex/Units/Modern Armor.png
index 28feb334b3..9ce6eed885 100644
Binary files a/android/Images/TileSets/FantasyHex/Units/Modern Armor.png and b/android/Images/TileSets/FantasyHex/Units/Modern Armor.png differ
diff --git a/android/Images/TileSets/FantasyHex/Units/Rocket Artillery.png b/android/Images/TileSets/FantasyHex/Units/Rocket Artillery.png
index b9ddcaf427..29c0c34299 100644
Binary files a/android/Images/TileSets/FantasyHex/Units/Rocket Artillery.png and b/android/Images/TileSets/FantasyHex/Units/Rocket Artillery.png differ