diff --git a/android/ImagesToPackSeparately/BuildingIcons/Military Base.png b/android/ImagesToPackSeparately/BuildingIcons/Military Base.png
index 37323e84b5..b98c90b29a 100644
Binary files a/android/ImagesToPackSeparately/BuildingIcons/Military Base.png and b/android/ImagesToPackSeparately/BuildingIcons/Military Base.png differ
diff --git a/android/assets/BuildingIcons.png b/android/assets/BuildingIcons.png
index 394c37f03b..68f9f03905 100644
Binary files a/android/assets/BuildingIcons.png and b/android/assets/BuildingIcons.png differ
diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json
index 8de88ae4c2..f20944e4bc 100644
--- a/android/assets/jsons/Civ V - Vanilla/Units.json	
+++ b/android/assets/jsons/Civ V - Vanilla/Units.json	
@@ -86,7 +86,7 @@
 		"rangedStrength": 7,
 		"cost": 40,
 		"requiredTech": "Archery",
-		"obsoleteTech": "Machinery",
+		"obsoleteTech": "Construction",
 		"upgradesTo": "Composite Bowman",
 		"attackSound": "arrow"
 	},
@@ -998,7 +998,7 @@
 		"interceptRange": 8,
 		"cost": 375,
 		"requiredTech": "Radar",
-		//"upgradesTo": "Jet Fighter",
+		"upgradesTo": "Jet Fighter",
 		"uniques": ["[100]% chance to intercept air attacks","+[150]% Strength vs [Bomber]","+[33]% Strength vs [Fighter]",
 			"6 tiles in every direction always visible"],
 		"attackSound": "shot"
@@ -1198,6 +1198,7 @@
 		"cost": 375,
 		"requiredTech": "Ballistics",
 		"upgradesTo": "Mobile SAM",
+		"obsoleteTech": "Rocketry",
 		"uniques": ["[100]% chance to intercept air attacks","+[150]% Strength vs [air units]"],
 		"attackSound": "machinegun"
 	},
@@ -1309,7 +1310,7 @@
 		"requiredResource": "Aluminum",
 		"uniques": ["[100]% chance to intercept air attacks",
 			"+[150]% Strength vs [Bomber]",
-			"6 tiles in every direction always visible"]
+			"6 tiles in every direction always visible"],
 		"attackSound": "shot"
 	},
 	/* // THIS STUFF IS COMMENTED OUT!!!
@@ -1323,7 +1324,7 @@
 		"cost": 425,
 		"requiredTech": "Stealth",
 		"requiredResource": "Aluminum",
-		"uniques": ["Evasion", "6 tiles in every direction always visible"]
+		"uniques": ["Evasion", "6 tiles in every direction always visible"],
 		"attackSound": "shot"
 		// cannot be based on carrier
 	},
diff --git a/docs/Credits.md b/docs/Credits.md
index 5ef7e9bd7d..380e8b5a7b 100644
--- a/docs/Credits.md
+++ b/docs/Credits.md
@@ -76,7 +76,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Lance](https://thenounproject.com/search/?q=Lance&i=440122) By parkjisun for Lancer
 * [Sword](https://thenounproject.com/search/?q=saber&i=1174742) By Daniela Baptista for Sipahi
 
-### Industrial
+### Industrial Era
 
 * [Rifle](https://thenounproject.com/search/?q=Rifle&i=604291) By Chameleon Design for Rifleman
 * [Horse](https://thenounproject.com/search/?q=Horse&i=1023745) By Bakunetso Kaito for Cavalry
@@ -84,7 +84,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Artillery](https://thenounproject.com/search/?q=Artillery&i=1165261) By Creative Mania
 * [Ship](https://thenounproject.com/term/ship/1594793/) By Aisyah for Ironclad
 
-### Modern, Atomic and Information
+### Modern, Atomic and Information Eras
 
 * [Helmet](https://thenounproject.com/term/helmet/25216/) By Daniel Turner for Great War Infantry
 * [Cap](https://thenounproject.com/search/?q=kepi&i=950267) By Creative Mania for Foreign Legion
@@ -257,7 +257,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 
 * [Stadium](https://thenounproject.com/term/stadium/13872/) By Karuna Lalvani
 * [Signal Tower](https://thenounproject.com/term/signal-tower/1547758/) By Nociconist for Broadcast Tower
-* [Base](https://thenounproject.com/term/base/3890712/) By Kevin for Military Base
+* [Hangar](https://thenounproject.com/search/?q=hangar&i=1705288) By Rflor for Military Base
 * [Eiffel Tower](https://thenounproject.com/term/eiffel-tower/1907757/) By Felipe Alvarado
 * [Statue of Liberty](https://thenounproject.com/search/?q=statue%20of%20liberty&i=1801199) By 1516
 * [Christ the redeemer](https://thenounproject.com/term/christ-the-redeemer/56112/) By Stefan Spieler for Cristo Redentor