diff --git a/Credits.md b/Credits.md
index 4cc4659976..ccf7328ecb 100644
--- a/Credits.md
+++ b/Credits.md
@@ -151,7 +151,9 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [College](https://thenounproject.com/term/college/1203703/) By Vectors Market for National College
 * [Chichen Itza](https://thenounproject.com/term/chichen-itza/668065/) By Hea Poh Lin
 * [Christian Church](https://thenounproject.com/term/christian-church/1174183/) By Andrejs Kirma for Monastery
+* [Castle](https://thenounproject.com/search/?q=castle&i=390189) By Mint Shirt
 * [Cambodia](https://thenounproject.com/term/cambodia/1809152/) By Wichai Wi for Angkor Wat
+* [Alhambra](https://thenounproject.com/search/?q=alhambra&i=403759) By parkjisun
 * [Books](https://thenounproject.com/term/books/1140218/) By Abir Alward for Oxford University
 * [Forge](https://thenounproject.com/term/forge/1044767/) By Monjin Friends
 * [Anchor](https://thenounproject.com/term/anchor/1258518/) By Saeful Muslim for Harbor
diff --git a/android/Images/BuildingIcons/Alhambra.png b/android/Images/BuildingIcons/Alhambra.png
new file mode 100644
index 0000000000..acd790d9c9
Binary files /dev/null and b/android/Images/BuildingIcons/Alhambra.png differ
diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json
index 80ce78c91c..7913def1ea 100644
--- a/android/assets/jsons/Buildings.json
+++ b/android/assets/jsons/Buildings.json
@@ -328,6 +328,16 @@
 		uniques:["Cost of acquiring new tiles reduced by 25%"],
 		requiredTech:"Chivalry"
 	},
+	{
+		name:"Alhambra",
+		culture:1,
+		greatPersonPoints:{culture:1},
+		isWonder:true,
+		providesFreeBuilding:"Castle",
+		percentStatBonus:{culture:20},
+		uniques:["All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion"],
+		requiredTech:"Chivalry"
+	},
 	{
 		name:"Ironworks",
 		production:8,
diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index c620876273..24b79c0c6c 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -4464,6 +4464,9 @@
         Portuguese:"Castelo"
 	}
 	
+	"Alhambra":{}
+	"All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion":{}
+	
 	"Angkor Wat":{	
 		Italian:"Angkor Wat"
 		Russian:"Ангкор-Ват"
diff --git a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
index 47e4f375de..ee91b883f2 100644
--- a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
+++ b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
@@ -112,6 +112,11 @@ class BaseUnit : INamed, IConstruction, ICivilopedia {
         unit.promotions.XP += construction.getBuiltBuildings().sumBy { it.xpForNewUnits }
         if(construction.cityInfo.civInfo.policies.isAdopted("Total War"))
             unit.promotions.XP += 15
+
+        if(unit.type in listOf(UnitType.Melee,UnitType.Mounted,UnitType.Armor)
+            && construction.cityInfo.getBuildingUniques()
+                .contains("All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion"))
+            unit.promotions.addPromotion("Drill I")
     }
 
     fun getUpgradeUnit(civInfo: CivilizationInfo):BaseUnit{