diff --git a/Defs/Ammo/Shell/100x695mmR.xml b/Defs/Ammo/Shell/100x695mmR.xml
index 63fa3ae1b2..26fac96aa0 100644
--- a/Defs/Ammo/Shell/100x695mmR.xml
+++ b/Defs/Ammo/Shell/100x695mmR.xml
@@ -43,7 +43,7 @@
 		<defName>Ammo_100x695mmRCannonShell_HEAT</defName>
 		<label>100x695mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -58,7 +58,7 @@
 		<defName>Ammo_100x695mmRCannonShell_HE</defName>
 		<label>100x695mmR cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -88,7 +88,7 @@
 		<defName>Bullet_100x695mmRCannonShell_HEAT</defName>
 		<label>100x695mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/HEAT</texPath>
+			<texPath>Things/Projectile/Cannon/HEATFS</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
diff --git a/Defs/Ammo/Shell/105mmHowitzer.xml b/Defs/Ammo/Shell/105mmHowitzer.xml
index 4fa0141a33..d5b02d338c 100644
--- a/Defs/Ammo/Shell/105mmHowitzer.xml
+++ b/Defs/Ammo/Shell/105mmHowitzer.xml
@@ -78,7 +78,7 @@
 		<defName>Ammo_105mmHowitzerShell_HEAT</defName>
 		<label>105mm Howitzer shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
diff --git a/Defs/Ammo/Shell/105x607mmR.xml b/Defs/Ammo/Shell/105x607mmR.xml
index 62a0e83e3d..d150f658d7 100644
--- a/Defs/Ammo/Shell/105x607mmR.xml
+++ b/Defs/Ammo/Shell/105x607mmR.xml
@@ -44,7 +44,7 @@
 		<defName>Ammo_105x607mmRCannonShell_HEAT</defName>
 		<label>105x607mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -58,7 +58,7 @@
 		<defName>Ammo_105x607mmRCannonShell_HE</defName>
 		<label>105x607mmR cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
diff --git a/Defs/Ammo/Shell/105x617mmR.xml b/Defs/Ammo/Shell/105x617mmR.xml
index 0a5c63baf3..b12f75c83c 100644
--- a/Defs/Ammo/Shell/105x617mmR.xml
+++ b/Defs/Ammo/Shell/105x617mmR.xml
@@ -42,8 +42,8 @@
 		<defName>Ammo_105x617mmRCannonShell_HEAT</defName>
 		<label>105x617mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/120mmTank/HEAT</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<MarketValue>142.42</MarketValue>
@@ -58,8 +58,8 @@
 		<defName>Ammo_105x617mmRCannonShell_HE</defName>
 		<label>105x617mmR cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/120mmTank/HE</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<MarketValue>156.72</MarketValue>
@@ -88,7 +88,7 @@
 		<defName>Bullet_105x617mmRCannonShell_HEAT</defName>
 		<label>105x617mmR cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/HEAT</texPath>
+			<texPath>Things/Projectile/Cannon/HEATFS</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -120,7 +120,7 @@
 		<label>105x617mmR cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/HE</texPath>
+			<texPath>Things/Projectile/Cannon/HEFS</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
diff --git a/Defs/Ammo/Shell/120mmCannon.xml b/Defs/Ammo/Shell/120mmCannon.xml
index 3cc27ca409..45b2fbbe4c 100644
--- a/Defs/Ammo/Shell/120mmCannon.xml
+++ b/Defs/Ammo/Shell/120mmCannon.xml
@@ -5,7 +5,7 @@
 		<defName>Ammo120mmCannonShells</defName>
 		<label>120mm cannon shell</label>
 		<parent>AmmoShells</parent>
-		<iconPath>Things/Ammo/Cannon/120mmTank/HE</iconPath>
+		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
 	</ThingCategoryDef>
 
 	<!-- ==================== AmmoSet ========================== -->
@@ -44,8 +44,8 @@
 		<defName>Ammo_120mmCannonShell_HEAT</defName>
 		<label>120mm cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/120mmTank/HEAT</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<MarketValue>149.17</MarketValue>
@@ -58,8 +58,8 @@
 		<defName>Ammo_120mmCannonShell_HE</defName>
 		<label>120mm cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/120mmTank/HE</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<MarketValue>172.67</MarketValue>
@@ -87,7 +87,7 @@
 		<defName>Bullet_120mmCannonShell_HEAT</defName>
 		<label>120mm cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
+			<texPath>Things/Projectile/Cannon/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -118,7 +118,7 @@
 		<label>120mm cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/120mmTank/HE</texPath>
+			<texPath>Things/Projectile/Cannon/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
diff --git a/Defs/Ammo/Shell/57x307mmR.xml b/Defs/Ammo/Shell/57x307mmR.xml
index 2e2354416e..5606c95261 100644
--- a/Defs/Ammo/Shell/57x307mmR.xml
+++ b/Defs/Ammo/Shell/57x307mmR.xml
@@ -43,7 +43,7 @@
 		<defName>Ammo_57x307mmR_AP</defName>
 		<label>57x307mmR cartridge (AP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/APHE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/APHE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -57,7 +57,7 @@
 		<defName>Ammo_57x307mmR_HE</defName>
 		<label>57x307mmR cartridge (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
diff --git a/Defs/Ammo/Shell/75x350mmR.xml b/Defs/Ammo/Shell/75x350mmR.xml
index b25ccf65b6..e10d426083 100644
--- a/Defs/Ammo/Shell/75x350mmR.xml
+++ b/Defs/Ammo/Shell/75x350mmR.xml
@@ -42,7 +42,7 @@
 		<defName>Ammo_75x350mmR_AP</defName>
 		<label>75x350mmR cartridge (AP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/APHE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/APHE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -57,7 +57,7 @@
 		<defName>Ammo_75x350mmR_HE</defName>
 		<label>75x350mmR cartridge (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
diff --git a/Defs/Ammo/Shell/762x385mmRCannon.xml b/Defs/Ammo/Shell/762x385mmRCannon.xml
index 7f48368bf3..d30498aad3 100644
--- a/Defs/Ammo/Shell/762x385mmRCannon.xml
+++ b/Defs/Ammo/Shell/762x385mmRCannon.xml
@@ -5,7 +5,7 @@
 		<defName>Ammo762x385mmRCannonShells</defName>
 		<label>76.2x385mmR Cannon shell</label>
 		<parent>AmmoShells</parent>
-		<iconPath>Things/Ammo/Cannon/762x385mmR/HE</iconPath>
+		<iconPath>Things/Ammo/Cannon/HE</iconPath>
 	</ThingCategoryDef>
 
 	<!-- ==================== AmmoSet ========================== -->
@@ -45,7 +45,7 @@
 		<defName>Ammo_762x385mmRCannonShell_HEAT</defName>
 		<label>76.2x385mmR Cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/762x385mmR/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<statBases>
@@ -59,7 +59,7 @@
 		<defName>Ammo_762x385mmRCannonShell_HE</defName>
 		<label>76.2x385mmR Cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/762x385mmR/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<statBases>
@@ -73,7 +73,7 @@
 		<defName>Ammo_762x385mmRCannonShell_EMP</defName>
 		<label>76.2x385mmR Cannon shell (EMP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/762x385mmR/EMP</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/EMP</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<statBases>
@@ -102,7 +102,7 @@
 		<defName>Bullet_762x385mmRCannonShell_HEAT</defName>
 		<label>76.2x385mmR Cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/762x385mmR/HE</texPath>
+			<texPath>Things/Projectile/Cannon/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -133,7 +133,7 @@
 		<label>76.2x385mmR Cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/762x385mmR/HE</texPath>
+			<texPath>Things/Projectile/Cannon/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -158,7 +158,7 @@
 		<label>76.2x385mmR Cannon shell (EMP)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
-			<texPath>Things/Projectile/Cannon/762x385mmR/EMP</texPath>
+			<texPath>Things/Projectile/Cannon/EMP</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
diff --git a/Defs/Ammo/Shell/90mmCannon.xml b/Defs/Ammo/Shell/90mmCannon.xml
index cefb107ac4..0287a14e7d 100644
--- a/Defs/Ammo/Shell/90mmCannon.xml
+++ b/Defs/Ammo/Shell/90mmCannon.xml
@@ -48,7 +48,7 @@
 		<defName>Ammo_90mmCannonShell_HEAT</defName>
 		<label>90mm cannon shell (HEAT)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -63,7 +63,7 @@
 		<defName>Ammo_90mmCannonShell_HE</defName>
 		<label>90mm cannon shell (HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -77,7 +77,7 @@
 		<defName>Ammo_90mmCannonShell_HE_TFuzed</defName>
 		<label>90mm cannon shell (HE Time-Fuzed)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -91,7 +91,7 @@
 		<defName>Ammo_90mmCannonShell_EMP</defName>
 		<label>90mm cannon shell (EMP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Cannon/Flak/EMP</texPath>
+			<texPath>Things/Ammo/Cannon/Tank/EMP</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
diff --git a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml
index 39689a1594..608240456d 100644
--- a/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml	
+++ b/Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml	
@@ -474,7 +474,7 @@
 							<defName>Bullet_OR_WristRocket</defName>
 							<label>wrist rocket</label>
 							<graphicData>
-								<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
+								<texPath>Things/Projectile/Cannon/Sabot</texPath>
 								<graphicClass>Graphic_Single</graphicClass>
 							</graphicData>
 							<projectile Class="CombatExtended.ProjectilePropertiesCE">
diff --git a/Patches/Orassans/Ammo/MissileAmmo.xml b/Patches/Orassans/Ammo/MissileAmmo.xml
index 09eddf02df..60711ff769 100644
--- a/Patches/Orassans/Ammo/MissileAmmo.xml
+++ b/Patches/Orassans/Ammo/MissileAmmo.xml
@@ -13,7 +13,7 @@
 					<defName>AmmoOrassanMissileShells</defName>
 					<label>orassan missile shell</label>
 					<parent>AmmoShells</parent>
-					<iconPath>Things/Projectile/Cannon/120mmTank/HE</iconPath>
+					<iconPath>Things/Projectile/Cannon/HE</iconPath>
 				</ThingCategoryDef>
 
 				<!-- ==================== AmmoSet ========================== -->
@@ -53,7 +53,7 @@
 					<defName>Ammo_OrassanMissileShell_HEAT</defName>
 					<label>Orassan Missile shell (HEAT)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
+						<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
 						<graphicClass>Graphic_Single</graphicClass>
 					</graphicData>
 					<statBases>
@@ -67,7 +67,7 @@
 					<defName>Ammo_OrassanMissileShell_HE</defName>
 					<label>Orassan Missile shell (HE)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
+						<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
 						<graphicClass>Graphic_Single</graphicClass>
 					</graphicData>
 					<statBases>
@@ -81,7 +81,7 @@
 					<defName>Ammo_OrassanMissileShell_APSabot</defName>
 					<label>Orassan Missile shell (AP Sabot)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
+						<texPath>Things/Projectile/Cannon/Tank/Sabot</texPath>
 						<graphicClass>Graphic_Single</graphicClass>
 					</graphicData>
 					<statBases>
@@ -111,8 +111,8 @@
 					<defName>Bullet_OrassanMissileShell_HEAT</defName>
 					<label>Orassan Missile shell (HEAT)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
+						<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
+						<graphicClass>Graphic_StackCount</graphicClass>
 					</graphicData>
 					<projectile Class="CombatExtended.ProjectilePropertiesCE">
 						<damageDef>Bullet</damageDef>
@@ -141,8 +141,8 @@
 					<defName>Bullet_OrassanMissileShell_APSabot</defName>
 					<label>Orassan Missile shell (AP Sabot)</label>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
+						<texPath>Things/Projectile/Cannon/Tank/Sabot</texPath>
+						<graphicClass>Graphic_StackCount</graphicClass>
 					</graphicData>
 					<projectile Class="CombatExtended.ProjectilePropertiesCE">
 						<damageDef>Bullet</damageDef>
@@ -172,8 +172,8 @@
 					<label>Orassan Missile shell (HE)</label>
 					<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 					<graphicData>
-						<texPath>Things/Projectile/Cannon/120mmTank/HE</texPath>
-						<graphicClass>Graphic_Single</graphicClass>
+						<texPath>Things/Projectile/Cannon/Tank/HE</texPath>
+						<graphicClass>Graphic_StackCount</graphicClass>
 					</graphicData>
 					<projectile Class="CombatExtended.ProjectilePropertiesCE">
 						<damageDef>Bomb</damageDef>
diff --git a/Textures/Things/Ammo/Cannon/120mmTank/Canister.png b/Textures/Things/Ammo/Cannon/120mmTank/Canister.png
deleted file mode 100644
index 8cd1c9d603..0000000000
Binary files a/Textures/Things/Ammo/Cannon/120mmTank/Canister.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/120mmTank/HE.png b/Textures/Things/Ammo/Cannon/120mmTank/HE.png
deleted file mode 100644
index c998fea286..0000000000
Binary files a/Textures/Things/Ammo/Cannon/120mmTank/HE.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/120mmTank/HEAT.png b/Textures/Things/Ammo/Cannon/120mmTank/HEAT.png
deleted file mode 100644
index 569704fd6e..0000000000
Binary files a/Textures/Things/Ammo/Cannon/120mmTank/HEAT.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/120mmTank/Sabot.png b/Textures/Things/Ammo/Cannon/120mmTank/Sabot.png
deleted file mode 100644
index fed1469f03..0000000000
Binary files a/Textures/Things/Ammo/Cannon/120mmTank/Sabot.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/762x385mmR/EMP.png b/Textures/Things/Ammo/Cannon/762x385mmR/EMP.png
deleted file mode 100644
index 8280a8348d..0000000000
Binary files a/Textures/Things/Ammo/Cannon/762x385mmR/EMP.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/762x385mmR/HE.png b/Textures/Things/Ammo/Cannon/762x385mmR/HE.png
deleted file mode 100644
index d43a2f7c2d..0000000000
Binary files a/Textures/Things/Ammo/Cannon/762x385mmR/HE.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/762x385mmR/HEAT.png b/Textures/Things/Ammo/Cannon/762x385mmR/HEAT.png
deleted file mode 100644
index 7c8aca9953..0000000000
Binary files a/Textures/Things/Ammo/Cannon/762x385mmR/HEAT.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_a.png b/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_a.png
deleted file mode 100644
index c234163fe6..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_a.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_b.png b/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_b.png
deleted file mode 100644
index 13c5320ea7..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_b.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_c.png b/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_c.png
deleted file mode 100644
index b6aae902fd..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/APHE/APHE_c.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_a.png b/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_a.png
deleted file mode 100644
index fec1f6c949..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_a.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_b.png b/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_b.png
deleted file mode 100644
index 6d465b5b1e..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_b.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_c.png b/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_c.png
deleted file mode 100644
index 9374dae051..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/EMP/EMP_c.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/HE/HE_a.png b/Textures/Things/Ammo/Cannon/Flak/HE/HE_a.png
deleted file mode 100644
index 24b203b277..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/HE/HE_a.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/HE/HE_b.png b/Textures/Things/Ammo/Cannon/Flak/HE/HE_b.png
deleted file mode 100644
index c515d391a5..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/HE/HE_b.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/HE/HE_c.png b/Textures/Things/Ammo/Cannon/Flak/HE/HE_c.png
deleted file mode 100644
index c3ba0fd7ee..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/HE/HE_c.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_a.png b/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_a.png
deleted file mode 100644
index 883537b7ba..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_a.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_b.png b/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_b.png
deleted file mode 100644
index 899cf22f38..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_b.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_c.png b/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_c.png
deleted file mode 100644
index 93128e7f9f..0000000000
Binary files a/Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_c.png and /dev/null differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_a.png b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_a.png
new file mode 100644
index 0000000000..edb73d9f0d
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_b.png b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_b.png
new file mode 100644
index 0000000000..9ed121a341
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_c.png b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_c.png
new file mode 100644
index 0000000000..d4c36bb218
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_a.png b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_a.png
new file mode 100644
index 0000000000..508872e197
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_b.png b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_b.png
new file mode 100644
index 0000000000..8f9ab5f01f
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_c.png b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_c.png
new file mode 100644
index 0000000000..cfce902220
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_a.png b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_a.png
new file mode 100644
index 0000000000..d21b91dab7
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_b.png b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_b.png
new file mode 100644
index 0000000000..877fac4e20
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_c.png b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_c.png
new file mode 100644
index 0000000000..e04e16dbe6
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png b/Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png
new file mode 100644
index 0000000000..7900b4a567
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png b/Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png
new file mode 100644
index 0000000000..e52d8b3a95
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png b/Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png
new file mode 100644
index 0000000000..6ef9f2284e
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png
new file mode 100644
index 0000000000..f954567c35
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png
new file mode 100644
index 0000000000..45ed9b9b39
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png
new file mode 100644
index 0000000000..32b608cfab
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png
new file mode 100644
index 0000000000..089cd11165
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png
new file mode 100644
index 0000000000..0593920459
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png
new file mode 100644
index 0000000000..23b9169631
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png
new file mode 100644
index 0000000000..6e7c3f1e56
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png
new file mode 100644
index 0000000000..44637789b1
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png
new file mode 100644
index 0000000000..1e200cb885
Binary files /dev/null and b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png differ
diff --git a/Textures/Things/Projectile/Cannon/120mmTank/HE.png b/Textures/Things/Projectile/Cannon/120mmTank/HE.png
deleted file mode 100644
index a97dec7330..0000000000
Binary files a/Textures/Things/Projectile/Cannon/120mmTank/HE.png and /dev/null differ
diff --git a/Textures/Things/Projectile/Cannon/120mmTank/HEAT.png b/Textures/Things/Projectile/Cannon/120mmTank/HEAT.png
deleted file mode 100644
index af284a2dc5..0000000000
Binary files a/Textures/Things/Projectile/Cannon/120mmTank/HEAT.png and /dev/null differ
diff --git a/Textures/Things/Projectile/Cannon/120mmTank/Sabot.png b/Textures/Things/Projectile/Cannon/120mmTank/Sabot.png
deleted file mode 100644
index aa05c790c5..0000000000
Binary files a/Textures/Things/Projectile/Cannon/120mmTank/Sabot.png and /dev/null differ
diff --git a/Textures/Things/Projectile/Cannon/APHE.png b/Textures/Things/Projectile/Cannon/APHE.png
index 1798f11eff..70b56a8f6c 100644
Binary files a/Textures/Things/Projectile/Cannon/APHE.png and b/Textures/Things/Projectile/Cannon/APHE.png differ
diff --git a/Textures/Things/Projectile/Cannon/EMP.png b/Textures/Things/Projectile/Cannon/EMP.png
index f2b7b32031..c06eeafdf4 100644
Binary files a/Textures/Things/Projectile/Cannon/EMP.png and b/Textures/Things/Projectile/Cannon/EMP.png differ
diff --git a/Textures/Things/Projectile/Cannon/EMPFS.png b/Textures/Things/Projectile/Cannon/EMPFS.png
new file mode 100644
index 0000000000..6994983926
Binary files /dev/null and b/Textures/Things/Projectile/Cannon/EMPFS.png differ
diff --git a/Textures/Things/Projectile/Cannon/HEAT.png b/Textures/Things/Projectile/Cannon/HEAT.png
index 0c8f113e82..d3595cb860 100644
Binary files a/Textures/Things/Projectile/Cannon/HEAT.png and b/Textures/Things/Projectile/Cannon/HEAT.png differ
diff --git a/Textures/Things/Projectile/Cannon/HEATFS.png b/Textures/Things/Projectile/Cannon/HEATFS.png
new file mode 100644
index 0000000000..15bd706be0
Binary files /dev/null and b/Textures/Things/Projectile/Cannon/HEATFS.png differ
diff --git a/Textures/Things/Projectile/Cannon/HEFS.png b/Textures/Things/Projectile/Cannon/HEFS.png
new file mode 100644
index 0000000000..ad6200846b
Binary files /dev/null and b/Textures/Things/Projectile/Cannon/HEFS.png differ
diff --git a/Textures/Things/Projectile/Cannon/Sabot.png b/Textures/Things/Projectile/Cannon/Sabot.png
new file mode 100644
index 0000000000..f36836c94e
Binary files /dev/null and b/Textures/Things/Projectile/Cannon/Sabot.png differ