diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index e5517ea3f2f..f3ca57ceb2d 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -554,7 +554,7 @@
 		/obj/machinery/vending/medical = "NanoMed Plus",
 		/obj/machinery/vending/drugs = "NanoDrug Plus",
 		/obj/machinery/vending/wallmed = "NanoMed",
-		/obj/machinery/vending/assist  = "Vendomat",
+		/obj/machinery/vending/assist  = "Part-Mart",
 		/obj/machinery/vending/engivend = "Engi-Vend",
 		/obj/machinery/vending/hydronutrients = "NutriMax",
 		/obj/machinery/vending/hydroseeds = "MegaSeed Servitor",
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 342cad567ba..c7601e42a90 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1582,7 +1582,7 @@
 
 /datum/supply_pack/service/carpet
 	name = "Premium Carpet Crate"
-	desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together."
+	desc = "Iron floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together."
 	cost = CARGO_CRATE_VALUE * 2
 	contains = list(/obj/item/stack/tile/carpet/fifty,
 					/obj/item/stack/tile/carpet/fifty,
@@ -2765,12 +2765,12 @@
 	crate_name = "soft drinks supply crate"
 
 /datum/supply_pack/vending/vendomat
-	name = "Vendomat & YouTool Supply Crate"
+	name = "Part-Mart & YouTool Supply Crate"
 	desc = "More tools for your IED testing facility."
 	cost = CARGO_CRATE_VALUE * 2
 	contains = list(/obj/item/vending_refill/assist,
 					/obj/item/vending_refill/youtool)
-	crate_name = "Vendomat & YouTool supply crate"
+	crate_name = "Part-Mart & YouTool supply crate"
 
 /datum/supply_pack/vending/clothesmate
 	name = "ClothesMate Supply Crate"
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 1ec01d6f94b..23c7ee70722 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -1021,10 +1021,11 @@ GLOBAL_LIST_EMPTY(vending_products)
 
 /obj/machinery/vending/custom
 	name = "Custom Vendor"
-	icon_state = "robotics"
-	icon_deny = "robotics-deny"
+	icon_state = "custom"
+	icon_deny = "custom-deny"
 	max_integrity = 400
 	payment_department = NO_FREEBIES
+	light_mask = "custom-light-mask"
 	refill_canister = /obj/item/vending_refill/custom
 	/// where the money is sent
 	var/datum/bank_account/private_a
@@ -1205,8 +1206,10 @@ GLOBAL_LIST_EMPTY(vending_products)
 		to_chat(user, "<span class='notice'>You set the price of [I] to [price] cr.</span>")
 
 /obj/machinery/vending/custom/greed //name and like decided by the spawn
+	icon_state = "greed"
+	icon_deny = "greed-deny"
+	light_mask = "greed-light-mask"
 	custom_materials = list(/datum/material/gold = MINERAL_MATERIAL_AMOUNT * 5)
-	material_flags = MATERIAL_COLOR //it's grey anyway, let's bling out
 
 /obj/machinery/vending/custom/greed/Initialize(mapload)
 	. = ..()
@@ -1218,7 +1221,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 	name = "[GLOB.deity]'s Consecrated Vendor"
 	desc = "A vending machine created by [GLOB.deity]."
 	slogan_list = list("[GLOB.deity] says: It's your divine right to buy!")
-	add_filter("vending_outline", 9, list("type" = "outline", "color" = "#FFFFFF"))
-	add_filter("vending_rays", 10, list("type" = "rays", "size" = 35))
+	add_filter("vending_outline", 9, list("type" = "outline", "color" = COLOR_VERY_SOFT_YELLOW))
+	add_filter("vending_rays", 10, list("type" = "rays", "size" = 35, "color" = COLOR_VIVID_YELLOW))
 
 
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index dc8754edac9..89049e5d70e 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -1,4 +1,8 @@
 /obj/machinery/vending/assist
+	name = "\improper Part-Mart"
+	desc = "All the finest of miscellaneous electronics one could ever need! Not responsible for any injuries caused by reckless misuse of parts."
+	icon_state = "parts"
+	icon_deny = "parts-deny"
 	products = list(/obj/item/assembly/prox_sensor = 5,
 					/obj/item/assembly/igniter = 3,
 					/obj/item/assembly/signaler = 4,
@@ -22,8 +26,8 @@
 	default_price = PAYCHECK_ASSISTANT * 0.7 //Default of 35.
 	extra_price = PAYCHECK_EASY
 	payment_department = NO_FREEBIES
-	light_mask = "generic-light-mask"
+	light_mask = "parts-light-mask"
 
 /obj/item/vending_refill/assist
-	machine_name = "Vendomat"
-	icon_state = "refill_engi"
+	machine_name = "Part-Mart"
+	icon_state = "refill_parts"
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 9efc9634662..59f72ba0f58 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi
index b9697deab97..824e52d00a2 100644
Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ