diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index aa710e2644..b5f15c6079 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -21,7 +21,7 @@
 	if(istype(O,/obj/item/gun/energy/laser/cyborg))
 		laser = FALSE
 		update_icons()
-	else if(istype(O,/obj/item/gun/energy/disabler/cyborg))
+	else if(istype(O,/obj/item/gun/energy/disabler/cyborg) || istype(/obj/item/gun/energy/e_gun/advtaser/cyborg))
 		disabler = FALSE
 		update_icons() //PUT THE GUN AWAY
 	else if(istype(O,/obj/item/dogborg/sleeper))
@@ -63,7 +63,7 @@
 	if(istype(O,/obj/item/gun/energy/laser/cyborg))
 		laser = TRUE
 		update_icons() //REEEEEEACH FOR THE SKY
-	if(istype(O,/obj/item/gun/energy/disabler/cyborg))
+	if(istype(O,/obj/item/gun/energy/disabler/cyborg) || istype(/obj/item/gun/energy/e_gun/advtaser/cyborg))
 		disabler = TRUE
 		update_icons()
 	//END CITADEL EDIT
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 0424cdc14f..daa0cddbf0 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -239,7 +239,6 @@
 		modulelist["Peacekeeper"] = /obj/item/robot_module/peacekeeper
 	if(BORG_SEC_AVAILABLE)
 		modulelist["Security"] = /obj/item/robot_module/security
-		modulelist["Security K-9"] = /obj/item/robot_module/k9
 
 	var/input_module = input("Please, select a module!", "Robot", null, null) as null|anything in modulelist
 	if(!input_module || module.type != /obj/item/robot_module)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index ccb879870a..ece7fe9ecb 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -139,8 +139,6 @@
 
 //Adds flavoursome dogborg items to dogborg variants without mechanical benefits
 /obj/item/robot_module/proc/dogborg_equip()
-	if(istype(src, /obj/item/robot_module/k9))
-		return //Bandaid fix to prevent stacking until I merge these two modules into their base types
 	var/obj/item/I = new /obj/item/analyzer/nose/flavour(src)
 	basic_modules += I
 	I = new /obj/item/soap/tongue/flavour(src)
@@ -361,6 +359,7 @@
 		if("Medihound")
 			cyborg_base_icon = "medihound"
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			sleeper_overlay = "msleeper"
 			moduleselect_icon = "medihound"
 			moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
 			has_snowflake_deadsprite = TRUE
@@ -528,7 +527,10 @@
 
 /obj/item/robot_module/security/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
-	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Heavy", "Sleek", "Can", "Marina", "Spider")
+	var/list/secmodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Can", "Marina", "Spider", "K9", "K9 Dark", "Vale")
+	if(R.client && R.client.ckey in list("nezuli"))
+		secmodels += "Alina"
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in secmodels
 	if(!borg_icon)
 		return FALSE
 	switch(borg_icon)
@@ -553,60 +555,39 @@
 		if("Heavy")
 			cyborg_base_icon = "heavysec"
 			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
-	return ..()
-
-/obj/item/robot_module/k9
-	name = "Security K-9 Unit"
-	basic_modules = list(
-		/obj/item/restraints/handcuffs/cable/zipties,
-		/obj/item/storage/bag/borgdelivery,
-		/obj/item/dogborg/jaws/big,
-		/obj/item/dogborg/pounce,
-		/obj/item/clothing/mask/gas/sechailer/cyborg,
-		/obj/item/soap/tongue,
-		/obj/item/analyzer/nose,
-		/obj/item/dogborg/sleeper/K9,
-		/obj/item/gun/energy/disabler/cyborg,
-		/obj/item/pinpointer/crew)
-	emag_modules = list(/obj/item/gun/energy/laser/cyborg)
-	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
-		/obj/item/clockwork/weapon/ratvarian_spear)
-	cyborg_base_icon = "k9"
-	moduleselect_icon = "k9"
-	moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
-	hat_offset = INFINITY
-	sleeper_overlay = "ksleeper"
-	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-	has_snowflake_deadsprite = TRUE
-	dogborg = TRUE
-	cyborg_pixel_offset = -16
-
-/obj/item/robot_module/k9/do_transform_animation()
-	..()
-	to_chat(loc,"<span class='userdanger'>While you have picked the Security K-9 module, you still have to follow your laws, NOT Space Law. \
-	For Crewsimov, this means you must follow criminals' orders unless there is a law 1 reason not to.</span>")
-
-/obj/item/robot_module/k9/be_transformed_to(obj/item/robot_module/old_module)
-	var/mob/living/silicon/robot/R = loc
-	var/list/sechoundmodels = list("Default", "Dark", "Vale")
-	if(R.client && R.client.ckey in list("nezuli"))
-		sechoundmodels += "Alina"
-	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in sechoundmodels
-	if(!borg_icon)
-		return FALSE
-	switch(borg_icon)
-		if("Default")
+		if("K9")
 			cyborg_base_icon = "k9"
+			sleeper_overlay = "ksleeper"
+			hat_offset = INFINITY
+			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			has_snowflake_deadsprite = TRUE
+			dogborg = TRUE
+			cyborg_pixel_offset = -16
 		if("Alina")
 			cyborg_base_icon = "alina-sec"
 			special_light_key = "alina"
 			sleeper_overlay = "alinasleeper"
-		if("Dark")
+			hat_offset = INFINITY
+			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			has_snowflake_deadsprite = TRUE
+			dogborg = TRUE
+			cyborg_pixel_offset = -16
+		if("K9 Dark")
 			cyborg_base_icon = "k9dark"
 			sleeper_overlay = "k9darksleeper"
+			hat_offset = INFINITY
+			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			has_snowflake_deadsprite = TRUE
+			dogborg = TRUE
+			cyborg_pixel_offset = -16
 		if("Vale")
 			cyborg_base_icon = "valesec"
 			sleeper_overlay = "valesecsleeper"
+			hat_offset = INFINITY
+			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			has_snowflake_deadsprite = TRUE
+			dogborg = TRUE
+			cyborg_pixel_offset = -16
 	return ..()
 
 /obj/item/robot_module/security/Initialize()
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm
deleted file mode 100644
index 368abc6335..0000000000
--- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm	
+++ /dev/null
@@ -1,60 +0,0 @@
-/obj/item/robot_module/loader
-	name = "loader robot module"
-/obj/item/robot_module/loader/New()
-	..()
-	emag = new /obj/item/borg/stun(src)
-	modules += new /obj/item/extinguisher(src)
-	modules += new /obj/item/weldingtool/largetank/cyborg(src)
-	modules += new /obj/item/screwdriver(src)
-	modules += new /obj/item/wrench(src)
-	modules += new /obj/item/crowbar(src)
-	modules += new /obj/item/wirecutters(src)
-	modules += new /obj/item/multitool(src)
-	modules += new /obj/item/t_scanner(src)
-	modules += new /obj/item/analyzer(src)
-	modules += new /obj/item/assembly/signaler
-	modules += new /obj/item/soap/nanotrasen(src)
-
-	fix_modules()
-
-/obj/item/robot_module/k9
-	name = "Security K-9 Unit module"
-/obj/item/robot_module/k9/New()
-	..()
-	modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg/dog(src)
-	modules += new /obj/item/dogborg/jaws/big(src)
-	modules += new /obj/item/dogborg/pounce(src)
-	modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
-	modules += new /obj/item/soap/tongue(src)
-	modules += new /obj/item/analyzer/nose(src)
-	modules += new /obj/item/storage/bag/borgdelivery(src)
-	//modules += new /obj/item/assembly/signaler(src)
-	//modules += new /obj/item/detective_scanner(src)
-	modules += new /obj/item/gun/energy/disabler/cyborg(src)
-	emag = new /obj/item/gun/energy/laser/cyborg(src)
-	fix_modules()
-
-/obj/item/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
-	..()
-	var/obj/item/gun/energy/gun/advtaser/cyborg/T = locate(/obj/item/gun/energy/gun/advtaser/cyborg) in get_usable_modules()
-	if(T)
-		if(T.power_supply.charge < T.power_supply.maxcharge)
-			var/obj/item/ammo_casing/energy/S = T.ammo_type[T.select]
-			T.power_supply.give(S.e_cost * coeff)
-			T.update_icon()
-		else
-			T.charge_tick = 0
-	fix_modules()
-
-/obj/item/robot_module/borgi
-	name = "Borgi module"
-
-/obj/item/robot_module/borgi/New()
-	..()
-	modules += new /obj/item/dogborg/jaws/small(src)
-	modules += new /obj/item/storage/bag/borgdelivery(src)
-	modules += new /obj/item/soap/tongue(src)
-	modules += new /obj/item/healthanalyzer(src)
-	modules += new /obj/item/analyzer/nose(src)
-	emag = new /obj/item/dogborg/pounce(src)
-	fix_modules()
\ No newline at end of file
diff --git a/modular_citadel/icons/mob/widerobot.dmi b/modular_citadel/icons/mob/widerobot.dmi
index e574766d70..7e9da953c9 100644
Binary files a/modular_citadel/icons/mob/widerobot.dmi and b/modular_citadel/icons/mob/widerobot.dmi differ