diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2db55f846..1c5e0facb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Changes
+- Complete rework of prospector's picks. (#1594) @Redeix
 ### Bug fixes
 
 ## [0.10.9] - 10-08-2025
diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json
index 3232beb69..b9bc01cff 100644
--- a/kubejs/assets/tfg/lang/en_us.json
+++ b/kubejs/assets/tfg/lang/en_us.json
@@ -736,6 +736,11 @@
   "tfg.tooltip.moon_rabbit_variant.cyan": "Seafoam Fur",
   "tfg.tooltip.moon_rabbit_variant.purple": "Lavender Fur",
   "tfg.tooltip.moon_rabbit_variant.sofu": "Sundae Fur",
+  "tfg.toast.ore_prospector_none": "No ores found in range.",
+  "tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s",
+  "tooltip.tfg.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.",
+  "tooltip.tfg.ore_prospector_count": "This prospector will display ore counts.",
+  "tooltip.tfg.ore_prospector_xray": "This prospector will display an x-ray view of ore blocks.",
   "item.treetap.tap": "Deprecated Item, Craft to Upgrade",
   "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade",
   "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade",
diff --git a/kubejs/assets/tfg/particles/ore_prospector.json b/kubejs/assets/tfg/particles/ore_prospector.json
new file mode 100644
index 000000000..74e1988cc
--- /dev/null
+++ b/kubejs/assets/tfg/particles/ore_prospector.json
@@ -0,0 +1,5 @@
+{
+  "textures": [
+    "tfg:ore_prospector_particle"
+  ]
+}
diff --git a/kubejs/assets/tfg/textures/particle/ore_prospector_particle.png b/kubejs/assets/tfg/textures/particle/ore_prospector_particle.png
new file mode 100644
index 000000000..386bf3116
Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/ore_prospector_particle.png differ
diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js
index 09a1a5023..9070ccfa0 100644
--- a/kubejs/server_scripts/tfg/tags.js
+++ b/kubejs/server_scripts/tfg/tags.js
@@ -48,6 +48,18 @@ const registerTFGItemTags = (event) => {
 
 	event.add('tfg:harvester', 'tfg:harvest_basket')
 	event.add('tfg:harvester', 'tfg:aluminium_harvest_basket')
+
+	event.removeAll('tfc:propicks')
+	event.add('tfg:tools/ore_prospectors/copper', 'tfc:metal/propick/copper')
+	event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bronze')
+	event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bismuth_bronze')
+	event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/black_bronze')
+	event.add('tfg:tools/ore_prospectors/wrought_iron', 'tfc:metal/propick/wrought_iron')
+	event.add('tfg:tools/ore_prospectors/steel', 'tfc:metal/propick/steel')
+	event.add('tfg:tools/ore_prospectors/black_steel', 'tfc:metal/propick/black_steel')
+	event.add('tfg:tools/ore_prospectors/blue_steel', 'tfc:metal/propick/blue_steel')
+	event.add('tfg:tools/ore_prospectors/red_steel', 'tfc:metal/propick/red_steel')
+
 	//#endregion
 
 	// #region Paper from wood