diff --git a/Data/Anims/LOBOT/RGF/F_DB_PRN_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_DB_PRN_eod_h2.sti
index 265ca0f4d..6e290cff1 100644
Binary files a/Data/Anims/LOBOT/RGF/F_DB_PRN_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_DB_PRN_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_N_PRNE_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_N_PRNE_eod_h2.sti
index 3072a8132..a43c902eb 100644
Binary files a/Data/Anims/LOBOT/RGF/F_N_PRNE_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_N_PRNE_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_N_ROLL_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_N_ROLL_eod_h2.sti
index d4c157e19..cf87ed8cb 100644
Binary files a/Data/Anims/LOBOT/RGF/F_N_ROLL_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_N_ROLL_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_PRNCOW_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_PRNCOW_eod_h2.sti
index 6f4f266c5..7049e793b 100644
Binary files a/Data/Anims/LOBOT/RGF/F_PRNCOW_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_PRNCOW_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_PRN_MED_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_PRN_MED_eod_h2.sti
index 13ec59886..312294b73 100644
Binary files a/Data/Anims/LOBOT/RGF/F_PRN_MED_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_PRN_MED_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_P_DIE_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_P_DIE_eod_h2.sti
index 908ceb95b..b8b408e27 100644
Binary files a/Data/Anims/LOBOT/RGF/F_P_DIE_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_P_DIE_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_ROLL_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_ROLL_eod_h2.sti
index 91081e21a..fd446eb9b 100644
Binary files a/Data/Anims/LOBOT/RGF/F_ROLL_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_ROLL_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_R_PRNCOW_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_R_PRNCOW_eod_h2.sti
index 5771a94d4..c7ac06c1e 100644
Binary files a/Data/Anims/LOBOT/RGF/F_R_PRNCOW_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_R_PRNCOW_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_R_PRN_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_R_PRN_eod_h2.sti
index 629de3909..31304c24a 100644
Binary files a/Data/Anims/LOBOT/RGF/F_R_PRN_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_R_PRN_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_R_ROLL_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_R_ROLL_eod_h2.sti
index f960823c9..4d2a7e036 100644
Binary files a/Data/Anims/LOBOT/RGF/F_R_ROLL_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_R_ROLL_eod_h2.sti differ
diff --git a/Data/Anims/LOBOT/RGF/F_SLEEP_eod_h2.sti b/Data/Anims/LOBOT/RGF/F_SLEEP_eod_h2.sti
index afedb1aac..bc0d0a3ea 100644
Binary files a/Data/Anims/LOBOT/RGF/F_SLEEP_eod_h2.sti and b/Data/Anims/LOBOT/RGF/F_SLEEP_eod_h2.sti differ
diff --git a/Data/TableData/LogicalBodyTypes/Filters.xml b/Data/TableData/LogicalBodyTypes/Filters.xml
index cc9214d44..9be9c633d 100644
--- a/Data/TableData/LogicalBodyTypes/Filters.xml
+++ b/Data/TableData/LogicalBodyTypes/Filters.xml
@@ -617,7 +617,14 @@
 			<FILTER>EODhelmet</FILTER>
 			<FILTER>EODvest</FILTER>
 		</AND>
-	</Filter>	
+	</Filter>
+	<Filter name="EODhelmetVestAndRifle">
+		<AND>
+			<FILTER>EODhelmet</FILTER>
+			<FILTER>EODvest</FILTER>
+			<FILTER>HasRifleTypeWeaponInHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="IsWearingGasmask">
 		<OR>
 			<HEAD1POS op="in">213</HEAD1POS>
diff --git a/Data/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gear.xml b/Data/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gear.xml
index 8f869335c..aaff9fdb5 100644
--- a/Data/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gear.xml
+++ b/Data/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gear.xml
@@ -417,6 +417,9 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="helmet">
+		<LayerProp filter="EODhelmetVestAndRifle" palette="hats">
+			<Surface name="RGF_RIFLE_ROLL_SIDE_eod_h2" animsurface="RGFROLL_PR" />
+		</LayerProp>
 		<LayerProp filter="EODhelmetAndVest" palette="hats">
 			<Surface name="RGF_RIFLE_PRONE_eod_h2" animsurface="RGFPRONE" />
 			<Surface name="RGF_MEDIC_PRONE_eod_h2" animsurface="RGFMEDICPRN" />
@@ -427,7 +430,6 @@
 			<Surface name="RGF_EMPTY_SLEEP_eod_h2" animsurface="RGFSLEEP" />
 			<Surface name="RGF_EMPTY_ROLL_eod_h2" animsurface="RGFROLLOVER" />
 			<Surface name="RGF_EMPTY_ROLL_SIDE_eod_h2" animsurface="RGFROLL_PR" />
-			<Surface name="RGF_RIFLE_ROLL_SIDE_eod_h2" animsurface="RGFROLL_PR" />
 			<Surface name="RGF_RIFLE_PRN_COWER_eod_h2" animsurface="RGF_COWER_PRONE" />
 		</LayerProp>
 		<LayerProp filter="EODhelmetAndPistol" palette="hats">
diff --git a/Data/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gear.xml b/Data/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gear.xml
index 8b786a41d..d93107913 100644
--- a/Data/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gear.xml
+++ b/Data/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gear.xml
@@ -406,6 +406,9 @@
 		</LayerProp> 
 	</Layer>
 	<Layer name="helmet">
+		<LayerProp filter="EODhelmetVestAndRifle" palette="hats">
+			<Surface name="RGMRIFLE_ROLL_SIDE_eod_h2" animsurface="RGMROLL_PR" />
+		</LayerProp>
 		<LayerProp filter="EODhelmetAndVest" palette="hats">
 			<Surface name="RGMRIFLE_PRONE_eod_h2" animsurface="RGMPRONE" />
 			<Surface name="RGMMEDIC_PRONE_eod_h2" animsurface="RGMMEDICPRN" />
@@ -416,7 +419,6 @@
 			<Surface name="RGMEMPTY_SLEEP_eod_h2" animsurface="RGMSLEEP" />
 			<Surface name="RGMEMPTY_ROLL_eod_h2" animsurface="RGMROLLOVER" />
 			<Surface name="RGMEMPTY_ROLL_SIDE_eod_h2" animsurface="RGMROLL_PR" />
-			<Surface name="RGMRIFLE_ROLL_SIDE_eod_h2" animsurface="RGMROLL_PR" />
 			<Surface name="RGMRIFLE_PRN_COWER_eod_h2" animsurface="RGM_COWER_PRONE" />
 		</LayerProp>
 		<LayerProp filter="EODhelmetAndPistol" palette="hats">