diff --git a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
index 63ec8a7ad4..78f471c2ee 100644
--- a/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
+++ b/OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs
@@ -373,7 +373,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--r8", PathToDataR8, PathToPalette, "4674", "4721", Path.Combine(PathToSHPs, "heavyweld"), "--building"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "4722", "4744", Path.Combine(PathToSHPs, "unknown20"), "--building"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "4745", "4759", Path.Combine(PathToSHPs, "marker"), "--building"},
-				new string[] {"--r8", PathToDataR8, PathToPalette, "4760", "4819", Path.Combine(PathToSHPs, "windtrapzaps"), "--building"},
+				new string[] {"--r8", PathToDataR8, PathToPalette, "4760", "4819", Path.Combine(PathToSHPs, "researchzaps"), "--building"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "4820", "4840", Path.Combine(PathToSHPs, "deathhandlaunch"), "--building"},
 				new string[] {"--r8", Path.Combine(Platform.SupportDir, "Content/d2k/MOUSE.R8"), PathToPalette, "0", "264", Path.Combine(PathToSHPs, "mouse")},
 				new string[] {"--r8", Path.Combine(Platform.SupportDir, "Content/d2k/BLOXBASE.R8"), PathToPalette, "0", "799", Path.Combine(PathToTilesets, "BASE"), "--tileset"},
@@ -676,7 +676,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--shp", Path.Combine(PathToSHPs, "heavyweld.png"), "96"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "unknown20.png"), "96"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "marker.png"), "96"},
-				new string[] {"--shp", Path.Combine(PathToSHPs, "windtrapzaps.png"), "96"},
+				new string[] {"--shp", Path.Combine(PathToSHPs, "researchzaps.png"), "96"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "deathhandlaunch.png"), "96"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "mouse.png"), "48"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "spice0.png"), "32"},
diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs
index 96097dfb75..df4b8eb25b 100644
--- a/OpenRA.Utility/Command.cs
+++ b/OpenRA.Utility/Command.cs
@@ -175,7 +175,8 @@ namespace OpenRA.Utility
 					Console.WriteLine("FrameCount: {0}", FrameCount);
 				}
 			}
-			else if (args.Contains("--vehicle")) //resorting to RA/CnC compatible counter-clockwise frame order
+			//resorting to RA/CnC compatible counter-clockwise frame order
+			else if (args.Contains("--vehicle") || args.Contains("--projectile"))
 			{
 				frame = srcImage[startFrame];
 
@@ -296,11 +297,6 @@ namespace OpenRA.Utility
 						OffsetX = frame.FrameWidth/2 - frame.Width/2;
 						OffsetY = frame.FrameHeight/2 - frame.Height/2;
 					}
-					else if (args.Contains("--projectile"))
-					{
-						OffsetX = frame.FrameWidth/2 - frame.OffsetX;
-						OffsetY = frame.FrameHeight/2 - frame.OffsetY;
-					}
 					else if (args.Contains("--building"))
 					{
 						if (frame.OffsetX < 0) { frame.OffsetX = 0 - frame.OffsetX; }