diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 85e87210ff8..8879295541c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -190,14 +190,16 @@ var/global/list/robot_modules = list(
 	can_be_pushed = 0
 	sprites = list(
 				"Basic" = "Medbot",
-				"Standard" = "surgeon",
-				"Advanced Droid" = "droid-medical",
-				"Sleek" = "sleekmedic",
-				"Needles" = "medicalrobot",
-				"Drone - Medical" = "drone-medical",
-				"Drone - Chemistry" = "drone-chemistry",
 				"Classic" = "robotMedi",
-				"Heavy" = "heavyMed"
+				"Heavy" = "heavyMed",
+				"Needles" = "medicalrobot",
+				"Standard" = "surgeon",
+				"Advanced Droid - Medical" = "droid-surgery",
+				"Advanced Droid - Chemistry" = "droid-chemistry",
+				"Drone - Medical" = "drone-surgery",
+				"Drone - Chemistry" = "drone-chemistry",
+				"Sleek - Medical" = "sleekmedic",
+				"Sleek - Chemistry" = "sleekchemistry"
 				)
 
 /obj/item/weapon/robot_module/medical/general
@@ -256,6 +258,16 @@ var/global/list/robot_modules = list(
 
 /obj/item/weapon/robot_module/medical/rescue
 	name = "rescue robot module"
+	sprites = list(
+			"Basic" = "Medbot",
+			"Classic" = "robotMedi",
+			"Standard" = "surgeon",
+			"Advanced Droid" = "droid-rescue",
+			"Sleek" = "sleekrescue",
+			"Needles" = "medicalrobot",
+			"Drone" = "drone-medical",
+			"Heavy" = "heavyMed"
+			)
 
 	supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack)
 
@@ -641,7 +653,7 @@ var/global/list/robot_modules = list(
 					"Drone" = "drone-science",
 					"Classic" = "robotJani",
 					"Sleek" = "sleekscience",
-					"Heavy" = "heavyMed"
+					"Heavy" = "heavySci"
 					)
 
 /obj/item/weapon/robot_module/research/New()
diff --git a/html/changelogs/agentwhatever-PR-1782.yml b/html/changelogs/agentwhatever-PR-1782.yml
new file mode 100644
index 00000000000..9fbd0ff801f
--- /dev/null
+++ b/html/changelogs/agentwhatever-PR-1782.yml
@@ -0,0 +1,9 @@
+author: AgentWhatever
+
+delete-after: True
+
+changes: 
+  - rscadd: "Two seperate sleek cyborg icons for chemistry and medical."
+  - rscadd: "A variation on the heavyMed icon for science. No more mishaps between heavy science and medical borgs"
+  - bugfix: "Chemistry and medical drone, sleek and advanced droid cyborg icons now selectable by medical module. Rescue cyborgs are set to one variant of sleek, drone or advanced droid."
+  - bugfix: "Deleted random pixel in opened cyborg hatch overlay when viewing from the front and battery removed."
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 89de2ef19f8..1815c4b15ad 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ