diff --git a/assets/voxygen/i18n/en/common.ron b/assets/voxygen/i18n/en/common.ron
index 881f43c48b..17b2527f2d 100644
--- a/assets/voxygen/i18n/en/common.ron
+++ b/assets/voxygen/i18n/en/common.ron
@@ -64,8 +64,8 @@ Is the client up to date?"#,
         "common.weapons.bow": "Bow",
         "common.weapons.hammer": "Hammer",
         "common.weapons.general": "General Combat",
-        "common.weapons.sceptre": "Healing Sceptre",
-        "common.weapons.sceptre": "Shield",
+        "common.weapons.sceptre": "Sceptre",
+        "common.weapons.shield": "Shield",
         "common.weapons.spear": "Spear",
         "common.weapons.hammer_simple": "Simple Hammer",
         "common.weapons.sword_simple": "Simple Sword",
diff --git a/assets/voxygen/i18n/fr_FR/common.ron b/assets/voxygen/i18n/fr_FR/common.ron
index e4a0a740bf..e2f1d5fd9a 100644
--- a/assets/voxygen/i18n/fr_FR/common.ron
+++ b/assets/voxygen/i18n/fr_FR/common.ron
@@ -63,8 +63,8 @@ Le client est-il à jour?"#,
         "common.weapons.staff": "Bâton",
         "common.weapons.bow": "Arc",
         "common.weapons.hammer": "Marteau",
-        "common.weapons.sceptre": "Sceptre de soin",
-        "common.weapons.sceptre": "Bouclier",
+        "common.weapons.sceptre": "Sceptre",
+        "common.weapons.shield": "Bouclier",
         "common.weapons.spear": "Lance",
         "common.weapons.hammer_simple": "Marteau Simple",
         "common.weapons.sword_simple": "Épée Simple",
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 4d7aad308b..a6cf240fa7 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -870,7 +870,7 @@
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
     Tool("common.items.weapons.staff.bone_staff"): VoxTrans(
-        "voxel.weapon.staff.firestaff_bone",
+        "voxel.weapon.staff.bone_staff",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
     Tool("common.items.weapons.staff.crimson_eye"): VoxTrans(
@@ -921,10 +921,6 @@
         "voxel.weapon.staff.heated_arm",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.staff.eldwood"): VoxTrans(
-        "voxel.weapon.staff.eldwood",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
     Tool("common.items.weapons.staff.frostwood_torch"): VoxTrans(
         "voxel.weapon.staff.frostwood_torch",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron
index 44ee5b7a5e..66d6e6c320 100644
--- a/assets/voxygen/voxel/biped_weapon_manifest.ron
+++ b/assets/voxygen/voxel/biped_weapon_manifest.ron
@@ -862,7 +862,7 @@
         color: None
     ),
     "common.items.weapons.staff.bone_staff": (
-        vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)),
+        vox_spec: ("weapon.staff.bone_staff", (-1.5, -2.5, -3.0)),
         color: None
     ),
     "common.items.weapons.staff.crimson_eye": (
@@ -913,32 +913,28 @@
         vox_spec: ("weapon.staff.bent_fuse", (-2.0, -2.5, -5.0)),
         color: None
     ),
-    "common.items.weapons.staff.eldwood": (
-        vox_spec: ("weapon.staff.eldwood", (-1.5, -4.5, -3.0)),
-        color: None
-    ),
     "common.items.weapons.staff.frostwood_torch": (
         vox_spec: ("weapon.staff.frostwood_torch", (-2.5, -3.5, -3.0)),
         color: None
     ),
     "common.items.weapons.staff.golden_khakkara": (
-        vox_spec: ("weapon.staff.golden_khakkara", (-2.5, -3.5, -4.0)),
+        vox_spec: ("weapon.staff.golden_khakkara", (-2.5, -3.5, -6.0)),
         color: None
     ),
     "common.items.weapons.staff.laevateinn": (
-        vox_spec: ("weapon.staff.laevateinn", (-1.5, -4.5, -4.0)),
+        vox_spec: ("weapon.staff.laevateinn", (-1.5, -4.5, -6.0)),
         color: None
     ),
     "common.items.weapons.staff.ruby_rod": (
-        vox_spec: ("weapon.staff.ruby_rod", (-1.5, -3.5, -3.0)),
+        vox_spec: ("weapon.staff.ruby_rod", (-1.5, -3.5, -4.0)),
         color: None
     ),
     "common.items.weapons.staff.dragon_tongue": (
-        vox_spec: ("weapon.staff.dragon_tongue", (-2.5, -6.0, -5.0)),
+        vox_spec: ("weapon.staff.dragon_tongue", (-2.5, -6.0, -7.0)),
         color: None
     ),
     "common.items.weapons.staff.solar": (
-        vox_spec: ("weapon.staff.solar", (-1.5, -4.5, -3.0)),
+        vox_spec: ("weapon.staff.solar", (-1.5, -4.5, -4.0)),
         color: None
     ),
     // Sceptres
@@ -979,7 +975,7 @@
         color: None
     ),
     "common.items.weapons.sceptre.caduceus": (
-        vox_spec: ("weapon.sceptre.caduceus", (-1.5, -4.5, -4.0)),
+        vox_spec: ("weapon.sceptre.caduceus", (-1.5, -4.5, -6.0)),
         color: None
     ),
     "common.items.weapons.sceptre.coralline_cane": (
@@ -995,7 +991,7 @@
         color: None
     ),
     "common.items.weapons.sceptre.druids_arbor": (
-        vox_spec: ("weapon.sceptre.druids_arbor", (-1.5, -4.5, -6.0)),
+        vox_spec: ("weapon.sceptre.druids_arbor", (-1.5, -4.5, -4.0)),
         color: None
     ),
     "common.items.weapons.sceptre.amethyst": (
diff --git a/assets/voxygen/voxel/weapon/staff/Bone_staff.vox b/assets/voxygen/voxel/weapon/staff/Bone_staff.vox
index c13983360b..a4c7c637a5 100644
--- a/assets/voxygen/voxel/weapon/staff/Bone_staff.vox
+++ b/assets/voxygen/voxel/weapon/staff/Bone_staff.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3ef90371821c5270bef09ba1cff1e252bdbdffcff3b4a54f80b4d927b27b171
-size 1368
+oid sha256:7dd2da60ea3f14dc738a7c80ff748e69bb98feade3f5e5efccd2f7fdf5d24d67
+size 1296
diff --git a/assets/voxygen/voxel/weapon/staff/crimson_eye.vox b/assets/voxygen/voxel/weapon/staff/crimson_eye.vox
new file mode 100644
index 0000000000..e082504e37
--- /dev/null
+++ b/assets/voxygen/voxel/weapon/staff/crimson_eye.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8540f86c8215d7ac27dd2ff5df1fe95d8c3276847a61ddf85b438f791db27716
+size 1352
diff --git a/assets/voxygen/voxel/weapon/staff/firestaff_bone.vox b/assets/voxygen/voxel/weapon/staff/firestaff_bone.vox
deleted file mode 100644
index a4c7c637a5..0000000000
--- a/assets/voxygen/voxel/weapon/staff/firestaff_bone.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7dd2da60ea3f14dc738a7c80ff748e69bb98feade3f5e5efccd2f7fdf5d24d67
-size 1296
diff --git a/world/src/layer/wildlife.rs b/world/src/layer/wildlife.rs
index 923a84949b..da91967ce2 100644
--- a/world/src/layer/wildlife.rs
+++ b/world/src/layer/wildlife.rs
@@ -171,7 +171,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
             group_size: 3..8,
             is_underwater: false,
             get_density: |c, col| {
-                close(c.temp, CONFIG.snow_temp + 0.2, 0.6) * col.tree_density * BASE_DENSITY * 1.0
+                close(c.temp, CONFIG.snow_temp + 0.2, 0.6) * col.tree_density * BASE_DENSITY * 0.9
             },
         },
         // Taiga pack wild