diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 2ea9ad0667..d41c98b83b 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -12,7 +12,7 @@
 /obj/item/stack
 	gender = PLURAL
 	origin_tech = list(TECH_MATERIAL = 1)
-	icon = 'icons/obj/stacks.dmi'
+	icon = 'icons/obj/stacks_ch.dmi' //CHOMPedit - materials update
 	randpixel = 7
 	center_of_mass = null
 	var/list/datum/stack_recipe/recipes
@@ -282,16 +282,16 @@
 	if(new_amount < 0 || new_amount % 1)
 		stack_trace("Tried to set a bad stack amount: [new_amount]")
 		return 0
-	
+
 	// Clean up the new amount
 	new_amount = max(round(new_amount), 0)
-	
+
 	// Can exceed max if you really want
 	if(new_amount > max_amount && !no_limits)
 		new_amount = max_amount
-	
+
 	amount = new_amount
-	
+
 	// Can set it to 0 without qdel if you really want
 	if(amount == 0 && !no_limits)
 		qdel(src)
@@ -316,7 +316,7 @@
 
 	if (isnull(tamount))
 		tamount = src.get_amount()
-	
+
 	if(tamount < 0 || tamount % 1)
 		stack_trace("Tried to transfer a bad stack amount: [tamount]")
 		return 0
@@ -343,7 +343,7 @@
 	if(tamount < 0 || tamount % 1)
 		stack_trace("Tried to split a bad stack amount: [tamount]")
 		return null
-	
+
 	var/transfer = max(min(tamount, src.amount, initial(max_amount)), 0)
 
 	var/orig_amount = src.amount
diff --git a/code/modules/materials/sheets/gems.dm b/code/modules/materials/sheets/gems.dm
index 1906da8eab..a566a544fa 100644
--- a/code/modules/materials/sheets/gems.dm
+++ b/code/modules/materials/sheets/gems.dm
@@ -10,6 +10,7 @@
 	name = "diamond"
 	icon_state = "sheet-diamond"
 	default_type = "diamond"
+	no_variants = FALSE //CHOMPedit - Variants added
 	drop_sound = 'sound/items/drop/glass.ogg'
 	pickup_sound = 'sound/items/pickup/glass.ogg'
 
diff --git a/code/modules/materials/sheets/glass.dm b/code/modules/materials/sheets/glass.dm
index bf891347ea..f479e8199e 100644
--- a/code/modules/materials/sheets/glass.dm
+++ b/code/modules/materials/sheets/glass.dm
@@ -1,6 +1,6 @@
 /obj/item/stack/material/glass
 	name = "glass"
-	icon_state = "sheet-transparent"
+	icon_state = "sheet-glass" //CHOMPedit - replace materials update
 	default_type = "glass"
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/glass.ogg'
@@ -9,7 +9,7 @@
 
 /obj/item/stack/material/glass/reinforced
 	name = "reinforced glass"
-	icon_state = "sheet-rtransparent"
+	icon_state = "sheet-rglass" //CHOMPedit - replace materials update
 	default_type = "rglass"
 	no_variants = FALSE
 	apply_colour = TRUE
@@ -18,7 +18,7 @@
 	name = "borosilicate glass"
 	desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures"
 	singular_name = "borosilicate glass sheet"
-	icon_state = "sheet-transparent"
+	icon_state = "sheet-phoronglass" //CHOMPedit - replace materials update
 	default_type = "borosilicate glass"
 	no_variants = FALSE
 	apply_colour = TRUE
@@ -27,7 +27,7 @@
 	name = "reinforced borosilicate glass"
 	desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures. It is reinforced with few rods."
 	singular_name = "reinforced borosilicate glass sheet"
-	icon_state = "sheet-rtransparent"
+	icon_state = "sheet-phoronrglass" //CHOMPedit - replace materials update
 	default_type = "reinforced borosilicate glass"
 	no_variants = FALSE
 	apply_colour = TRUE
\ No newline at end of file
diff --git a/code/modules/materials/sheets/metals/metal.dm b/code/modules/materials/sheets/metals/metal.dm
index 1994b58c21..256f80696b 100644
--- a/code/modules/materials/sheets/metals/metal.dm
+++ b/code/modules/materials/sheets/metals/metal.dm
@@ -1,20 +1,20 @@
 /obj/item/stack/material/steel
 	name = MAT_STEEL
-	icon_state = "sheet-refined"
+	icon_state = "sheet-metal" //CHOMPedit - replace materials update
 	default_type = MAT_STEEL
 	no_variants = FALSE
 	apply_colour = TRUE
 
 /obj/item/stack/material/plasteel
 	name = "plasteel"
-	icon_state = "sheet-reinforced"
+	icon_state = "sheet-plasteel" //CHOMPedit - replace materials update
 	default_type = "plasteel"
 	no_variants = FALSE
 	apply_colour = TRUE
 
 /obj/item/stack/material/durasteel
 	name = "durasteel"
-	icon_state = "sheet-reinforced"
+	icon_state = "sheet-durasteel" //CHOMPedit - replace materials update
 	item_state = "sheet-metal"
 	default_type = "durasteel"
 	no_variants = FALSE
@@ -22,7 +22,7 @@
 
 /obj/item/stack/material/titanium
 	name = MAT_TITANIUM
-	icon_state = "sheet-refined"
+	icon_state = "sheet-titanium" //CHOMPedit - replace materials update
 	apply_colour = TRUE
 	item_state = "sheet-silver"
 	default_type = MAT_TITANIUM
diff --git a/icons/obj/stacks_ch.dmi b/icons/obj/stacks_ch.dmi
new file mode 100644
index 0000000000..94ea395051
Binary files /dev/null and b/icons/obj/stacks_ch.dmi differ