diff --git a/assets/voxygen/element/de_buffs/buff_defiance.png b/assets/voxygen/element/de_buffs/buff_defiance.png
new file mode 100644
index 0000000000..b7a84ffe1a
--- /dev/null
+++ b/assets/voxygen/element/de_buffs/buff_defiance.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b9b437b886a29934bef13e8b53af153158a8a9a2b3e95a1474d98b0bd7e3d2f
+size 299
diff --git a/assets/voxygen/element/de_buffs/buff_fury.png b/assets/voxygen/element/de_buffs/buff_fury.png
new file mode 100644
index 0000000000..6b6c0e19c4
--- /dev/null
+++ b/assets/voxygen/element/de_buffs/buff_fury.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f254c0718545e664e4f498cd377494118ceef28f8452f3cad90827d15a63f2eb
+size 306
diff --git a/assets/voxygen/element/de_buffs/buff_imminentcritical.png b/assets/voxygen/element/de_buffs/buff_imminentcritical.png
new file mode 100644
index 0000000000..76bdbe5844
--- /dev/null
+++ b/assets/voxygen/element/de_buffs/buff_imminentcritical.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51ca3cafa030cb67a63f7b59473fe53dc4655af9cc73509c9d4dc8559a3c366f
+size 2995
diff --git a/assets/voxygen/element/de_buffs/buff_sunderer.png b/assets/voxygen/element/de_buffs/buff_sunderer.png
new file mode 100644
index 0000000000..599ec0edd3
--- /dev/null
+++ b/assets/voxygen/element/de_buffs/buff_sunderer.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74d733f042764141a34f2dc569f74f3e01700cd9957078a661bfba92c8a217aa
+size 310
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index 0807b1ba62..fcbff23260 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -752,6 +752,10 @@ image_ids! {
         buff_haste_0: "voxygen.element.de_buffs.buff_haste_0",
         buff_fortitude_0: "voxygen.element.de_buffs.buff_fortitude_0",
         buff_reckless: "voxygen.element.de_buffs.buff_reckless",
+        buff_imminentcritical: "voxygen.element.de_buffs.buff_imminentcritical",
+        buff_fury: "voxygen.element.de_buffs.buff_fury",
+        buff_sunderer: "voxygen.element.de_buffs.buff_sunderer",
+        buff_defiance: "voxygen.element.de_buffs.buff_defiance",
 
         // Debuffs
         debuff_skull_0: "voxygen.element.de_buffs.debuff_skull_0",
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index f06ced9d6c..265c520633 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -5094,13 +5094,13 @@ pub fn cr_color(combat_rating: f32) -> Color {
 pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
     match buff {
         // Buffs
-        BuffKind::Regeneration { .. } => imgs.buff_plus_0,
-        BuffKind::Saturation { .. } => imgs.buff_saturation_0,
-        BuffKind::Potion { .. } => imgs.buff_potion_0,
-        BuffKind::CampfireHeal { .. } => imgs.buff_campfire_heal_0,
-        BuffKind::EnergyRegen { .. } => imgs.buff_energyplus_0,
-        BuffKind::IncreaseMaxEnergy { .. } => imgs.buff_energyplus_0,
-        BuffKind::IncreaseMaxHealth { .. } => imgs.buff_healthplus_0,
+        BuffKind::Regeneration => imgs.buff_plus_0,
+        BuffKind::Saturation => imgs.buff_saturation_0,
+        BuffKind::Potion => imgs.buff_potion_0,
+        BuffKind::CampfireHeal => imgs.buff_campfire_heal_0,
+        BuffKind::EnergyRegen => imgs.buff_energyplus_0,
+        BuffKind::IncreaseMaxEnergy => imgs.buff_energyplus_0,
+        BuffKind::IncreaseMaxHealth => imgs.buff_healthplus_0,
         BuffKind::Invulnerability => imgs.buff_invincibility_0,
         BuffKind::ProtectingWard => imgs.buff_dmg_red_0,
         BuffKind::Frenzied => imgs.buff_frenzy_0,
@@ -5120,6 +5120,10 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
         BuffKind::Sunderer => imgs.debuff_crippled_0,
         // TODO: Get buff image
         BuffKind::Defiance => imgs.buff_fortitude_0,
+        BuffKind::ImminentCritical => imgs.buff_imminentcritical,
+        BuffKind::Fury => imgs.buff_fury,
+        BuffKind::Sunderer => imgs.buff_sunderer,
+        BuffKind::Defiance => imgs.buff_defiance,
         //  Debuffs
         BuffKind::Bleeding => imgs.debuff_bleed_0,
         BuffKind::Cursed => imgs.debuff_skull_0,
@@ -5138,17 +5142,13 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
 pub fn get_buff_title(buff: BuffKind, localized_strings: &Localization) -> Cow<str> {
     match buff {
         // Buffs
-        BuffKind::Regeneration { .. } => localized_strings.get_msg("buff-title-heal"),
-        BuffKind::Saturation { .. } => localized_strings.get_msg("buff-title-saturation"),
-        BuffKind::Potion { .. } => localized_strings.get_msg("buff-title-potion"),
-        BuffKind::CampfireHeal { .. } => localized_strings.get_msg("buff-title-campfire_heal"),
-        BuffKind::EnergyRegen { .. } => localized_strings.get_msg("buff-title-energy_regen"),
-        BuffKind::IncreaseMaxHealth { .. } => {
-            localized_strings.get_msg("buff-title-increase_max_health")
-        },
-        BuffKind::IncreaseMaxEnergy { .. } => {
-            localized_strings.get_msg("buff-title-increase_max_energy")
-        },
+        BuffKind::Regeneration => localized_strings.get_msg("buff-title-heal"),
+        BuffKind::Saturation => localized_strings.get_msg("buff-title-saturation"),
+        BuffKind::Potion => localized_strings.get_msg("buff-title-potion"),
+        BuffKind::CampfireHeal => localized_strings.get_msg("buff-title-campfire_heal"),
+        BuffKind::EnergyRegen => localized_strings.get_msg("buff-title-energy_regen"),
+        BuffKind::IncreaseMaxHealth => localized_strings.get_msg("buff-title-increase_max_health"),
+        BuffKind::IncreaseMaxEnergy => localized_strings.get_msg("buff-title-increase_max_energy"),
         BuffKind::Invulnerability => localized_strings.get_msg("buff-title-invulnerability"),
         BuffKind::ProtectingWard => localized_strings.get_msg("buff-title-protectingward"),
         BuffKind::Frenzied => localized_strings.get_msg("buff-title-frenzied"),
@@ -5156,46 +5156,42 @@ pub fn get_buff_title(buff: BuffKind, localized_strings: &Localization) -> Cow<s
         BuffKind::Fortitude => localized_strings.get_msg("buff-title-fortitude"),
         BuffKind::Reckless => localized_strings.get_msg("buff-title-reckless"),
         // BuffKind::SalamanderAspect => localized_strings.get_msg("buff-title-salamanderaspect"),
+        BuffKind::Flame => localized_strings.get_msg("buff-title-burn"),
+        BuffKind::Frigid => localized_strings.get_msg("buff-title-frigid"),
+        BuffKind::Lifesteal => localized_strings.get_msg("buff-title-lifesteal"),
         BuffKind::ImminentCritical => localized_strings.get_msg("buff-title-imminentcritical"),
         BuffKind::Fury => localized_strings.get_msg("buff-title-fury"),
         BuffKind::Sunderer => localized_strings.get_msg("buff-title-sunderer"),
         BuffKind::Defiance => localized_strings.get_msg("buff-title-defiance"),
         // Debuffs
-        BuffKind::Bleeding { .. } => localized_strings.get_msg("buff-title-bleed"),
-        BuffKind::Cursed { .. } => localized_strings.get_msg("buff-title-cursed"),
-        BuffKind::Burning { .. } => localized_strings.get_msg("buff-title-burn"),
-        BuffKind::Crippled { .. } => localized_strings.get_msg("buff-title-crippled"),
-        BuffKind::Frozen { .. } => localized_strings.get_msg("buff-title-frozen"),
-        BuffKind::Wet { .. } => localized_strings.get_msg("buff-title-wet"),
-        BuffKind::Ensnared { .. } => localized_strings.get_msg("buff-title-ensnared"),
-        BuffKind::Poisoned { .. } => localized_strings.get_msg("buff-title-poisoned"),
-        BuffKind::Parried { .. } => localized_strings.get_msg("buff-title-parried"),
-        BuffKind::PotionSickness { .. } => localized_strings.get_msg("buff-title-potionsickness"),
-        BuffKind::Polymorphed { .. } => localized_strings.get_msg("buff-title-polymorphed"),
-        BuffKind::Flame => localized_strings.get_msg("buff-title-burn"),
-        BuffKind::Frigid => localized_strings.get_msg("buff-title-frigid"),
-        BuffKind::Lifesteal => localized_strings.get_msg("buff-title-lifesteal"),
+        BuffKind::Bleeding => localized_strings.get_msg("buff-title-bleed"),
+        BuffKind::Cursed => localized_strings.get_msg("buff-title-cursed"),
+        BuffKind::Burning => localized_strings.get_msg("buff-title-burn"),
+        BuffKind::Crippled => localized_strings.get_msg("buff-title-crippled"),
+        BuffKind::Frozen => localized_strings.get_msg("buff-title-frozen"),
+        BuffKind::Wet => localized_strings.get_msg("buff-title-wet"),
+        BuffKind::Ensnared => localized_strings.get_msg("buff-title-ensnared"),
+        BuffKind::Poisoned => localized_strings.get_msg("buff-title-poisoned"),
+        BuffKind::Parried => localized_strings.get_msg("buff-title-parried"),
+        BuffKind::PotionSickness => localized_strings.get_msg("buff-title-potionsickness"),
+        BuffKind::Polymorphed(_) => localized_strings.get_msg("buff-title-polymorphed"),
     }
 }
 
 pub fn get_buff_desc(buff: BuffKind, data: BuffData, localized_strings: &Localization) -> Cow<str> {
     match buff {
         // Buffs
-        BuffKind::Regeneration { .. } => localized_strings.get_msg("buff-desc-heal"),
-        BuffKind::Saturation { .. } => localized_strings.get_msg("buff-desc-saturation"),
-        BuffKind::Potion { .. } => localized_strings.get_msg("buff-desc-potion"),
-        BuffKind::CampfireHeal { .. } => {
+        BuffKind::Regeneration => localized_strings.get_msg("buff-desc-heal"),
+        BuffKind::Saturation => localized_strings.get_msg("buff-desc-saturation"),
+        BuffKind::Potion => localized_strings.get_msg("buff-desc-potion"),
+        BuffKind::CampfireHeal => {
             localized_strings.get_msg_ctx("buff-desc-campfire_heal", &i18n::fluent_args! {
                 "rate" => data.strength * 100.0
             })
         },
-        BuffKind::EnergyRegen { .. } => localized_strings.get_msg("buff-desc-energy_regen"),
-        BuffKind::IncreaseMaxHealth { .. } => {
-            localized_strings.get_msg("buff-desc-increase_max_health")
-        },
-        BuffKind::IncreaseMaxEnergy { .. } => {
-            localized_strings.get_msg("buff-desc-increase_max_energy")
-        },
+        BuffKind::EnergyRegen => localized_strings.get_msg("buff-desc-energy_regen"),
+        BuffKind::IncreaseMaxHealth => localized_strings.get_msg("buff-desc-increase_max_health"),
+        BuffKind::IncreaseMaxEnergy => localized_strings.get_msg("buff-desc-increase_max_energy"),
         BuffKind::Invulnerability => localized_strings.get_msg("buff-desc-invulnerability"),
         BuffKind::ProtectingWard => localized_strings.get_msg("buff-desc-protectingward"),
         BuffKind::Frenzied => localized_strings.get_msg("buff-desc-frenzied"),
@@ -5203,25 +5199,25 @@ pub fn get_buff_desc(buff: BuffKind, data: BuffData, localized_strings: &Localiz
         BuffKind::Fortitude => localized_strings.get_msg("buff-desc-fortitude"),
         BuffKind::Reckless => localized_strings.get_msg("buff-desc-reckless"),
         // BuffKind::SalamanderAspect => localized_strings.get_msg("buff-desc-salamanderaspect"),
+        BuffKind::Polymorphed(_) => localized_strings.get_msg("buff-desc-polymorphed"),
+        BuffKind::Flame => localized_strings.get_msg("buff-desc-flame"),
+        BuffKind::Frigid => localized_strings.get_msg("buff-desc-frigid"),
+        BuffKind::Lifesteal => localized_strings.get_msg("buff-desc-lifesteal"),
         BuffKind::ImminentCritical => localized_strings.get_msg("buff-desc-imminentcritical"),
         BuffKind::Fury => localized_strings.get_msg("buff-desc-fury"),
         BuffKind::Sunderer => localized_strings.get_msg("buff-desc-sunderer"),
         BuffKind::Defiance => localized_strings.get_msg("buff-desc-defiance"),
         // Debuffs
-        BuffKind::Bleeding { .. } => localized_strings.get_msg("buff-desc-bleed"),
-        BuffKind::Cursed { .. } => localized_strings.get_msg("buff-desc-cursed"),
-        BuffKind::Burning { .. } => localized_strings.get_msg("buff-desc-burn"),
-        BuffKind::Crippled { .. } => localized_strings.get_msg("buff-desc-crippled"),
-        BuffKind::Frozen { .. } => localized_strings.get_msg("buff-desc-frozen"),
-        BuffKind::Wet { .. } => localized_strings.get_msg("buff-desc-wet"),
-        BuffKind::Ensnared { .. } => localized_strings.get_msg("buff-desc-ensnared"),
-        BuffKind::Poisoned { .. } => localized_strings.get_msg("buff-desc-poisoned"),
-        BuffKind::Parried { .. } => localized_strings.get_msg("buff-desc-parried"),
-        BuffKind::PotionSickness { .. } => localized_strings.get_msg("buff-desc-potionsickness"),
-        BuffKind::Polymorphed { .. } => localized_strings.get_msg("buff-desc-polymorphed"),
-        BuffKind::Flame { .. } => localized_strings.get_msg("buff-desc-flame"),
-        BuffKind::Frigid { .. } => localized_strings.get_msg("buff-desc-frigid"),
-        BuffKind::Lifesteal { .. } => localized_strings.get_msg("buff-desc-lifesteal"),
+        BuffKind::Bleeding => localized_strings.get_msg("buff-desc-bleed"),
+        BuffKind::Cursed => localized_strings.get_msg("buff-desc-cursed"),
+        BuffKind::Burning => localized_strings.get_msg("buff-desc-burn"),
+        BuffKind::Crippled => localized_strings.get_msg("buff-desc-crippled"),
+        BuffKind::Frozen => localized_strings.get_msg("buff-desc-frozen"),
+        BuffKind::Wet => localized_strings.get_msg("buff-desc-wet"),
+        BuffKind::Ensnared => localized_strings.get_msg("buff-desc-ensnared"),
+        BuffKind::Poisoned => localized_strings.get_msg("buff-desc-poisoned"),
+        BuffKind::Parried => localized_strings.get_msg("buff-desc-parried"),
+        BuffKind::PotionSickness => localized_strings.get_msg("buff-desc-potionsickness"),
     }
 }