diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt
index 73285edea..4c12ba2f3 100644
--- a/config/ftbquests/quests/chapters/ore_processing.snbt
+++ b/config/ftbquests/quests/chapters/ore_processing.snbt
@@ -48,6 +48,16 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.ore_proc.crushed_ores.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "gtceu:crushed_copper_ore"
+			}
 			id: "28419A1010EEE93A"
 			subtitle: "{quests.ore_proc.crushed_ores.subtitle}"
 			tasks: [
@@ -223,6 +233,7 @@
 			description: ["{quests.ore_proc.mercury.desc}"]
 			id: "68AC3E2C9093FCFE"
 			optional: true
+			shape: "heart"
 			subtitle: "{quests.ore_proc.mercury.subtitle}"
 			tasks: [
 				{
@@ -273,6 +284,7 @@
 			description: ["{quests.ore_proc.sodium_ores.desc}"]
 			id: "0502E478E27D4B73"
 			optional: true
+			shape: "heart"
 			subtitle: "{quests.ore_proc.sodium_ores.subtitle}"
 			tasks: [
 				{
@@ -303,26 +315,29 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.ore_proc.purified_ores.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "create:crushed_raw_copper"
+			}
 			id: "544EA7FF98FDCFB7"
 			subtitle: "{quests.ore_proc.purified_ores.subtitle}"
-			tasks: [
-				{
-					id: "4C6F60AC9C803D7B"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item_tag(forge:purified_ores))"
-						}
+			tasks: [{
+				id: "4C6F60AC9C803D7B"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item_tag(forge:purified_ores))"
 					}
-					optional_task: true
-					type: "item"
 				}
-				{
-					id: "3C194AEB554DA4CA"
-					type: "checkmark"
-				}
-			]
+				type: "item"
+			}]
 			title: "{quests.ore_proc.purified_ores.title}"
 			x: 0.5d
 			y: -0.5d
@@ -340,12 +355,6 @@
 					optional_task: true
 					type: "item"
 				}
-				{
-					id: "0373F4E380F2A0BC"
-					item: "gtceu:indium_concentrate_bucket"
-					optional_task: true
-					type: "item"
-				}
 				{
 					id: "246799A19B9A47B6"
 					item: {
@@ -368,8 +377,15 @@
 					type: "item"
 				}
 				{
-					id: "52FCA464BD827E37"
-					type: "checkmark"
+					id: "475C90F0EA16C2F9"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "only_one(item(gtceu:indium_concentrate_bucket)nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"gtceu:indium_concentrate\"}}))"
+						}
+					}
+					type: "item"
 				}
 			]
 			title: "{quests.ore_proc.indium.title}"
@@ -627,25 +643,30 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.ore_proc.dust_processed.desc}"]
-			id: "22C1D541452D4AD4"
-			subtitle: "{quests.ore_proc.dust_processed.subtitle}"
-			tasks: [
-				{
-					id: "3EA3BABECE52085B"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item_tag(forge:dusts))"
-						}
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
 					}
-					type: "item"
 				}
-				{
-					id: "1A1B2762EFD6C6B0"
-					type: "checkmark"
+				id: "gtceu:copper_dust"
+			}
+			id: "22C1D541452D4AD4"
+			size: 1.5d
+			subtitle: "{quests.ore_proc.dust_processed.subtitle}"
+			tasks: [{
+				id: "3EA3BABECE52085B"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item_tag(forge:dusts))"
+					}
 				}
-			]
+				type: "item"
+			}]
 			title: "{quests.ore_proc.dust_processed.title}"
 			x: 0.5d
 			y: 3.5d
diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt
index 377b568d0..fa48fa874 100644
--- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt
+++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt
@@ -31,10 +31,21 @@
 			y: -34.0d
 		}
 		{
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:metal/lamp/blue_steel"
+			}
 			id: "227B6C88FFE99435"
 			linked_quest: "4EBABACAB444244D"
+			shape: "heart"
 			x: 16.5d
-			y: -23.0d
+			y: -24.5d
 		}
 		{
 			id: "19CF6D922179DFF9"
@@ -58,7 +69,7 @@
 			}]
 			title: "{quests.metal_age.this_is_a_bucket.title}"
 			x: 13.5d
-			y: -24.5d
+			y: -26.0d
 		}
 		{
 			dependencies: ["56CA2EB7812529C5"]
@@ -82,7 +93,7 @@
 			]
 			title: "{quests.metal_age.redblu_buckets.title}"
 			x: 16.5d
-			y: -24.5d
+			y: -26.0d
 		}
 		{
 			dependencies: ["7E0239E9CC73F09F"]
@@ -98,11 +109,11 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.black_steel_anvil.title}"
-			x: 27.5d
-			y: -24.5d
+			x: 26.5d
+			y: -26.0d
 		}
 		{
-			dependencies: ["4310B619B57276ED"]
+			dependencies: ["5996A3A0D475B8A6"]
 			description: ["{quests.metal_age.steel_anvil.desc}"]
 			id: "04DE7C58F20B535A"
 			shape: "octagon"
@@ -115,11 +126,11 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.steel_anvil.title}"
-			x: 27.5d
+			x: 26.5d
 			y: -32.0d
 		}
 		{
-			dependencies: ["358571B6E692F198"]
+			dependencies: ["0A92F5C4BB6AF972"]
 			description: ["{quests.metal_age.wrought_iron_anvil.desc}"]
 			id: "174DA15847665CF8"
 			shape: "octagon"
@@ -263,29 +274,10 @@
 			y: -32.0d
 		}
 		{
-			dependencies: [
-				"0A92F5C4BB6AF972"
-				"021D3DEEB15A3D17"
-			]
-			dependency_requirement: "one_completed"
-			description: ["{quests.metal_age.weld_wrought_iron_ingots.desc}"]
-			id: "358571B6E692F198"
-			subtitle: "{quests.metal_age.weld_wrought_iron_ingots.subtitle}"
-			tasks: [{
-				id: "05AD17F66DFE3C56"
-				item: "gtceu:wrought_iron_double_ingot"
-				type: "item"
-				weak_nbt_match: true
-			}]
-			title: "{quests.metal_age.weld_wrought_iron_ingots.title}"
-			x: 7.0d
-			y: -32.0d
-		}
-		{
-			dependencies: ["48A8E3210B2BAE1C"]
 			description: ["{quests.metal_age.bellows.desc}"]
 			hide_dependency_lines: true
 			id: "021D3DEEB15A3D17"
+			shape: "rsquare"
 			subtitle: "{quests.metal_age.bellows.subtitle}"
 			tasks: [{
 				id: "588EB07E980386F9"
@@ -297,31 +289,12 @@
 			y: -34.0d
 		}
 		{
-			dependencies: ["5996A3A0D475B8A6"]
-			dependency_requirement: "one_completed"
-			description: ["{quests.metal_age.weld_steel_ingots.desc}"]
-			id: "4310B619B57276ED"
-			subtitle: "{quests.metal_age.weld_steel_ingots.subtitle}"
-			tasks: [{
-				id: "0EDB1D851E198274"
-				item: "gtceu:steel_double_ingot"
-				type: "item"
-				weak_nbt_match: true
-			}]
-			title: "{quests.metal_age.weld_steel_ingots.title}"
-			x: 25.5d
-			y: -32.0d
-		}
-		{
-			dependencies: [
-				"061116CF508D54F6"
-				"68B7D07D57A103BE"
-			]
+			dependencies: ["5A936E9BCF30AA3D"]
 			dependency_requirement: "one_completed"
 			description: ["{quests.metal_age.kaolin_clay.desc}"]
 			id: "72F1C122FC26229C"
 			shape: "octagon"
-			size: 3.0d
+			size: 2.0d
 			subtitle: "{quests.metal_age.kaolin_clay.subtitle}"
 			tasks: [{
 				id: "673D38EB62FFD65F"
@@ -339,8 +312,8 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.kaolin_clay.title}"
-			x: 13.5d
-			y: -36.0d
+			x: 14.0d
+			y: -33.0d
 		}
 		{
 			dependencies: ["5A936E9BCF30AA3D"]
@@ -349,25 +322,24 @@
 			icon: "tfc:ore/graphite/gabbro"
 			id: "53E1383F12EC6765"
 			optional: true
+			shape: "diamond"
 			subtitle: "{quests.metal_age.overworld_graphite.subtitle}"
 			tasks: [{
 				id: "25A552657AFA7BC2"
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.overworld_graphite.title}"
-			x: 13.0d
+			x: 11.0d
 			y: -30.5d
 		}
 		{
-			dependencies: [
-				"53E1383F12EC6765"
-				"2DB82986FE176CD7"
-			]
+			dependencies: ["5A936E9BCF30AA3D"]
 			dependency_requirement: "one_completed"
 			description: ["{quests.metal_age.graphite.desc}"]
+			icon: "tfc:powder/graphite"
 			id: "31CE13462759950C"
 			shape: "octagon"
-			size: 3.0d
+			size: 2.0d
 			subtitle: "{quests.metal_age.graphite.subtitle}"
 			tasks: [{
 				id: "6B0C9D862BFD27BC"
@@ -382,14 +354,13 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.graphite.title}"
-			x: 13.5d
-			y: -28.5d
+			x: 14.0d
+			y: -31.0d
 		}
 		{
 			dependencies: [
 				"72F1C122FC26229C"
 				"31CE13462759950C"
-				"5A936E9BCF30AA3D"
 			]
 			description: ["{quests.metal_age.fire_clay.desc}"]
 			id: "2C76EE197C14B0DC"
@@ -403,7 +374,7 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.fire_clay.title}"
-			x: 17.5d
+			x: 17.0d
 			y: -32.0d
 		}
 		{
@@ -466,6 +437,7 @@
 			description: ["{quests.metal_age.beneath_kaolin.desc}"]
 			id: "061116CF508D54F6"
 			optional: true
+			shape: "diamond"
 			subtitle: "{quests.metal_age.beneath_kaolin.subtitle}"
 			tasks: [
 				{
@@ -492,7 +464,7 @@
 				}
 			]
 			title: "{quests.metal_age.beneath_kaolin.title}"
-			x: 14.0d
+			x: 12.0d
 			y: -33.5d
 		}
 		{
@@ -596,7 +568,7 @@
 				}
 			]
 			title: "{quests.metal_age.fire_clay_products.title}"
-			x: 17.5d
+			x: 17.0d
 			y: -34.0d
 		}
 		{
@@ -666,12 +638,14 @@
 			}]
 			title: "{quests.metal_age.red_blu.title}"
 			x: 24.0d
-			y: -24.5d
+			y: -26.0d
 		}
 		{
 			dependencies: ["56CA2EB7812529C5"]
 			description: ["{quests.metal_age.red_steel_flask.desc}"]
 			id: "30D49878F3CEB08A"
+			optional: true
+			shape: "heart"
 			subtitle: "{quests.metal_age.red_steel_flask.subtitle}"
 			tasks: [{
 				id: "7394672B4D19B0B2"
@@ -680,7 +654,7 @@
 			}]
 			title: "{quests.metal_age.red_steel_flask.title}"
 			x: 16.5d
-			y: -26.0d
+			y: -27.5d
 		}
 		{
 			dependencies: [
@@ -706,7 +680,7 @@
 			}]
 			title: "{quests.metal_age.redblu_anvil.title}"
 			x: 18.5d
-			y: -24.5d
+			y: -26.0d
 		}
 		{
 			dependencies: ["3C173357029AB649"]
@@ -750,13 +724,15 @@
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.fire_clay_ingredients.title}"
-			x: 13.5d
+			x: 11.5d
 			y: -32.0d
 		}
 		{
 			dependencies: ["5A936E9BCF30AA3D"]
 			description: ["{quests.metal_age.beneath_graphite.desc}"]
 			id: "2DB82986FE176CD7"
+			optional: true
+			shape: "diamond"
 			subtitle: "{quests.metal_age.beneath_graphite.subtitle}"
 			tasks: [
 				{
@@ -776,7 +752,7 @@
 				}
 			]
 			title: "{quests.metal_age.beneath_graphite.title}"
-			x: 14.0d
+			x: 12.0d
 			y: -30.5d
 		}
 		{
@@ -784,6 +760,8 @@
 			description: ["{quests.metal_age.overworld_kaolin.desc}"]
 			icon: "tfc:plant/tree_fern"
 			id: "68B7D07D57A103BE"
+			optional: true
+			shape: "diamond"
 			subtitle: "{quests.metal_age.overworld_kaolin.subtitle}"
 			tasks: [{
 				id: "14DF5B1544AB9BA9"
@@ -791,7 +769,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.overworld_kaolin.title}"
-			x: 13.0d
+			x: 11.0d
 			y: -33.5d
 		}
 		{
@@ -813,8 +791,8 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.blast_furnace_fuel.title}"
-			x: 23.5d
-			y: -30.0d
+			x: 20.5d
+			y: -32.0d
 		}
 		{
 			dependencies: ["04DE7C58F20B535A"]
@@ -828,8 +806,8 @@
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.steel_goodies.title}"
-			x: 29.5d
-			y: -30.0d
+			x: 26.5d
+			y: -34.0d
 		}
 		{
 			dependencies: ["52DAF93E2F3D688A"]
@@ -845,8 +823,8 @@
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.black_steel_goodies.title}"
-			x: 25.5d
-			y: -22.5d
+			x: 26.5d
+			y: -23.5d
 		}
 		{
 			dependencies: [
@@ -854,6 +832,16 @@
 				"04DE7C58F20B535A"
 			]
 			description: ["{quests.metal_age.highcarb_black_steel.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:metal/ingot/black_steel"
+			}
 			id: "7E0239E9CC73F09F"
 			subtitle: "{quests.metal_age.highcarb_black_steel.subtitle}"
 			tasks: [
@@ -887,12 +875,22 @@
 				}
 			]
 			title: "{quests.metal_age.highcarb_black_steel.title}"
-			x: 27.5d
+			x: 26.5d
 			y: -30.0d
 		}
 		{
 			dependencies: ["5996A3A0D475B8A6"]
 			description: ["{quests.metal_age.weak_steel.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:metal/ingot/weak_steel"
+			}
 			id: "1CE0FF455668C145"
 			subtitle: "{quests.metal_age.weak_steel.subtitle}"
 			tasks: [
@@ -900,53 +898,60 @@
 					id: "543388DB123E7328"
 					item: {
 						Count: 1
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:nickel_ingot)item(gtceu:nickel_dust))"
 						}
-						id: "gtceu:nickel_ingot"
 					}
+					title: "{quests.metal_age.weak_steel.task1}"
 					type: "item"
+					weak_nbt_match: true
 				}
 				{
 					count: 2L
 					id: "7F829BA244BC77D5"
 					item: {
-						Count: 2
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))"
 						}
-						id: "gtceu:steel_ingot"
 					}
+					title: "{quests.metal_age.weak_steel.task2}"
 					type: "item"
+					weak_nbt_match: true
 				}
 				{
 					id: "3271DD5653C52CAB"
 					item: {
 						Count: 1
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:black_bronze_ingot)item(gtceu:black_bronze_dust))"
 						}
-						id: "gtceu:black_bronze_ingot"
 					}
+					title: "{quests.metal_age.weak_steel.task3}"
 					type: "item"
+					weak_nbt_match: true
 				}
 			]
 			title: "{quests.metal_age.weak_steel.title}"
-			x: 25.5d
+			x: 23.5d
 			y: -30.0d
 		}
 		{
 			dependencies: ["27FF92982A24BC4E"]
 			description: ["{quests.metal_age.highcarb_red_steel.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:metal/ingot/red_steel"
+			}
 			id: "5088768AAA28FCBA"
 			subtitle: "{quests.metal_age.highcarb_red_steel.subtitle}"
 			tasks: [
@@ -981,11 +986,21 @@
 			]
 			title: "{quests.metal_age.highcarb_red_steel.title}"
 			x: 20.5d
-			y: -25.5d
+			y: -27.0d
 		}
 		{
 			dependencies: ["5792DDAA82895E67"]
 			description: ["{quests.metal_age.weak_red_steel.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:metal/ingot/weak_red_steel"
+			}
 			id: "27FF92982A24BC4E"
 			subtitle: "{quests.metal_age.weak_red_steel.subtitle}"
 			tasks: [
@@ -993,68 +1008,70 @@
 					id: "2A22B3EA8DC577CE"
 					item: {
 						Count: 1
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(create:brass_ingot)item(gtceu:brass_dust))"
 						}
-						id: "create:brass_ingot"
 					}
+					title: "{quests.metal_age.weak_red_steel.brass}"
 					type: "item"
 				}
 				{
 					count: 2L
 					id: "2F0648CE3D1723DF"
 					item: {
-						Count: 2
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))"
 						}
-						id: "gtceu:steel_ingot"
 					}
+					title: "{quests.metal_age.weak_red_steel.steel}"
 					type: "item"
 				}
 				{
 					id: "47F346E1C0F41655"
 					item: {
 						Count: 1
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:rose_gold_ingot)item(gtceu:rose_gold_dust))"
 						}
-						id: "gtceu:rose_gold_ingot"
 					}
+					title: "{quests.metal_age.weak_red_steel.rose_gold}"
 					type: "item"
 				}
 				{
 					count: 4L
 					id: "21434FAAA69D5BE0"
 					item: {
-						Count: 4
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(tfc:metal/ingot/black_steel)item(gtceu:black_steel_dust))"
 						}
-						id: "tfc:metal/ingot/black_steel"
 					}
+					title: "{quests.metal_age.weak_red_steel.black_steel}"
 					type: "item"
 				}
 			]
 			title: "{quests.metal_age.weak_red_steel.title}"
 			x: 22.0d
-			y: -25.5d
+			y: -27.0d
 		}
 		{
 			dependencies: ["5792DDAA82895E67"]
 			description: ["{quests.metal_age.weak_blu_steel.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:metal/ingot/weak_blue_steel"
+			}
 			id: "64F8A358EC3FEF45"
 			subtitle: "{quests.metal_age.weak_blu_steel.subtitle}"
 			tasks: [
@@ -1062,68 +1079,70 @@
 					count: 2L
 					id: "5331A323780B4B11"
 					item: {
-						Count: 2
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))"
 						}
-						id: "gtceu:steel_ingot"
 					}
+					title: "{quests.metal_age.weak_blue_steel.steel}"
 					type: "item"
 				}
 				{
 					count: 4L
 					id: "2809FD951B82C54F"
 					item: {
-						Count: 4
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(tfc:metal/ingot/black_steel)item(gtceu:black_steel_dust))"
 						}
-						id: "tfc:metal/ingot/black_steel"
 					}
+					title: "{quests.metal_age.weak_blue_steel.black_steel}"
 					type: "item"
 				}
 				{
 					id: "401EC1A9FBC759B8"
 					item: {
 						Count: 1
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:bismuth_bronze_ingot)item(gtceu:bismuth_bronze_dust))"
 						}
-						id: "gtceu:bismuth_bronze_ingot"
 					}
+					title: "{quests.metal_age.weak_blue_steel.bismuth_bronze}"
 					type: "item"
 				}
 				{
 					id: "7350ECE723ABE8F4"
 					item: {
 						Count: 1
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:sterling_silver_ingot)item(gtceu:sterling_silver_dust))"
 						}
-						id: "gtceu:sterling_silver_ingot"
 					}
+					title: "{quests.metal_age.weak_blue_steel.sterling_silver}"
 					type: "item"
 				}
 			]
 			title: "{quests.metal_age.weak_blu_steel.title}"
 			x: 22.0d
-			y: -23.5d
+			y: -25.0d
 		}
 		{
 			dependencies: ["64F8A358EC3FEF45"]
 			description: ["{quests.metal_age.highcarb_blu_steel.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:metal/ingot/blue_steel"
+			}
 			id: "6D04BAC5B215F90F"
 			subtitle: "{quests.metal_age.highcarb_blu_steel.subtitle}"
 			tasks: [
@@ -1158,7 +1177,7 @@
 			]
 			title: "{quests.metal_age.highcarb_blu_steel.title}"
 			x: 20.5d
-			y: -23.5d
+			y: -25.0d
 		}
 		{
 			dependencies: ["3C173357029AB649"]
diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt
index eee6df727..bc76b880a 100644
--- a/config/ftbquests/quests/chapters/questsstoneage.snbt
+++ b/config/ftbquests/quests/chapters/questsstoneage.snbt
@@ -684,6 +684,7 @@
 			tasks: [{
 				id: "5A6EF9EBF232601C"
 				item: "gtceu:copper_double_ingot"
+				match_nbt: false
 				type: "item"
 				weak_nbt_match: true
 			}]
diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt
index 1e3f0bf0f..d177e29fd 100644
--- a/config/ftbquests/quests/chapters/queststfc_tips.snbt
+++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt
@@ -1602,12 +1602,26 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.passive_preservation.desc}"]
+			disable_toast: true
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					Parent: {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:ceramic/vessel"
+				tag: { }
+			}
 			id: "13F7066858E923FF"
 			subtitle: "{quests.tfg_tips.passive_preservation.subtitle}"
 			tasks: [{
-				id: "54AAB9886964A160"
-				title: "{quests.tasktype.checkmark}"
-				type: "checkmark"
+				dimension: "minecraft:overworld"
+				icon: "gtceu:overworld_marker"
+				id: "5BAF5F5343C3E42A"
+				title: "{quests.stone_age.temperature.task}"
+				type: "dimension"
 			}]
 			title: "{quests.tfg_tips.passive_preservation.title}"
 			x: 6.5d
@@ -2236,10 +2250,7 @@
 			y: 9.5d
 		}
 		{
-			dependencies: [
-				"2D959136A5FC5F46"
-				"56CA2EB7812529C5"
-			]
+			dependencies: ["2D959136A5FC5F46"]
 			description: ["{quests.tfg_tips.lamps.desc}"]
 			id: "037CDA933FBE2CBE"
 			subtitle: "{quests.tfg_tips.lamps.subtitle}"
@@ -2277,8 +2288,8 @@
 				}
 			]
 			title: "{quests.tfg_tips.lamps.title}"
-			x: -5.0d
-			y: 11.0d
+			x: -5.5d
+			y: 11.5d
 		}
 		{
 			dependencies: [
@@ -2286,6 +2297,16 @@
 				"56CA2EB7812529C5"
 			]
 			description: ["{quests.tfg_tips.lava_lamp.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "tfc:metal/lamp/blue_steel"
+			}
 			id: "4EBABACAB444244D"
 			optional: true
 			shape: "heart"
@@ -2312,8 +2333,8 @@
 				}
 			]
 			title: "{quests.tfg_tips.lava_lamp.title}"
-			x: -5.0d
-			y: 12.5d
+			x: -5.5d
+			y: 13.0d
 		}
 		{
 			dependencies: ["037CDA933FBE2CBE"]
@@ -2333,8 +2354,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.creosote.title}"
-			x: -6.0d
-			y: 12.0d
+			x: -6.5d
+			y: 12.5d
 		}
 		{
 			dependencies: ["037CDA933FBE2CBE"]
@@ -2354,8 +2375,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.olive_oil.title}"
-			x: -4.0d
-			y: 12.0d
+			x: -4.5d
+			y: 12.5d
 		}
 		{
 			dependencies: ["2D959136A5FC5F46"]
@@ -3462,8 +3483,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.tallow.title}"
-			x: -6.5d
-			y: 11.0d
+			x: -7.0d
+			y: 11.5d
 		}
 		{
 			dependencies: ["150B7C5CD152E1BA"]
@@ -5380,6 +5401,26 @@
 			x: 7.5d
 			y: -18.0d
 		}
+		{
+			dependencies: ["037CDA933FBE2CBE"]
+			description: ["{quests.tfg_tips.glowstone_lamp.desc}"]
+			id: "61F58B402F1AE40B"
+			subtitle: "{quests.tfg_tips.glowstone_lamp.subtitle}"
+			tasks: [{
+				id: "71D52011F8BE66F0"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "only_one(item(gtceu:glowstone_bucket)nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"gtceu:glowstone\"}}))"
+					}
+				}
+				type: "item"
+			}]
+			title: "{quests.tfg_tips.glowstone_lamp.title}"
+			x: -6.5d
+			y: 10.5d
+		}
 	]
 	subtitle: ["{quests.tfg_tips.subtitle}"]
 	title: "{quests.tfg_tips}"