diff --git a/code/modules/mob/living/silicon/robot/robot_ui_module.dm b/code/modules/mob/living/silicon/robot/robot_ui_module.dm
index 7d37eca48f6..74c6ad4cda7 100644
--- a/code/modules/mob/living/silicon/robot/robot_ui_module.dm
+++ b/code/modules/mob/living/silicon/robot/robot_ui_module.dm
@@ -113,9 +113,13 @@
 			if(!is_borg_whitelisted(R, new_module))
 				return
 			selected_module = new_module
+			var/new_datum
 			var/list/module_sprites = SSrobot_sprites.get_module_sprites(selected_module, R)
-			if(!(sprite_datum in module_sprites))
-				sprite_datum = null
+			for(var/datum/robot_sprite/S in module_sprites)
+				if(S.name == sprite_datum.name)
+					new_datum = S
+					break
+			sprite_datum = new_datum
 			. = TRUE
 		if("pick_icon")
 			var/sprite = params["value"]
diff --git a/icons/mob/robot/janitor.dmi b/icons/mob/robot/janitor.dmi
index 7410b353a75..3dbaa27a420 100644
Binary files a/icons/mob/robot/janitor.dmi and b/icons/mob/robot/janitor.dmi differ