diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 325c0ac431a..9baefc70306 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -228,9 +228,18 @@ GLOBAL_VAR(bomb_set)
 			update_icon(UPDATE_OVERLAYS)
 			return
 
-	else if(istype(O, /obj/item/disk/plantgene))
+	if(istype(O, /obj/item/disk/plantgene))
 		to_chat(user, "<span class='warning'>You try to plant the disk, but despite rooting around, it won't fit! After you branch out to read the instructions, you find out where the problem stems from. You've been bamboo-zled, this isn't a nuclear disk at all!</span>")
 		return
+
+	else if(istype(O, /obj/item/disk))
+		if(O.icon_state == "datadisk4") //A similar green disk icon
+			to_chat(user, "<span class='warning'>You try to slot in the disk, but it won't fit! This isn't the NAD! If only you'd read the label...</span>")
+			return
+		else
+			to_chat(user, "<span class='warning'>You try to slot in the disk, but it won't fit. This isn't the NAD! It's not even the right colour...</span>")
+			return
+
 	return ..()
 
 /obj/machinery/nuclearbomb/crowbar_act(mob/user, obj/item/I)
diff --git a/code/game/objects/items/weapons/disks.dm b/code/game/objects/items/weapons/disks.dm
index e40c18bbe1b..e81e6f58732 100644
--- a/code/game/objects/items/weapons/disks.dm
+++ b/code/game/objects/items/weapons/disks.dm
@@ -54,7 +54,7 @@
 //Disk stuff.
 /obj/item/disk/data/New()
 	. = ..()
-	var/diskcolor = pick(0, 1, 2)
+	var/diskcolor = pick(0, 1, 2, 3, 4, 5)
 	icon_state = "datadisk[diskcolor]"
 
 /obj/item/disk/data/attack_self__legacy__attackchain(mob/user)
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index 65942a37864..fbbb0238fda 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -583,7 +583,7 @@
 
 /obj/item/disk/plantgene/New()
 	..()
-	update_icon(UPDATE_OVERLAYS)
+	update_icon(UPDATE_ICON_STATE)
 
 /obj/item/disk/plantgene/Destroy()
 	QDEL_NULL(gene)
@@ -650,13 +650,6 @@
 
 	icon_state = "datadisk_hydro"
 
-/obj/item/disk/plantgene/update_overlays()
-	. = ..()
-	if(HAS_TRAIT(src, TRAIT_CMAGGED))
-		return
-
-	. += "datadisk_gene"
-
 /obj/item/disk/plantgene/attack_self__legacy__attackchain(mob/user)
 	if(HAS_TRAIT(src, TRAIT_CMAGGED))
 		return
diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi
index 987626f6d9d..7f179f38ab7 100644
Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ