diff --git a/Resources/Prototypes/White/Mobs/Species/felinid.yml b/Resources/Prototypes/White/Mobs/Species/felinid.yml
index 5a35df4cd8..aad5579105 100644
--- a/Resources/Prototypes/White/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/White/Mobs/Species/felinid.yml
@@ -30,14 +30,6 @@
       color: "#008800"
       sprite: Mobs/Customization/eyes.rsi
       state: eyes
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: r_arm
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: l_arm
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       color: "#e8b59b"
       sprite: Mobs/Species/Human/parts.rsi
@@ -46,6 +38,21 @@
       color: "#e8b59b"
       sprite: Mobs/Species/Human/parts.rsi
       state: l_leg
+    # START AMOUR EDIT
+    - map: [ "enum.GenitalVisualLayers.ButtFront" ]
+    - map: [ "enum.GenitalVisualLayers.VaginaFront" ]
+    - map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
+    - map: [ "enum.GenitalVisualLayers.DickFront" ]
+    # END AMOUR EDIT
+    - map: [ "enum.HumanoidVisualLayers.RArm" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: r_arm
+    - map: [ "enum.HumanoidVisualLayers.LArm" ]
+      color: "#e8b59b"
+      sprite: Mobs/Species/Human/parts.rsi
+      state: l_arm
+    - map: [ "enum.GenitalVisualLayers.BreastFront" ] # AMOUR
     - shader: StencilClear
       sprite: Mobs/Species/Human/parts.rsi
       state: l_leg
@@ -89,13 +96,6 @@
     - map: [ "belt" ]
     - map: [ "neck" ]
     - map: [ "back" ]
-    # START AMOUR EDIT
-    - map: [ "enum.GenitalVisualLayers.ButtFront" ]
-    - map: [ "enum.GenitalVisualLayers.BreastFront" ]
-    - map: [ "enum.GenitalVisualLayers.VaginaFront" ]
-    - map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
-    - map: [ "enum.GenitalVisualLayers.DickFront" ]
-    # END AMOUR EDIT
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
       state: shaved
       sprite: Mobs/Customization/human_facial_hair.rsi
diff --git a/Resources/Prototypes/White/Mobs/Species/harpy.yml b/Resources/Prototypes/White/Mobs/Species/harpy.yml
index f0c35fd20b..55cdb97c7e 100644
--- a/Resources/Prototypes/White/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/White/Mobs/Species/harpy.yml
@@ -60,9 +60,15 @@
       - map: [ "enum.HumanoidVisualLayers.Head" ]
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
       - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    # START AMOUR EDIT
+      - map: [ "enum.GenitalVisualLayers.ButtFront" ]
+      - map: [ "enum.GenitalVisualLayers.VaginaFront" ]
+      - map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
+      - map: [ "enum.GenitalVisualLayers.DickFront" ]
+    # END AMOUR EDIT
+      - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "underwearb" ] #White
       - map: [ "underweart" ] #White
       - map: ["enum.HumanoidVisualLayers.LFoot"]
@@ -85,13 +91,6 @@
       - map: [ "belt" ]
       - map: [ "neck" ]
       - map: [ "back" ]
-      # START AMOUR EDIT
-      - map: [ "enum.GenitalVisualLayers.ButtFront" ]
-      - map: [ "enum.GenitalVisualLayers.BreastFront" ]
-      - map: [ "enum.GenitalVisualLayers.VaginaFront" ]
-      - map: [ "enum.GenitalVisualLayers.TesticlesFront" ]
-      - map: [ "enum.GenitalVisualLayers.DickFront" ]
-      # END AMOUR EDIT
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
       - map: [ "enum.HumanoidVisualLayers.Tail" ]