diff --git a/code/modules/mechs/mech_icon.dm b/code/modules/mechs/mech_icon.dm
index 6bad63a93a..6c426d63e3 100644
--- a/code/modules/mechs/mech_icon.dm
+++ b/code/modules/mechs/mech_icon.dm
@@ -51,15 +51,15 @@ proc/get_mech_images(var/list/components = list(), var/overlay_layer = FLOAT_LAY
 		var/obj/item/mech_equipment/hardpoint_object = hardpoints[hardpoint]
 		if(hardpoint_object)
 		//
-			if(hardpoint == "left hand")
-				if(dir == WEST || dir == SOUTHWEST || dir == NORTHWEST)
+			if(hardpoint == "left hand" || hardpoint == "left shoulder")
+				if(dir == WEST || dir == SOUTHWEST || dir == NORTHWEST || dir == SOUTH)
 					hardpoint_object.mech_layer = MECH_GEAR_LAYER
 				else if(dir == EAST || dir == SOUTHEAST || dir == NORTHEAST)
 					hardpoint_object.mech_layer = MECH_BACK_LAYER
-			if(hardpoint == "right hand")
+			if(hardpoint == "right hand" || hardpoint == "right shoulder")
 				if(dir == WEST || dir == SOUTHWEST || dir == NORTHWEST)
 					hardpoint_object.mech_layer = MECH_BACK_LAYER
-				else if(dir == EAST || dir == SOUTHEAST || dir == NORTHEAST)
+				else if(dir == EAST || dir == SOUTHEAST || dir == NORTHEAST || dir == SOUTH)
 					hardpoint_object.mech_layer = MECH_GEAR_LAYER
 		//
 			var/use_icon_state = "[hardpoint_object.icon_state]_[hardpoint]"
diff --git a/code/modules/mechs/mech_movement.dm b/code/modules/mechs/mech_movement.dm
index 4819d76523..1ba1d529f6 100644
--- a/code/modules/mechs/mech_movement.dm
+++ b/code/modules/mechs/mech_movement.dm
@@ -145,7 +145,7 @@
 		if(exosuit.passengers_ammount > 0)
 			exosuit.update_passengers()
 		for(var/hardpoint in exosuit.hardpoints)
-			if(hardpoint == "left hand" || hardpoint == "right hand")
+			if(hardpoint == "left hand" || hardpoint == "right hand" || hardpoint == "left shoulder" || hardpoint == "right shoulder")
 				exosuit.update_icon()
 		exosuit.SetMoveCooldown(exosuit.legs.turn_delay)
 //TURN