diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 987f85801..b0618076d 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -138,7 +138,7 @@
 	desc = "A roll of elastic cloth that is extremely effective at stopping bleeding, but does not heal wounds."
 	gender = PLURAL
 	singular_name = "medical gauze"
-	icon_state = "gauze"
+	icon_state = "sheet-gauze"
 	stop_bleeding = 1800
 	self_delay = 20
 	max_amount = 12
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 035704738..bf3b47a3d 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -110,7 +110,6 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 	singular_name = "diamond"
 	sheettype = "diamond"
 	materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
-	novariants = TRUE
 	grind_results = list(/datum/reagent/carbon = 20)
 	point_value = 25
 	merge_type = /obj/item/stack/sheet/mineral/diamond
@@ -137,7 +136,6 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \
 	singular_name = "uranium sheet"
 	sheettype = "uranium"
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
-	novariants = TRUE
 	grind_results = list(/datum/reagent/uranium = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/uranium
@@ -264,7 +262,6 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
 	singular_name = "bananium sheet"
 	sheettype = "bananium"
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
-	novariants = TRUE
 	grind_results = list(/datum/reagent/consumable/banana = 20)
 	point_value = 50
 	merge_type = /obj/item/stack/sheet/mineral/bananium
@@ -447,4 +444,4 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
 	amount = 5
 
 /obj/item/stack/sheet/mineral/coal/ten
-	amount = 10
\ No newline at end of file
+	amount = 10
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 869f81582..ea2066982 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -9,7 +9,7 @@
  * Paper Frames
  * Runed Metal (cult)
  * Brass (clockwork cult)
- * Bronze (bake brass)
+ * Bronze (fake brass)
  * Cotton/Duracotton
  * Shwadon
  *
@@ -535,7 +535,6 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 	icon = 'icons/obj/stack_objects.dmi'
 	sheettype = "runed"
 	merge_type = /obj/item/stack/sheet/runed_metal
-	novariants = TRUE
 	grind_results = list(/datum/reagent/iron = 5, /datum/reagent/blood = 15)
 
 /obj/item/stack/sheet/runed_metal/ratvar_act()
@@ -655,8 +654,8 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
 	name = "brass"
 	desc = "On closer inspection, what appears to be wholly-unsuitable-for-building brass is actually more structurally stable bronze."
 	singular_name = "bronze sheet"
-	icon_state = "sheet-brass"
-	item_state = "sheet-brass"
+	icon_state = "sheet-bronze"
+	item_state = "sheet-bronze"
 	icon = 'icons/obj/stack_objects.dmi'
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	throwforce = 10
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index e1c3fe451..58c72cf90 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -505,10 +505,10 @@
 		var/obj/item/twohanded/required/gibtonite/G = new (src)
 		if(det_time <= 0)
 			G.quality = 3
-			G.icon_state = "Gibtonite ore 3"
+			G.icon_state = "ore-gibtonite_3"
 		if(det_time >= 1 && det_time <= 2)
 			G.quality = 2
-			G.icon_state = "Gibtonite ore 2"
+			G.icon_state = "ore-gibtonite_2"
 
 	var/flags = NONE
 	if(defer_change)
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 67e1d7696..f158de162 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -65,8 +65,8 @@
 
 /obj/item/stack/ore/uranium
 	name = "uranium ore"
-	icon_state = "Uranium ore"
-	item_state = "Uranium ore"
+	icon_state = "ore-uranium"
+	item_state = "ore-uranium"
 	singular_name = "uranium ore chunk"
 	points = 30
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
@@ -74,8 +74,8 @@
 
 /obj/item/stack/ore/iron
 	name = "iron ore"
-	icon_state = "Iron ore"
-	item_state = "Iron ore"
+	icon_state = "ore-iron"
+	item_state = "ore-iron"
 	singular_name = "iron ore chunk"
 	points = 1
 	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
@@ -83,8 +83,8 @@
 
 /obj/item/stack/ore/glass
 	name = "sand pile"
-	icon_state = "Glass ore"
-	item_state = "Glass ore"
+	icon_state = "ore-sand"
+	item_state = "ore-sand"
 	singular_name = "sand pile"
 	points = 1
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
@@ -131,8 +131,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 
 /obj/item/stack/ore/plasma
 	name = "plasma ore"
-	icon_state = "Plasma ore"
-	item_state = "Plasma ore"
+	icon_state = "ore-plasma"
+	item_state = "ore-plasma"
 	singular_name = "plasma ore chunk"
 	points = 15
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
@@ -145,8 +145,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 
 /obj/item/stack/ore/silver
 	name = "silver ore"
-	icon_state = "Silver ore"
-	item_state = "Silver ore"
+	icon_state = "ore-silver"
+	item_state = "ore-silver"
 	singular_name = "silver ore chunk"
 	points = 16
 	materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
@@ -154,8 +154,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 
 /obj/item/stack/ore/gold
 	name = "gold ore"
-	icon_state = "Gold ore"
-	icon_state = "Gold ore"
+	icon_state = "ore-gold"
+	icon_state = "ore-gold"
 	singular_name = "gold ore chunk"
 	points = 18
 	materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
@@ -163,8 +163,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 
 /obj/item/stack/ore/diamond
 	name = "diamond ore"
-	icon_state = "Diamond ore"
-	item_state = "Diamond ore"
+	icon_state = "ore-diamond"
+	item_state = "ore-diamond"
 	singular_name = "diamond ore chunk"
 	points = 50
 	materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
@@ -172,8 +172,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 
 /obj/item/stack/ore/bananium
 	name = "bananium ore"
-	icon_state = "Bananium ore"
-	item_state = "Bananium ore"
+	icon_state = "ore-bananium"
+	item_state = "ore-bananium"
 	singular_name = "bananium ore chunk"
 	points = 60
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
@@ -181,8 +181,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 
 /obj/item/stack/ore/titanium
 	name = "titanium ore"
-	icon_state = "Titanium ore"
-	item_state = "Titanium ore"
+	icon_state = "ore-titanium"
+	item_state = "ore-titanium"
 	singular_name = "titanium ore chunk"
 	points = 50
 	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
@@ -199,8 +199,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "gibtonite ore"
 	desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under space law."
 	icon = 'icons/obj/mining.dmi'
-	icon_state = "Gibtonite ore"
-	item_state = "Gibtonite ore"
+	icon_state = "ore-gibtonite"
+	item_state = "ore-gibtonite"
 	w_class = WEIGHT_CLASS_BULKY
 	throw_range = 0
 	var/primed = FALSE
@@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 		wires = new /datum/wires/explosive/gibtonite(src)
 		attacher = key_name(user)
 		qdel(I)
-		add_overlay("Gibtonite_igniter")
+		add_overlay("gibtonite_igniter")
 		return
 
 	if(wires && !primed)
@@ -261,7 +261,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	if(!primed)
 		primed = TRUE
 		playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
-		icon_state = "Gibtonite active"
+		icon_state = "ore-gibtonite_1"
 		var/turf/bombturf = get_turf(src)
 		var/notify_admins = 0
 		if(z != 5)//Only annoy the admins ingame if we're triggered off the mining zlevel
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index a9aa3667a..089a87882 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi
index b6214612c..729fec6e7 100644
Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ
diff --git a/icons/obj/telescience.dmi b/icons/obj/telescience.dmi
index 1e60c0113..a5500effd 100644
Binary files a/icons/obj/telescience.dmi and b/icons/obj/telescience.dmi differ