diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index eb9ef5d85b7..0016ee9720b 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -201,6 +201,7 @@
 			module_sprites["Red Knight"] = "Security"
 			module_sprites["Black Knight"] = "securityrobot"
 			module_sprites["Bloodhound"] = "bloodhound"
+			module_sprites["Mark II"] = "droid-combat"
 
 		if("Engineering")
 			module = new /obj/item/weapon/robot_module/engineering(src)
@@ -1247,9 +1248,11 @@
 	else
 		src << "Something is badly wrong with the sprite selection. Harass a coder."
 		icon_state = module_sprites[1]
+		base_icon = icon_state
 		return
 
 	overlays -= "eyes"
+	base_icon = icon_state
 	updateicon()
 
 	if (triesleft >= 1)
diff --git a/code/modules/mob/living/silicon/robot/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/robot_upgrades.dm
index 7c6db9c7f44..eeb66f46a25 100644
--- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm
+++ b/code/modules/mob/living/silicon/robot/robot_upgrades.dm
@@ -24,14 +24,15 @@
 
 /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R)
 	R.uneq_all()
-	R.hands.icon_state = "nomod"
-	R.icon_state = "robot"
 	del(R.module)
 	R.module = null
 	R.modtype = "robot"
 	R.real_name = "Cyborg [R.ident]"
 	R.name = R.real_name
 	R.nopush = 0
+	R.hands.icon_state = "nomod"
+	R.base_icon = "robot"
+	R.icon_state = "robot"
 	R.updateicon()
 
 	return 1