diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 541f15351a0..decbfe59a92 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -320,9 +320,9 @@
 				I = image("icon"='icons/mob/human_parts.dmi', "icon_state"="[species_id]_[body_zone]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir)
 	else
 		if(should_draw_gender)
-			I = image("icon"='icons/mob/augments.dmi', "icon_state"="[initial(icon_state)]_[icon_gender]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir)
+			I = image("icon"= icon, "icon_state"="[body_zone]_[icon_gender]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir)
 		else
-			I = image("icon"='icons/mob/augments.dmi', "icon_state"="[initial(icon_state)]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir)
+			I = image("icon"= icon, "icon_state"="[body_zone]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir)
 		standing += I
 		return standing
 
diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm
index 92df2fc50f0..d9b51a19a50 100644
--- a/code/modules/surgery/bodyparts/robot_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm
@@ -7,7 +7,7 @@
 	item_state = "buildpipe"
 	icon = 'icons/obj/robot_parts.dmi'
 	flags = CONDUCT
-	icon_state = "l_arm"
+	icon_state = "borg_l_arm"
 	status = BODYPART_ROBOTIC
 
 
@@ -18,7 +18,7 @@
 	item_state = "buildpipe"
 	icon = 'icons/obj/robot_parts.dmi'
 	flags = CONDUCT
-	icon_state = "r_arm"
+	icon_state = "borg_r_arm"
 	status = BODYPART_ROBOTIC
 
 
@@ -29,7 +29,7 @@
 	item_state = "buildpipe"
 	icon = 'icons/obj/robot_parts.dmi'
 	flags = CONDUCT
-	icon_state = "l_leg"
+	icon_state = "borg_l_leg"
 	status = BODYPART_ROBOTIC
 
 
@@ -40,7 +40,7 @@
 	item_state = "buildpipe"
 	icon = 'icons/obj/robot_parts.dmi'
 	flags = CONDUCT
-	icon_state = "r_leg"
+	icon_state = "borg_r_leg"
 	status = BODYPART_ROBOTIC
 
 
@@ -50,7 +50,7 @@
 	item_state = "buildpipe"
 	icon = 'icons/obj/robot_parts.dmi'
 	flags = CONDUCT
-	icon_state = "chest"
+	icon_state = "borg_chest"
 	status = BODYPART_ROBOTIC
 	var/wired = 0
 	var/obj/item/weapon/stock_parts/cell/cell = null
@@ -100,7 +100,7 @@
 	item_state = "buildpipe"
 	icon = 'icons/obj/robot_parts.dmi'
 	flags = CONDUCT
-	icon_state = "head"
+	icon_state = "borg_head"
 	status = BODYPART_ROBOTIC
 	var/obj/item/device/assembly/flash/handheld/flash1 = null
 	var/obj/item/device/assembly/flash/handheld/flash2 = null
@@ -165,27 +165,27 @@
 /obj/item/bodypart/l_arm/robot/surplus
 	name = "surplus prosthetic left arm"
 	desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
-	icon = 'icons/mob/augments.dmi'
-	icon_state = "surplus_l_arm"
+	icon = 'icons/mob/surplus_augments.dmi'
+	icon_state = "l_arm"
 	max_damage = 20
 
 /obj/item/bodypart/r_arm/robot/surplus
 	name = "surplus prosthetic right arm"
 	desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
-	icon = 'icons/mob/augments.dmi'
-	icon_state = "surplus_r_arm"
+	icon = 'icons/mob/surplus_augments.dmi'
+	icon_state = "r_arm"
 	max_damage = 20
 
 /obj/item/bodypart/l_leg/robot/surplus
 	name = "surplus prosthetic left leg"
 	desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
-	icon = 'icons/mob/augments.dmi'
-	icon_state = "surplus_l_leg"
+	icon = 'icons/mob/surplus_augments.dmi'
+	icon_state = "l_leg"
 	max_damage = 20
 
 /obj/item/bodypart/r_leg/robot/surplus
 	name = "surplus prosthetic right leg"
 	desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
-	icon = 'icons/mob/augments.dmi'
+	icon = 'icons/mob/surplus_augments.dmi'
 	icon_state = "surplus_r_leg"
 	max_damage = 20
diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm
index bc2f1a78274..805bdf778e2 100644
--- a/code/modules/surgery/limb_augmentation.dm
+++ b/code/modules/surgery/limb_augmentation.dm
@@ -46,15 +46,17 @@
 
 //SURGERY STEP SUCCESSES
 
-/datum/surgery_step/add_limb/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+/datum/surgery_step/add_limb/success(mob/user, mob/living/carbon/target, target_zone, obj/item/bodypart/tool, datum/surgery/surgery)
 	if(L)
 		user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "<span class='notice'>You successfully augment [target]'s [parse_zone(target_zone)].</span>")
 		L.change_bodypart_status(BODYPART_ROBOTIC, 1)
+		L.icon = tool.icon
+		L.max_damage = tool.max_damage
 		user.drop_item()
 		qdel(tool)
-		target.update_damage_overlays()
+		target.update_body_parts()
 		target.updatehealth()
 		add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
 	else
 		to_chat(user, "<span class='warning'>[target] has no organic [parse_zone(target_zone)] there!</span>")
-	return 1
\ No newline at end of file
+	return 1
diff --git a/icons/mob/augments.dmi b/icons/mob/augments.dmi
index a2d816c8c98..7124c35105e 100644
Binary files a/icons/mob/augments.dmi and b/icons/mob/augments.dmi differ
diff --git a/icons/mob/surplus_augments.dmi b/icons/mob/surplus_augments.dmi
new file mode 100644
index 00000000000..f06ac0c94b7
Binary files /dev/null and b/icons/mob/surplus_augments.dmi differ
diff --git a/icons/obj/robot_parts.dmi b/icons/obj/robot_parts.dmi
index 9461028091f..0410cb034f3 100644
Binary files a/icons/obj/robot_parts.dmi and b/icons/obj/robot_parts.dmi differ