diff --git a/assets/voxygen/element/weapons/pickaxe.png b/assets/voxygen/element/skills/pickaxe.png
similarity index 100%
rename from assets/voxygen/element/weapons/pickaxe.png
rename to assets/voxygen/element/skills/pickaxe.png
diff --git a/assets/voxygen/element/weapons/axe.png b/assets/voxygen/element/weapons/axe.png
index ee44e81671..79274d2f20 100644
--- a/assets/voxygen/element/weapons/axe.png
+++ b/assets/voxygen/element/weapons/axe.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37844f6d3ad21e036df2e8dd43bbb05b96728e00295084179a4841585ecabfef
-size 168
+oid sha256:ad4f860670fef14577606c9b39f393484ecf6568cdf79d7d36b384fbf439eb90
+size 285
diff --git a/assets/voxygen/element/weapons/bow.png b/assets/voxygen/element/weapons/bow.png
index d147b3e33f..136bfa3d86 100644
--- a/assets/voxygen/element/weapons/bow.png
+++ b/assets/voxygen/element/weapons/bow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a1380273d271639ff7d3016fe10331f5847e7e2339f6bbcb2eb7f9de1f714d1
-size 169
+oid sha256:8fb101f42ea28b599fdfab86ca06c59c46edd03fa4c854230465bd04f93a9d11
+size 294
diff --git a/assets/voxygen/element/weapons/daggers.png b/assets/voxygen/element/weapons/daggers.png
index 2a5671b5c7..e2b5dd7c19 100644
--- a/assets/voxygen/element/weapons/daggers.png
+++ b/assets/voxygen/element/weapons/daggers.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7018ea3f92db46e0e2fde2e28b8c023156d52dd7445611bb189c996a067844dd
-size 183
+oid sha256:ee65025e8edaafaf00d43fe4f0af74e15bd9263bd9f399f60ca8b87ba807aa9b
+size 319
diff --git a/assets/voxygen/element/weapons/hammer.png b/assets/voxygen/element/weapons/hammer.png
index c96bcd6a1a..16990f4088 100644
--- a/assets/voxygen/element/weapons/hammer.png
+++ b/assets/voxygen/element/weapons/hammer.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6244d3f8f071eff3a3ac3413bd4b20f4c0c555dc8e656574bc0de25d166fb741
-size 157
+oid sha256:c23362300e7b0cddf081fc664ec2cc2a8accf0a6af87129cf853020c238946de
+size 276
diff --git a/assets/voxygen/element/weapons/mining.png b/assets/voxygen/element/weapons/mining.png
new file mode 100644
index 0000000000..e6b4f1a2b2
--- /dev/null
+++ b/assets/voxygen/element/weapons/mining.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d40df9df229492a46afaa7236177d6f0ba0536e9e1bae4c4a46063ee588187a
+size 435
diff --git a/assets/voxygen/element/weapons/staff.png b/assets/voxygen/element/weapons/staff.png
index 3455ac846a..4ca0d49763 100644
--- a/assets/voxygen/element/weapons/staff.png
+++ b/assets/voxygen/element/weapons/staff.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b7ee9205baca5c27bfa681ef0fe64ca49b2f326265777522df15f503a4b0b3d
-size 149
+oid sha256:bda8b960270c230a49bb4e29f9f65598f08359672c8c5256b1efea8015811e8b
+size 279
diff --git a/assets/voxygen/element/weapons/sword.png b/assets/voxygen/element/weapons/sword.png
index d76d41b7e2..2ebd2b3293 100644
--- a/assets/voxygen/element/weapons/sword.png
+++ b/assets/voxygen/element/weapons/sword.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46b2aaa0d65ad5e645c460ec76029cdc42aedf7ceb5b1840e2a9e8885b57c75d
-size 158
+oid sha256:1c293dfb161fd9c99670913ac96c55103907fb0dd9e8812f81406a8acda51b59
+size 288
diff --git a/assets/voxygen/i18n/en/common.ron b/assets/voxygen/i18n/en/common.ron
index 6694770192..1dd6bf2c10 100644
--- a/assets/voxygen/i18n/en/common.ron
+++ b/assets/voxygen/i18n/en/common.ron
@@ -78,6 +78,7 @@ Is the client up to date?"#,
         "common.tool.debug": "Debug",
         "common.tool.faming": "Farming Tool",
         "common.tool.pick": "Pickaxe",
+        "common.tool.mining": "Mining",
         "common.kind.modular_component": "Modular Component",
         "common.kind.glider": "Glider",
         "common.kind.consumable": "Consumable",
diff --git a/assets/voxygen/i18n/en/skills.ron b/assets/voxygen/i18n/en/skills.ron
index 66250941ff..1a4d6ab3b8 100644
--- a/assets/voxygen/i18n/en/skills.ron
+++ b/assets/voxygen/i18n/en/skills.ron
@@ -238,7 +238,8 @@
         "hud.skill.axe_leap_cost": "Decreases cost of leap by 25%{SP}",
         "hud.skill.axe_leap_distance_title": "Leap Distance",
         "hud.skill.axe_leap_distance": "Increases distance of leap by 20%{SP}",
-        // Pick
+        // Mining
+        "hud.skill.mining_title": "Mining",
         "hud.skill.pick_strike_title": "Pickaxe Strike",
         "hud.skill.pick_strike": "Hit rocks with the pickaxe to gain ore and gems and experience",
         "hud.skill.pick_strike_speed_title": "Pickaxe Strike Speed",
diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs
index bab3f56117..5fa8c3c112 100644
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@@ -1175,7 +1175,7 @@ impl CharacterAbility {
                 }
             },
             Some(ToolKind::Pick) => {
-                use skills::PickSkill::*;
+                use skills::MiningSkill::*;
                 if let BasicMelee {
                     ref mut buildup_duration,
                     ref mut swing_duration,
diff --git a/common/src/comp/skills.rs b/common/src/comp/skills.rs
index c130b067c9..bd7e999f04 100644
--- a/common/src/comp/skills.rs
+++ b/common/src/comp/skills.rs
@@ -107,7 +107,7 @@ pub enum Skill {
     Roll(RollSkill),
     Climb(ClimbSkill),
     Swim(SwimSkill),
-    Pick(PickSkill),
+    Pick(MiningSkill),
 }
 
 pub enum SkillError {
@@ -265,7 +265,7 @@ pub enum SwimSkill {
 }
 
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PickSkill {
+pub enum MiningSkill {
     Speed,
     OreGain,
     GemGain,
diff --git a/server/src/events/interaction.rs b/server/src/events/interaction.rs
index 3220a8a25b..9653ef4fc1 100644
--- a/server/src/events/interaction.rs
+++ b/server/src/events/interaction.rs
@@ -334,13 +334,13 @@ pub fn handle_mine_block(
                                 exp: *exp_reward,
                             });
                     }
-                    use common::comp::skills::{PickSkill, Skill};
+                    use common::comp::skills::{MiningSkill, Skill};
                     use rand::Rng;
                     let mut rng = rand::thread_rng();
                     if item.item_definition_id().contains("mineral.ore.")
                         && rng.gen_bool(
                             0.05 * skillset
-                                .skill_level(Skill::Pick(PickSkill::OreGain))
+                                .skill_level(Skill::Pick(MiningSkill::OreGain))
                                 .ok()
                                 .flatten()
                                 .unwrap_or(0) as f64,
@@ -351,7 +351,7 @@ pub fn handle_mine_block(
                     if item.item_definition_id().contains("mineral.gem.")
                         && rng.gen_bool(
                             0.05 * skillset
-                                .skill_level(Skill::Pick(PickSkill::GemGain))
+                                .skill_level(Skill::Pick(MiningSkill::GemGain))
                                 .ok()
                                 .flatten()
                                 .unwrap_or(0) as f64,
diff --git a/server/src/persistence/json_models.rs b/server/src/persistence/json_models.rs
index b74955ae46..d359cc4672 100644
--- a/server/src/persistence/json_models.rs
+++ b/server/src/persistence/json_models.rs
@@ -40,7 +40,7 @@ pub fn skill_to_db_string(skill: comp::skills::Skill) -> String {
     use comp::{
         item::tool::ToolKind,
         skills::{
-            AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, PickSkill, RollSkill,
+            AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, MiningSkill, RollSkill,
             SceptreSkill, Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill,
         },
     };
@@ -135,9 +135,9 @@ pub fn skill_to_db_string(skill: comp::skills::Skill) -> String {
         Climb(ClimbSkill::Cost) => "Climb Cost",
         Climb(ClimbSkill::Speed) => "Climb Speed",
         Swim(SwimSkill::Speed) => "Swim Speed",
-        Pick(PickSkill::Speed) => "Pick Speed",
-        Pick(PickSkill::OreGain) => "Pick OreGain",
-        Pick(PickSkill::GemGain) => "Pick GemGain",
+        Pick(MiningSkill::Speed) => "Pick Speed",
+        Pick(MiningSkill::OreGain) => "Pick OreGain",
+        Pick(MiningSkill::GemGain) => "Pick GemGain",
         UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)) => "Unlock Weapon Sword",
         UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)) => "Unlock Weapon Axe",
         UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)) => "Unlock Weapon Hammer",
@@ -163,7 +163,7 @@ pub fn db_string_to_skill(skill_string: &str) -> comp::skills::Skill {
     use comp::{
         item::tool::ToolKind,
         skills::{
-            AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, PickSkill, RollSkill,
+            AxeSkill, BowSkill, ClimbSkill, GeneralSkill, HammerSkill, MiningSkill, RollSkill,
             SceptreSkill, Skill::*, SkillGroupKind, StaffSkill, SwimSkill, SwordSkill,
         },
     };
@@ -258,9 +258,9 @@ pub fn db_string_to_skill(skill_string: &str) -> comp::skills::Skill {
         "Climb Cost" => Climb(ClimbSkill::Cost),
         "Climb Speed" => Climb(ClimbSkill::Speed),
         "Swim Speed" => Swim(SwimSkill::Speed),
-        "Pick Speed" => Pick(PickSkill::Speed),
-        "Pick GemGain" => Pick(PickSkill::GemGain),
-        "Pick OreGain" => Pick(PickSkill::OreGain),
+        "Pick Speed" => Pick(MiningSkill::Speed),
+        "Pick GemGain" => Pick(MiningSkill::GemGain),
+        "Pick OreGain" => Pick(MiningSkill::OreGain),
         "Unlock Weapon Sword" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Sword)),
         "Unlock Weapon Axe" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Axe)),
         "Unlock Weapon Hammer" => UnlockGroup(SkillGroupKind::Weapon(ToolKind::Hammer)),
diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs
index 48182bda38..96a0cb6fc7 100644
--- a/voxygen/src/hud/diary.rs
+++ b/voxygen/src/hud/diary.rs
@@ -240,7 +240,7 @@ const TREES: [&str; 8] = [
     "Sceptre",
     "Bow",
     "Fire Staff",
-    "Pickaxe",
+    "Mining",
 ];
 
 pub enum Event {
@@ -359,7 +359,7 @@ impl<'a> Widget for Diary<'a> {
                 "Sceptre" => self.imgs.sceptre,
                 "Bow" => self.imgs.bow,
                 "Fire Staff" => self.imgs.staff,
-                "Pickaxe" => self.imgs.pickaxe,
+                "Mining" => self.imgs.mining,
                 _ => self.imgs.nothing,
             });
 
@@ -508,7 +508,7 @@ impl<'a> Widget for Diary<'a> {
                 self.localized_strings.get("common.weapons.staff")
             },
             SelectedSkillTree::Weapon(ToolKind::Pick) => {
-                self.localized_strings.get("common.tool.pick")
+                self.localized_strings.get("common.tool.mining")
             },
             _ => "Unknown",
         };
@@ -1988,8 +1988,8 @@ impl<'a> Widget for Diary<'a> {
                 );
             },
             SelectedSkillTree::Weapon(ToolKind::Pick) => {
-                use skills::PickSkill::*;
-                // Pick
+                use skills::MiningSkill::*;
+                // Mining
                 Image::new(animate_by_pulse(
                     &self
                         .item_imgs
@@ -2104,7 +2104,7 @@ fn skill_tree_from_str(string: &str) -> Option<SelectedSkillTree> {
         "Sceptre" => Some(SelectedSkillTree::Weapon(ToolKind::Sceptre)),
         "Bow" => Some(SelectedSkillTree::Weapon(ToolKind::Bow)),
         "Fire Staff" => Some(SelectedSkillTree::Weapon(ToolKind::Staff)),
-        "Pickaxe" => Some(SelectedSkillTree::Weapon(ToolKind::Pick)),
+        "Mining" => Some(SelectedSkillTree::Weapon(ToolKind::Pick)),
         _ => None,
     }
 }
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index e451dd3409..2a48f5e028 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -78,7 +78,8 @@ image_ids! {
         hammer: "voxygen.element.weapons.hammer",
         bow: "voxygen.element.weapons.bow",
         staff: "voxygen.element.weapons.staff",
-        pickaxe: "voxygen.element.weapons.pickaxe",
+        mining: "voxygen.element.weapons.mining",
+        pickaxe: "voxygen.element.skills.pickaxe",
         lock: "voxygen.element.ui.diary.buttons.lock",
         wpn_icon_border_skills: "voxygen.element.ui.diary.buttons.border_skills",
         wpn_icon_border: "voxygen.element.ui.generic.buttons.border",
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 90aef9563f..605833dd5f 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -1353,7 +1353,7 @@ impl Hud {
                             Weapon(ToolKind::Sceptre) => &i18n.get("common.weapons.sceptre"),
                             Weapon(ToolKind::Bow) => &i18n.get("common.weapons.bow"),
                             Weapon(ToolKind::Staff) => &i18n.get("common.weapons.staff"),
-                            Weapon(ToolKind::Pick) => &i18n.get("common.tool.pick"),
+                            Weapon(ToolKind::Pick) => &i18n.get("common.tool.mining"),
                             _ => "Unknown",
                         };
                         Text::new(skill)
@@ -1378,6 +1378,7 @@ impl Hud {
                             Weapon(ToolKind::Sceptre) => self.imgs.sceptre,
                             Weapon(ToolKind::Bow) => self.imgs.bow,
                             Weapon(ToolKind::Staff) => self.imgs.staff,
+                            Weapon(ToolKind::Pick) => self.imgs.mining,
                             _ => self.imgs.swords_crossed,
                         })
                         .w_h(20.0, 20.0)