diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm
index d424a97fd19..99115960782 100644
--- a/code/WorkInProgress/mining.dm
+++ b/code/WorkInProgress/mining.dm
@@ -2521,25 +2521,38 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
 	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
 	force = 15.0
 	throwforce = 4.0
-	item_state = "wrench"
+	item_state = "pickaxe"
 	w_class = 4.0
 	m_amt = 50
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 
 	silver
 		name = "Silver Pickaxe"
+		icon_state = "spickaxe"
+		item_state = "spickaxe"
 		digspeed = 30
 		origin_tech = "materials=3"
 		desc = "This makes no metallurgic sense."
 
 	gold
 		name = "Golden Pickaxe"
+		icon_state = "gpickaxe"
+		item_state = "gpickaxe"
 		digspeed = 20
 		origin_tech = "materials=4"
 		desc = "This makes no metallurgic sense."
 
+	jackhammer
+		name = "Jackhammer"
+		icon_state = "jackhammer"
+		item_state = "jackhammer"
+		digspeed = 20
+		desc = "You've dig what you dug. Look out for giant lizards."
+
 	diamond
 		name = "Diamond Pickaxe"
+		icon_state = "dpickaxe"
+		item_state = "dpickaxe"
 		digspeed = 10
 		origin_tech = "materials=6"
 		desc = "This makes perfect sense."
@@ -2553,7 +2566,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
 	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
 	force = 8.0
 	throwforce = 4.0
-	item_state = "wrench"
+	item_state = "shovel"
 	w_class = 3.0
 	m_amt = 50
 
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 215a5479fdb..6a6d1817955 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -133,7 +133,7 @@
 
 /obj/item/weapon/robot_module/miner/New()
 	..()
-	src.modules += new /obj/item/weapon/pickaxe(src)
+	src.modules += new /obj/item/weapon/pickaxe/jackhammer(src)
 	src.modules += new /obj/item/weapon/shovel(src)
 	src.modules += new /obj/item/weapon/satchel(src)
 	src.emag = new /obj/item/weapon/borg/stun(src)
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 56c96726e49..30eca1040d3 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 3c5ef5b56c3..5d7589616f6 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 79d76e2e089..571df37f834 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ