diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index d23df61e993..908176f5a1b 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -91,6 +91,10 @@
 	desc = "It's a small maintenance robot."
 	icon_state = "drone"
 
+/obj/item/weapon/holder/drone/emagged
+	name = "maintenance drone"
+	icon_state = "drone-emagged"
+
 /obj/item/weapon/holder/pai
 	name = "pAI"
 	desc = "It's a little robot."
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 282f97c4dc4..c0e8af8e998 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -188,6 +188,9 @@
 	lawchanges.Add("[time] <B>:</B> [H.name]([H.key]) emagged [name]([key])")
 
 	emagged = 1
+	icon_state = "repairbot-emagged"
+	holder_type = /obj/item/weapon/holder/drone/emagged
+	update_icons()
 	lawupdate = 0
 	connected_ai = null
 	clear_supplied_laws()
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index ba4c616b2f3..9306e2d78d7 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -91,6 +91,9 @@
 		H.righthand_file = 'icons/mob/custom_synthetic/custom_righthand.dmi'
 		H.icon_state = "[icon_state]"
 		H.item_state = "[icon_state]_hand"
+	else if(emagged)
+		H.icon_state = "drone-emagged"
+		H.item_state = "drone-emagged"
 	else
 		H.icon_state = "drone"
 		H.item_state = "drone"
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index c67a2b10167..75852a3a506 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 62948a933ed..6ea8f69d632 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index e95b9ce041f..7b90d5b058d 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ