diff --git a/assets/voxygen/voxel/figure/eyes/undead/female.vox b/assets/voxygen/voxel/figure/eyes/undead/female.vox
index 0a00996743..3d408abf51 100644
--- a/assets/voxygen/voxel/figure/eyes/undead/female.vox
+++ b/assets/voxygen/voxel/figure/eyes/undead/female.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae13c10307da8261ba6dcfd7a08c77f061e38da0361f6d691491c56070bb3121
-size 1112
+oid sha256:e00566a99bd9c82d44fb84bef34dbad4376ee64f18f86d9363ca1780ca3b2e3a
+size 44273
diff --git a/assets/voxygen/voxel/figure/eyes/undead/male.vox b/assets/voxygen/voxel/figure/eyes/undead/male.vox
index 778e0650f6..f4989910ca 100644
--- a/assets/voxygen/voxel/figure/eyes/undead/male.vox
+++ b/assets/voxygen/voxel/figure/eyes/undead/male.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:293f434bc61dae6f7f9678f682c25fd383eb62b8a6607c3909d9d0da4df3bb8c
-size 1112
+oid sha256:ce8503327544bcd3183e592e9516cccb8bb58cee87d76b375a9e3ffd76c85996
+size 44273
diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs
index bc9f0bf446..6efb9b393f 100644
--- a/common/src/comp/body/humanoid.rs
+++ b/common/src/comp/body/humanoid.rs
@@ -84,65 +84,58 @@ pub const DANARI_SKIN_COLORS: [(u8, u8, u8); 4] = [
 ];
 pub const DWARF_SKIN_COLORS: [(u8, u8, u8); 3] = [(215, 175, 123), (191, 125, 94), (212, 128, 89)];
 pub const ELF_SKIN_COLORS: [(u8, u8, u8); 3] = [(176, 161, 181), (132, 139, 161), (138, 119, 201)];
-pub const HUMAN_SKIN_COLORS: [(u8, u8, u8); 3] =
-    [(255, 200, 159), (186, 140, 104), (87, 57, 34)];
+pub const HUMAN_SKIN_COLORS: [(u8, u8, u8); 3] = [(255, 200, 159), (186, 140, 104), (87, 57, 34)];
 pub const ORC_SKIN_COLORS: [(u8, u8, u8); 3] = [(77, 150, 51), (82, 117, 36), (71, 94, 42)];
 pub const UNDEAD_SKIN_COLORS: [(u8, u8, u8); 3] =
     [(255, 255, 255), (178, 178, 178), (145, 135, 121)];
 
 // Eye colors
-pub const DANARI_EYE_COLORS: [EyeColor; 7] = [
+pub const DANARI_EYE_COLORS: [EyeColor; 6] = [
     EyeColor::Black,
     EyeColor::Blue,
     EyeColor::Green,
     EyeColor::Brown,
     EyeColor::Red,
-    EyeColor::White,
     EyeColor::Orange,
 ];
-pub const DWARF_EYE_COLORS: [EyeColor; 7] = [
+pub const DWARF_EYE_COLORS: [EyeColor; 6] = [
     EyeColor::Black,
     EyeColor::Blue,
     EyeColor::Green,
     EyeColor::Brown,
     EyeColor::Red,
-    EyeColor::White,
     EyeColor::Orange,
 ];
-pub const ELF_EYE_COLORS: [EyeColor; 7] = [
+pub const ELF_EYE_COLORS: [EyeColor; 6] = [
     EyeColor::Black,
     EyeColor::Blue,
     EyeColor::Green,
     EyeColor::Brown,
     EyeColor::Red,
-    EyeColor::White,
     EyeColor::Orange,
 ];
-pub const HUMAN_EYE_COLORS: [EyeColor; 7] = [
+pub const HUMAN_EYE_COLORS: [EyeColor; 6] = [
     EyeColor::Black,
     EyeColor::Blue,
     EyeColor::Green,
     EyeColor::Brown,
     EyeColor::Red,
-    EyeColor::White,
     EyeColor::Orange,
 ];
-pub const ORC_EYE_COLORS: [EyeColor; 7] = [
+pub const ORC_EYE_COLORS: [EyeColor; 6] = [
     EyeColor::Black,
     EyeColor::Blue,
     EyeColor::Green,
     EyeColor::Brown,
     EyeColor::Red,
-    EyeColor::White,
     EyeColor::Orange,
 ];
-pub const UNDEAD_EYE_COLORS: [EyeColor; 7] = [
+pub const UNDEAD_EYE_COLORS: [EyeColor; 6] = [
     EyeColor::Black,
     EyeColor::Blue,
     EyeColor::Green,
     EyeColor::Brown,
     EyeColor::Red,
-    EyeColor::White,
     EyeColor::Orange,
 ];
 
@@ -296,17 +289,7 @@ pub enum EyeColor {
     Brown,
     Red,
     Orange,
-    White,
 }
-pub const ALL_EYE_COLORS: [EyeColor; 7] = [
-    EyeColor::Black,
-    EyeColor::Blue,
-    EyeColor::Green,
-    EyeColor::Brown,
-    EyeColor::Red,
-    EyeColor::White,
-    EyeColor::Orange,
-];
 impl EyeColor {
     pub fn light_rgb(self) -> Rgb<u8> {
         match self {
@@ -315,7 +298,6 @@ impl EyeColor {
             EyeColor::Green => Rgb::new(110, 167, 113),
             EyeColor::Brown => Rgb::new(73, 42, 36),
             EyeColor::Red => Rgb::new(182, 0, 0),
-            EyeColor::White => Rgb::new(255, 255, 255),
             EyeColor::Orange => Rgb::new(161, 69, 0),
         }
     }
@@ -326,15 +308,11 @@ impl EyeColor {
             EyeColor::Green => Rgb::new(81, 124, 84),
             EyeColor::Brown => Rgb::new(54, 30, 26),
             EyeColor::Red => Rgb::new(148, 0, 0),
-            EyeColor::White => Rgb::new(255, 255, 255),
             EyeColor::Orange => Rgb::new(148, 64, 0),
         }
     }
     pub fn white_rgb(self) -> Rgb<u8> {
-        match self {
-            EyeColor::White => Rgb::new(0, 0, 0),
-            _ => Rgb::new(255, 255, 255),
-        }
+        Rgb::new(255, 255, 255)
     }
 }
 
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index af195ddf34..d8b11c4b39 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -15,8 +15,7 @@ use crate::{
 use client::Client;
 use common::{
     comp::{
-        ActionState::*, Body,
-        CharacterState, Last, MovementState::*, Ori, Pos, Scale, Stats, Vel,
+        ActionState::*, Body, CharacterState, Last, MovementState::*, Ori, Pos, Scale, Stats, Vel,
     },
     terrain::TerrainChunkSize,
     vol::VolSize,
@@ -24,8 +23,8 @@ use common::{
 use hashbrown::HashMap;
 use log::debug;
 use specs::{Entity as EcsEntity, Join};
-use vek::*;
 use std::time::Instant;
+use vek::*;
 
 const DAMAGE_FADE_COEFFICIENT: f64 = 5.0;