diff --git a/Credits.md b/Credits.md
index 64a1eb9a9b..041401ca42 100644
--- a/Credits.md
+++ b/Credits.md
@@ -64,6 +64,10 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Warship](https://thenounproject.com/term/warship/1597474/) By zidney for Destroyer
 * [Battleship](https://thenounproject.com/search/?q=battleship&i=1986807) By Vitaliy Gorbachev, KZ for Battleship
 * [Submarine](https://thenounproject.com/search/?q=submarine&i=589519) By Hea Poh Lin, MY
+* [xm8](https://thenounproject.com/term/xm8/172007/) By Xela Ub for Infantry
+* [machine-gun](https://thenounproject.com/search/?q=machine%20gun&i=591058) By Joana Pereira
+* [Anti-Tank Gun](https://thenounproject.com/term/anti-tank-gun/1802450/) By Tom Fricker
+* [Tank](https://thenounproject.com/search/?q=tank&i=981914) By jeff
 
 ### Great People
 
diff --git a/android/Images/TechIcons/Combined Arms.png b/android/Images/TechIcons/Combined Arms.png
new file mode 100644
index 0000000000..5ba332f9ce
Binary files /dev/null and b/android/Images/TechIcons/Combined Arms.png differ
diff --git a/android/Images/UnitIcons/Anti-Tank Gun.png b/android/Images/UnitIcons/Anti-Tank Gun.png
new file mode 100644
index 0000000000..c8ee768084
Binary files /dev/null and b/android/Images/UnitIcons/Anti-Tank Gun.png differ
diff --git a/android/Images/UnitIcons/Tank.png b/android/Images/UnitIcons/Tank.png
new file mode 100644
index 0000000000..6b99a6caec
Binary files /dev/null and b/android/Images/UnitIcons/Tank.png differ
diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json
index 1ee2df7ac8..ed39f327cb 100644
--- a/android/assets/jsons/Buildings.json
+++ b/android/assets/jsons/Buildings.json
@@ -621,7 +621,7 @@
 		greatPersonPoints:{production:1}
 		providesFreeBuilding:"Broadcast Tower"
 		uniques:["+1 population in each city","+1 happiness in each city"]
-		requiredTech:"Telecommunications"
+		requiredTech:"Telecommunications" // todo doesn't exist yet!
 	},
 	{
 		name:"Pentagon",
@@ -629,7 +629,7 @@
 		culture:1,
 		greatPersonPoints:{production:2}
 		uniques:["Gold cost of upgrading military units reduced by 33%"]
-		requiredTech:"Combined Arms"
+		requiredTech:"Combined Arms" // todo doesn't exist yet!
 	},
 	{
 		name:"Spaceship Factory",
diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index 2cf521b1be..6794cb54cc 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -5441,7 +5441,7 @@
 		Simplified_Chinese:"火箭炮"
 		Russian:"Ракетная Артиллерия"
 	}
-	"Anti-tank Gun":{
+	"Anti-Tank Gun":{
 		Romanian:"Tun antitanc"
 		Spanish:"Arma Anti-Pesados"
 		Simplified_Chinese:"反坦克炮"
diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json
index 23f19418e1..9928bc590b 100644
--- a/android/assets/jsons/Units.json
+++ b/android/assets/jsons/Units.json
@@ -418,6 +418,8 @@
 		hurryCostModifier:20,
 		uniques:["Can move after attacking","No defensive terrain bonus",
 			"Penalty vs City 33%","Bonus vs Mounted 33%" ],
+		upgradesTo:"Anti-Tank Gun",
+		obsoleteTech:"Combined Arms",
 		attackSound:"horse"
 	},
 	
@@ -568,6 +570,27 @@
 		hurryCostModifier:20,
 		attackSound:"machinegun"
 	},
+	{
+		name:"Tank",
+		unitType:"Armor",
+		movement:5,
+		strength:70,
+		cost: 375,
+		requiredTech:"Combined Arms",
+		requiredResource:"Oil",
+		uniques:["Can move after attacking","No defensive terrain bonus"]
+		hurryCostModifier:20,
+	},
+	{
+		name:"Anti-Tank Gun",
+		unitType:"Melee",
+		movement:2,
+		strength:50,
+		cost: 300,
+		requiredTech:"Combined Arms",
+		uniques:["Bonus vs Armor 100%"]
+		hurryCostModifier:20,
+	},
 	
 	
 	/* Great people */