diff --git a/language.version b/language.version
index 1058b19a1..a857a6072 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r795 \cu(Sat  1 Jul 14:30:40 CEST 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r795 \cu(2023-07-01 14:30:40)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r796 \cu(Sat  1 Jul 14:30:50 CEST 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r796 \cu(2023-07-01 14:30:50)\c-";
diff --git a/models/canvas/MortalGrenadeIcons.png b/models/canvas/MortalGrenadeIcons.png
index 6ee03408a..e4df08419 100644
Binary files a/models/canvas/MortalGrenadeIcons.png and b/models/canvas/MortalGrenadeIcons.png differ
diff --git a/zscript/dlc1/swwm_dlcweapons_canvas.zsc b/zscript/dlc1/swwm_dlcweapons_canvas.zsc
index 8c578ec26..33804e25a 100644
--- a/zscript/dlc1/swwm_dlcweapons_canvas.zsc
+++ b/zscript/dlc1/swwm_dlcweapons_canvas.zsc
@@ -200,7 +200,7 @@ extend Class MisterRifle
 		fw = 64;
 		fh = 32;
 		DrawWindowFrame(200-fw/2,72-(fh+8),fw,fh);
-		TouchScreen.DrawTexture(MortalIcons[0],false,200-fw/2,72-(fh+8),DTA_SrcY,firemode*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64);
+		TouchScreen.DrawTexture(MortalIcons[0],false,200-fw/2,72-(fh+8),DTA_SrcY,firemode*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_ColorOverlay,(!chambered||fired)?0x80000000:0x00000000);
 		if ( firemodeflash && (gametic < firemodeflash) )
 		{
 			double alph = clamp((firemodeflash-(gametic+e.fractic))/15.,0.,1.)**2.;
@@ -208,14 +208,13 @@ extend Class MisterRifle
 		}
 		str = StringTable.Localize("$SWWM_MRMODE"..(firemode+1));
 		DrawWindowFrame(200-fw/2,72+8,fw,fh);
-		if ( gchambered )
+		TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,0,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_ColorOverlay,(!gchambered||gfired)?0x80000000:0x00000000);
+		TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_ColorOverlay,gchambered?0x00000000:0x80000000);
+		if ( grenadeflash && (gametic < grenadeflash) )
 		{
-			TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,gfired*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_ColorOverlay,gfired?0x80000000:0x00000000);
-			if ( grenadeflash && (gametic < grenadeflash) )
-			{
-				double alph = clamp((grenadeflash-(gametic+e.fractic))/15.,0.,1.)**2.;
-				TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,gfired*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,64,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_Alpha,alph*(gfired?.4:.8),DTA_LegacyRenderStyle,STYLE_Add);
-			}
+			double alph = clamp((grenadeflash-(gametic+e.fractic))/15.,0.,1.)**2.;
+			TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,0,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,64,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_Alpha,alph*((!gchambered||gfired)?.4:.8),DTA_LegacyRenderStyle,STYLE_Add);
+			TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,64,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_Alpha,alph*(gchambered?.8:.4),DTA_LegacyRenderStyle,STYLE_Add);
 		}
 		if ( lowammotic && (lowammotic > gametic) )
 		{
@@ -277,8 +276,9 @@ extend Class MisterRifle
 		int dg2 = (ingun%10);
 		AmmoLed.DrawTexture(AmmoLedFont,false,24,0,DTA_SrcX,dg1*8,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,dg1?blink?0xFF400080:0xFF8000FF:blink?0xFF200040:0xFF400080);
 		AmmoLed.DrawTexture(AmmoLedFont,false,32,0,DTA_SrcX,dg2*8,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,(dg1||dg2)?blink?0xFF400080:0xFF8000FF:blink?0xFF200040:0xFF400080);
-		if ( gchambered ) AmmoLed.DrawTexture(AmmoLedFont,false,52,0,DTA_SrcX,80+8*gfired,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,gfired?0xFF400080:0xFF8000FF);
-		AmmoLed.DrawTexture(AmmoLedFont,false,4,0,DTA_SrcX,96+firemode*8,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,0xFF8000FF);
+		AmmoLed.DrawTexture(AmmoLedFont,false,52,0,DTA_SrcX,80,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,(!gchambered||gfired)?0xFF400080:0xFF8000FF);
+		AmmoLed.DrawTexture(AmmoLedFont,false,52,0,DTA_SrcX,88,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,gchambered?0xFF8000FF:0xFF400080);
+		AmmoLed.DrawTexture(AmmoLedFont,false,4,0,DTA_SrcX,96+firemode*8,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,(chambered&&!fired)?0xFF8000FF:0xFF400080);
 	}
 }