diff --git a/code/game/objects/items/weapons/material/gravemarker.dm b/code/game/objects/items/weapons/material/gravemarker.dm
index cd5d3c6079..f50416b05d 100644
--- a/code/game/objects/items/weapons/material/gravemarker.dm
+++ b/code/game/objects/items/weapons/material/gravemarker.dm
@@ -7,7 +7,7 @@
 	force_divisor = 0.65
 	thrown_force_divisor = 0.25
 
-	var/icon_changes = 0		//Does the sprite change when you put words on it?
+	var/icon_changes = 1	//Does the sprite change when you put words on it?
 	var/grave_name = ""		//Name of the intended occupant
 	var/epitaph = ""		//A quick little blurb
 
@@ -15,19 +15,24 @@
 	if(istype(W, /obj/item/weapon/screwdriver))
 		var/carving_1 = sanitizeSafe(input(user, "Who is \the [src.name] for?", "Gravestone Naming", null)  as text, MAX_NAME_LEN)
 		if(carving_1)
-			user.visible_message()
+			user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].")
 			if(do_after(user, material.hardness * W.toolspeed))
 				user.visible_message("[user] carves something into \the [src.name].", "You carve your message into \the [src.name].")
 				grave_name += carving_1
 				update_icon()
 		var/carving_2 = sanitizeSafe(input(user, "What message should \the [src.name] have?", "Epitaph Carving", null)  as text, MAX_NAME_LEN)
 		if(carving_2)
-			user.visible_message()
+			user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].")
 			if(do_after(user, material.hardness * W.toolspeed))
 				user.visible_message("[user] carves something into \the [src.name].", "You carve your message into \the [src.name].")
 				epitaph += carving_2
 				update_icon()
-
+	if(istype(W, /obj/item/weapon/wrench))
+		user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].")
+		if(do_after(user, material.hardness * W.toolspeed))
+			material.place_dismantled_product(get_turf(src))
+			user.visible_message("[user] dismantles down \the [src.name].", "You dismantle \the [src.name].")
+			qdel(src)
 	..()
 
 /obj/item/weapon/material/gravemarker/examine(mob/user)
diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm
index 0be42fcddb..a10cd0bf6e 100644
--- a/code/game/objects/structures/gravemarker.dm
+++ b/code/game/objects/structures/gravemarker.dm
@@ -8,6 +8,8 @@
 	throwpass = 1
 	climbable = 1
 
+	layer = 3.1	//Above dirt piles
+
 	//Maybe make these calculate based on material?
 	var/health = 100
 
@@ -132,9 +134,4 @@
 			return
 
 		src.set_dir(turn(src.dir, 90))
-		return
-
-/obj/structure/gravemarker/gravestone
-	name = "gravestone"
-	desc = "A large stone used in marking graves."
-	icon_state = "gravestone"
\ No newline at end of file
+		return
\ No newline at end of file
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index f6779fed71..3b4604cdfd 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index b371d13c0a..01d769a0f4 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ