diff --git a/assets/voxygen/voxel/golem_center_manifest.ron b/assets/voxygen/voxel/golem_center_manifest.ron
index 2fe084ca44..12d3161079 100644
--- a/assets/voxygen/voxel/golem_center_manifest.ron
+++ b/assets/voxygen/voxel/golem_center_manifest.ron
@@ -1,22 +1,30 @@
 ({
     (StoneGolem, Male): (
         head: (
-            offset: (-5.0, -5.5, -7.5),
+            offset: (-3.5, -4.0, -0.0),
             center: ("npc.stonegolem.male.head"),
         ),
         torso_upper: (
-            offset: (-6.0, -3.5, -10.0),
-            center: ("npc.stonegolem.male.torso_upper"),
+            offset: (-10.5, -10.5, -10.5),
+            center: ("npc.stonegolem.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-4.5, -4.5, -7.0),
+            center: ("npc.stonegolem.male.chest_lower"),
         ),
     ),
     (StoneGolem, Female): (
         head: (
-            offset: (-5.0, -5.5, -7.5),
+            offset: (-3.5, -4.0, -0.0),
             center: ("npc.stonegolem.male.head"),
         ),
         torso_upper: (
-            offset: (-6.0, -3.5, -10.0),
-            center: ("npc.stonegolem.male.torso_upper"),
+            offset: (-10.5, -10.5, -10.5),
+            center: ("npc.stonegolem.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-4.5, -4.5, -7.0),
+            center: ("npc.stonegolem.male.chest_lower"),
         ),
     ),
 })
diff --git a/assets/voxygen/voxel/golem_lateral_manifest.ron b/assets/voxygen/voxel/golem_lateral_manifest.ron
index 5945b66c37..4504476042 100644
--- a/assets/voxygen/voxel/golem_lateral_manifest.ron
+++ b/assets/voxygen/voxel/golem_lateral_manifest.ron
@@ -1,69 +1,69 @@
 ({
     (StoneGolem, Male): (
         shoulder_l: (
-            offset: (-4.5, -4.0, -5.0),
+            offset: (-18.0, -7.5, -7.0),
             lateral: ("npc.stonegolem.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-4.5, -4.0, -5.0),
+            offset: (0.0, -7.5, -7.0),
             lateral: ("npc.stonegolem.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-3.0, -3.5, -14.0),
+            offset: (-9.0, -11.5, -26.0),
             lateral: ("npc.stonegolem.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.0, -3.5, -14.0),
+            offset: (-9.0, -11.5, -26.0),
             lateral: ("npc.stonegolem.male.hand_r"),
         ),
         leg_l: (
-            offset: (-2.5, -2.5, -6.0),
+            offset: (-7.0, -3.5, -9.0),
             lateral: ("npc.stonegolem.male.leg_l"),
         ),
         leg_r: (
-            offset: (-2.5, -2.5, -6.0),
+            offset: (0.0, -3.5, -9.0),
             lateral: ("npc.stonegolem.male.leg_r"),
         ),
         foot_l: (
-            offset: (-3.0, -3.5, -9.5),
+            offset: (-4.5, -4.5, -11.0),
             lateral: ("npc.stonegolem.male.foot_l"),
         ),
         foot_r: (
-            offset: (-3.0, -3.5, -9.5),
+            offset: (-4.5, -4.5, -11.0),
             lateral: ("npc.stonegolem.male.foot_r"),
         )
     ),
     (StoneGolem, Female): (
         shoulder_l: (
-            offset: (-4.5, -4.0, -5.0),
+            offset: (-18.0, -7.5, -7.0),
             lateral: ("npc.stonegolem.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-4.5, -4.0, -5.0),
+            offset: (0.0, -7.5, -7.0),
             lateral: ("npc.stonegolem.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-3.0, -3.5, -14.0),
+            offset: (-9.0, -11.5, -26.0),
             lateral: ("npc.stonegolem.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.0, -3.5, -14.0),
+            offset: (-9.0, -11.5, -26.0),
             lateral: ("npc.stonegolem.male.hand_r"),
         ),
         leg_l: (
-            offset: (-2.5, -2.5, -6.0),
+            offset: (-7.0, -3.5, -9.0),
             lateral: ("npc.stonegolem.male.leg_l"),
         ),
         leg_r: (
-            offset: (-2.5, -2.5, -6.0),
+            offset: (0.0, -3.5, -9.0),
             lateral: ("npc.stonegolem.male.leg_r"),
         ),
         foot_l: (
-            offset: (-3.0, -3.5, -10.5),
+            offset: (-4.5, -4.5, -11.0),
             lateral: ("npc.stonegolem.male.foot_l"),
         ),
         foot_r: (
-            offset: (-3.0, -3.5, -10.5),
+            offset: (-4.5, -4.5, -11.0),
             lateral: ("npc.stonegolem.male.foot_r"),
         )
     ),
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/chest.vox b/assets/voxygen/voxel/npc/stonegolem/male/chest.vox
new file mode 100644
index 0000000000..5109dd2fcd
--- /dev/null
+++ b/assets/voxygen/voxel/npc/stonegolem/male/chest.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee1cce31c8a0d3298724cee1c1a504f1f92ba2313937aef3c102b45e0d9dcb0f
+size 14332
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/chest_lower.vox b/assets/voxygen/voxel/npc/stonegolem/male/chest_lower.vox
new file mode 100644
index 0000000000..2e9bfbdb62
--- /dev/null
+++ b/assets/voxygen/voxel/npc/stonegolem/male/chest_lower.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ec7224ce0376f10601fab51b1239a12a7cea53d6663f0fb641e71cba734994b
+size 2612
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/chest_upper.vox b/assets/voxygen/voxel/npc/stonegolem/male/chest_upper.vox
new file mode 100644
index 0000000000..52033d5b97
--- /dev/null
+++ b/assets/voxygen/voxel/npc/stonegolem/male/chest_upper.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf24e59d46be096a82934628d9e44784247d67a37bd07783b5a8908c26feb233
+size 12816
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/foot_l.vox b/assets/voxygen/voxel/npc/stonegolem/male/foot_l.vox
index 700a31c805..1085b4dfb8 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/foot_l.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/foot_l.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10db272e5f302fd26f51139dfdacd783c150eaccf8705370bd33f0b21f14008d
-size 2404
+oid sha256:148999ab67d4604610bf70175744e649d14c5602e55411448ebc2c5f5bb11f1b
+size 3200
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/foot_r.vox b/assets/voxygen/voxel/npc/stonegolem/male/foot_r.vox
index 5041daff8b..aea68648f7 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/foot_r.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/foot_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00e20e90eb259a284ad6bf91573028d6f8deab2dc086d38bef930117a3dc5109
-size 2404
+oid sha256:c30cd8b50d4b8d62e6e22401f568f8c3e77543adaa49b57ba2c11e8345c35dda
+size 3200
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/hand_l.vox b/assets/voxygen/voxel/npc/stonegolem/male/hand_l.vox
index 7cb66e7158..e73c941172 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/hand_l.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/hand_l.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c11a7d552ebe65c3a5d4b06d3f9cee9cbed7fdad12d82773a522878eda4df2b7
-size 2452
+oid sha256:2e409bafdd5acb62b12473363b510fdd16b6ca5ff4c23d665fb5ab5559d674d1
+size 18496
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/hand_r.vox b/assets/voxygen/voxel/npc/stonegolem/male/hand_r.vox
index 10221619db..537178a75a 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/hand_r.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/hand_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dba068b223ccd71b4eb59b07febae18a20b86e134c15e952ab85018ee3ad70d3
-size 2452
+oid sha256:aa419954b20fd8258f6dee16abd1750ea8dd1fe9866c0043f99fc3d2e89619a1
+size 18496
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/head.vox b/assets/voxygen/voxel/npc/stonegolem/male/head.vox
index 5da9120aae..8fc25a7217 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/head.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/head.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18a0701635787abd3772651a64a3a9d722e6697a3fbf5f448f5d115d1adbe3aa
-size 4360
+oid sha256:bf455e79056b7ac04758c6a7ed396d227a0303dd623b38c06610cd8e1ab165f7
+size 2588
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/leg_l.vox b/assets/voxygen/voxel/npc/stonegolem/male/leg_l.vox
index 446a1c62f6..8702ceb08e 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/leg_l.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/leg_l.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ff971f0aedbccabcbac6007dd9314928d73afea519733bf00adecfabba309ed
-size 1680
+oid sha256:26b8a2656fb58e75468ffe673c60ce78e2c10b31190687cfcd065cc064d6a7fa
+size 1788
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/leg_r.vox b/assets/voxygen/voxel/npc/stonegolem/male/leg_r.vox
index 4ef5c9f6fd..8bb2d4465b 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/leg_r.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/leg_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd34a48b5d067a6d3e069ee12a75e38ab79db1a3030e2e8e3fff3732f87bbd46
-size 1680
+oid sha256:9517cc33bc4f2d9982bbb9061404ed9076bc77e6beab0b123b02f13ab944290c
+size 1788
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/shoulder_l.vox b/assets/voxygen/voxel/npc/stonegolem/male/shoulder_l.vox
index 0cf2050377..4632fd5ea4 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/shoulder_l.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/shoulder_l.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3e04c17d1baae98107f7bb92d9b2c1ffb384325ccabf9393571545128aa4508
-size 2344
+oid sha256:af76b0f8937ee48ff52a76ec19a27b2fdb88e5cc0785737fd1085cd381149084
+size 9736
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/shoulder_r.vox b/assets/voxygen/voxel/npc/stonegolem/male/shoulder_r.vox
index 2b3ce41ea8..06f271e2dd 100644
--- a/assets/voxygen/voxel/npc/stonegolem/male/shoulder_r.vox
+++ b/assets/voxygen/voxel/npc/stonegolem/male/shoulder_r.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d5b9f18d0e7c58f942998e6989ec933284232b90fd9a6c1ad888f1cad95c5d7
-size 2344
+oid sha256:2b3de5e6525eef09f777bf0aa6f3e2b81004c545e187b4da06eee8087684a8f7
+size 9736
diff --git a/assets/voxygen/voxel/npc/stonegolem/male/torso_upper.vox b/assets/voxygen/voxel/npc/stonegolem/male/torso_upper.vox
deleted file mode 100644
index b7afe03540..0000000000
--- a/assets/voxygen/voxel/npc/stonegolem/male/torso_upper.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd21aec7c477abe485d2c7e7d598747f6222af6ead01270c239623e7c6d2a4de
-size 4832
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index aaa583f374..765c1177e6 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -91,7 +91,7 @@ fn basic_move(data: &JoinData, update: &mut StateUpdate, efficiency: f32) {
 
 pub fn handle_orientation(data: &JoinData, update: &mut StateUpdate, rate: f32) {
     // Set direction based on move direction
-    let ori_dir = if update.character.is_attack() || update.character.is_block() {
+    let ori_dir = if update.character.is_block() {
         data.inputs.look_dir.xy()
     } else if !data.inputs.move_dir.is_approx_zero() {
         data.inputs.move_dir