diff --git a/code/controllers/subsystem/processing/circuit.dm b/code/controllers/subsystem/processing/circuit.dm
index 461a793a45..a9abacd934 100644
--- a/code/controllers/subsystem/processing/circuit.dm
+++ b/code/controllers/subsystem/processing/circuit.dm
@@ -44,10 +44,20 @@ PROCESSING_SUBSYSTEM_DEF(circuit)
 
 
 	circuit_fabricator_recipe_list["Assemblies"] = list(
-		/obj/item/device/electronic_assembly,
-		/obj/item/device/electronic_assembly/medium,
-		/obj/item/device/electronic_assembly/large,
-		/obj/item/device/electronic_assembly/drone
+		/obj/item/device/electronic_assembly/default,
+		/obj/item/device/electronic_assembly/calc,
+		/obj/item/device/electronic_assembly/clam,
+		/obj/item/device/electronic_assembly/simple,
+		/obj/item/device/electronic_assembly/medium/default,
+		/obj/item/device/electronic_assembly/medium/box,
+		/obj/item/device/electronic_assembly/medium/clam,
+		/obj/item/device/electronic_assembly/medium/medical,
+		/obj/item/device/electronic_assembly/large/default,
+		/obj/item/device/electronic_assembly/large/scope,
+		/obj/item/device/electronic_assembly/large/terminal,
+		/obj/item/device/electronic_assembly/large/arm,
+		/obj/item/device/electronic_assembly/drone/default,
+		/obj/item/device/electronic_assembly/drone/arms
 		///obj/item/weapon/implant/integrated_circuit
 		)
 
diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
index 135461a12f..805cf787f7 100644
--- a/code/modules/integrated_electronics/core/assemblies.dm
+++ b/code/modules/integrated_electronics/core/assemblies.dm
@@ -403,7 +403,23 @@
 
 	return acting_object.drop_location()
 
+/obj/item/device/electronic_assembly/default //The /default electronic_assemblys are to allow the introduction of the new naming scheme without breaking old saves.
+	name = "type-a electronic assembly"
 
+/obj/item/device/electronic_assembly/calc
+	name = "type-b electronic assembly"
+	icon_state = "setup_small_calc"
+	desc = "It's a case, for building small electronics with. This one resembles a pocket calculator."
+
+/obj/item/device/electronic_assembly/clam
+	name = "type-c electronic assembly"
+	icon_state = "setup_small_clam"
+	desc = "It's a case, for building small electronics with. This one has a clamshell design."
+
+/obj/item/device/electronic_assembly/simple
+	name = "type-d electronic assembly"
+	icon_state = "setup_small_simple"
+	desc = "It's a case, for building small electronics with. This one has a simple design."
 
 /obj/item/device/electronic_assembly/medium
 	name = "electronic mechanism"
@@ -413,6 +429,24 @@
 	max_components = IC_MAX_SIZE_BASE * 2
 	max_complexity = IC_COMPLEXITY_BASE * 2
 
+/obj/item/device/electronic_assembly/medium/default
+	name = "type-a electronic mechanism"
+
+/obj/item/device/electronic_assembly/medium/box
+	name = "type-b electronic mechanism"
+	icon_state = "setup_medium_box"
+	desc = "It's a case, for building medium-sized electronics with. This one has a boxy design."
+
+/obj/item/device/electronic_assembly/medium/clam
+	name = "type-c electronic mechanism"
+	icon_state = "setup_medium_clam"
+	desc = "It's a case, for building medium-sized electronics with. This one has a clamshell design."
+
+/obj/item/device/electronic_assembly/medium/medical
+	name = "type-d electronic mechanism"
+	icon_state = "setup_medium_med"
+	desc = "It's a case, for building medium-sized electronics with. This one resembles some type of medical apparatus."
+
 /obj/item/device/electronic_assembly/large
 	name = "electronic machine"
 	icon_state = "setup_large"
@@ -438,6 +472,24 @@
 		return
 	..()
 
+/obj/item/device/electronic_assembly/large/default
+	name = "type-a electronic machine"
+
+/obj/item/device/electronic_assembly/large/scope
+	name = "type-b electronic machine"
+	icon_state = "setup_large_scope"
+	desc = "It's a case, for building large electronics with. This one resembles an oscilloscope."
+
+/obj/item/device/electronic_assembly/large/terminal
+	name = "type-c electronic machine"
+	icon_state = "setup_large_terminal"
+	desc = "It's a case, for building large electronics with. This one resembles a computer terminal."
+
+/obj/item/device/electronic_assembly/large/arm
+	name = "type-d electronic machine"
+	icon_state = "setup_large_arm"
+	desc = "It's a case, for building large electronics with. This one resembles a robotic arm."
+
 /obj/item/device/electronic_assembly/drone
 	name = "electronic drone"
 	icon_state = "setup_drone"
@@ -448,3 +500,11 @@
 
 /obj/item/device/electronic_assembly/drone/can_move()
 	return TRUE
+
+/obj/item/device/electronic_assembly/drone/default
+	name = "type-a electronic drone"
+
+/obj/item/device/electronic_assembly/drone/arms
+	name = "type-b electronic drone"
+	icon_state = "setup_drone_arms"
+	desc = "It's a case, for building mobile electronics with. This one is armed and dangerous."
\ No newline at end of file
diff --git a/icons/obj/assemblies/electronic_setups.dmi b/icons/obj/assemblies/electronic_setups.dmi
index 7074d08328..643d652be1 100644
Binary files a/icons/obj/assemblies/electronic_setups.dmi and b/icons/obj/assemblies/electronic_setups.dmi differ