diff --git a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
index 2818f9392..43e65aa58 100644
--- a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
+++ b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
@@ -42,9 +42,12 @@
 	<temperatureModificator>	additive modifier for temperature generation. 1.0 means +100%
 	<dirtModificator>			additive modifier for dirt generation. 1.0 means +100%
 	<ammoflag>			flagmask for various ammo properties:
-							AMMO_CRYO			1			this ammo shock-freezes target (scifi)
-							AMMO_BLIND			2			this ammo will blind if it hits the head
-							AMMO_ANTIMATERIEL	4			this ammo is anti-materiel, bullets can destroy structures
+							AMMO_CRYO				1			this ammo shock-freezes target (scifi)
+							AMMO_BLIND				2			this ammo will blind if it hits the head
+							AMMO_ANTIMATERIEL		4			this ammo is anti-materiel, bullets can destroy structures
+							AMMO_TRAIL_WHITESMOKE	8			this ammo leaves a trail of white smoke
+							AMMO_TRAIL_FIRE			16			this ammo leaves a trail of fire
+
 	<dDamageModifierLife>					multiplier for damage to health
 	<dDamageModifierBreath>					multiplier for damage to breath
 	<dDamageModifierTank>					additional multiplier for damage to health if target is a tank
@@ -537,9 +540,9 @@
 	<AMMOTYPE>
 		<uiIndex>12</uiIndex>
 		<name>Flame</name>
-		<red>137</red>
-		<green>137</green>
-		<blue>137</blue>
+		<red>255</red>
+		<green>128</green>
+		<blue>40</blue>
 		<structureImpactReductionMultiplier>1</structureImpactReductionMultiplier>
 		<structureImpactReductionDivisor>1</structureImpactReductionDivisor>
 		<armourImpactReductionMultiplier>1</armourImpactReductionMultiplier>
@@ -554,8 +557,8 @@
 		<numberOfBullets>1</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
-		<highExplosive>0</highExplosive>
-		<explosionSize>0</explosionSize>
+		<highExplosive>979</highExplosive>
+		<explosionSize>4</explosionSize>
 		<dart>0</dart>
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
@@ -566,7 +569,7 @@
 		<spreadPattern />
 		<temperatureModificator>0.5</temperatureModificator>
 		<dirtModificator>0.8</dirtModificator>
-		<ammoflag>0</ammoflag>
+		<ammoflag>16</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
 		<dDamageModifierTank>0.0</dDamageModifierTank>
@@ -1445,7 +1448,7 @@
 		<spreadPattern />
 		<temperatureModificator>1.0</temperatureModificator>
 		<dirtModificator>0.8</dirtModificator>
-		<ammoflag>0</ammoflag>
+		<ammoflag>8</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
 		<dDamageModifierTank>0.0</dDamageModifierTank>
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 19c4708cd..1cc40e7f7 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -198,7 +198,6 @@
 		<bloodbag>0</bloodbag>
 		<emptybloodbag>0</emptybloodbag>
 		<medicalsplint>0</medicalsplint>
-		<fireextinguisher>0</fireextinguisher>
 		<sFireResistance>0</sFireResistance>
 		<STAND_MODIFIERS>
 			<FlatBase>0</FlatBase>
@@ -52284,7 +52283,7 @@
 		<uiIndex>1761</uiIndex>
 		<szItemName>Extinguisher</szItemName>
 		<szLongItemName>Fire Extinguisher</szLongItemName>
-		<szItemDesc>Not as useful as one would think in an actual fire fight. Though we see why you made that error.</szItemDesc>
+		<szItemDesc>Not as useful as one would think in an actual fire fight. Though we can see why you made that error.</szItemDesc>
 		<szBRName>Fire Extinguisher</szBRName>
 		<szBRDesc>A standard fire extinguisher. Remember to P.A.S.S..</szBRDesc>
 		<usItemClass>2</usItemClass>
@@ -52306,7 +52305,6 @@
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_ROF>12</BR_ROF>
 		<GrenadeLauncher>1</GrenadeLauncher>
-		<fireextinguisher>1</fireextinguisher>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<DamageChance>10</DamageChance>
 		<DirtIncreaseFactor>20.0</DirtIncreaseFactor>
diff --git a/gamedir/Data/Interface/ItemInfoSecondaryIcons.sti b/gamedir/Data/Interface/ItemInfoSecondaryIcons.sti
new file mode 100644
index 000000000..add912bee
Binary files /dev/null and b/gamedir/Data/Interface/ItemInfoSecondaryIcons.sti differ