diff --git a/addons/core/scripts/Game/ACE_Core/UserActions/ACE_WrenchDestroyUserAction.c b/addons/core/scripts/Game/ACE_Core/UserActions/ACE_WrenchDestroyUserAction.c
index 448343a6..1bdc1a1a 100644
--- a/addons/core/scripts/Game/ACE_Core/UserActions/ACE_WrenchDestroyUserAction.c
+++ b/addons/core/scripts/Game/ACE_Core/UserActions/ACE_WrenchDestroyUserAction.c
@@ -112,7 +112,7 @@ class ACE_WrenchDestroyUserAction : ScriptedUserAction
 		if (!gadget)
             return false;
 		
-         if (!gadget.FindComponent(SCR_RepairSupportStationComponent))
+         if (!gadget.GetOwner().FindComponent(SCR_RepairSupportStationComponent))
             return false;
 		
 		 return true;
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.cs_cz.conf b/addons/explosives/Language/ACEExplosivesLocalization.cs_cz.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.cs_cz.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.cs_cz.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.de_de.conf b/addons/explosives/Language/ACEExplosivesLocalization.de_de.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.de_de.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.de_de.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.en_us.conf b/addons/explosives/Language/ACEExplosivesLocalization.en_us.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.en_us.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.en_us.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.es_es.conf b/addons/explosives/Language/ACEExplosivesLocalization.es_es.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.es_es.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.es_es.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.fr_fr.conf b/addons/explosives/Language/ACEExplosivesLocalization.fr_fr.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.fr_fr.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.fr_fr.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.it_it.conf b/addons/explosives/Language/ACEExplosivesLocalization.it_it.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.it_it.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.it_it.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.ja_jp.conf b/addons/explosives/Language/ACEExplosivesLocalization.ja_jp.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.ja_jp.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.ja_jp.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.ko_kr.conf b/addons/explosives/Language/ACEExplosivesLocalization.ko_kr.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.ko_kr.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.ko_kr.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.pl_pl.conf b/addons/explosives/Language/ACEExplosivesLocalization.pl_pl.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.pl_pl.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.pl_pl.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.pt_br.conf b/addons/explosives/Language/ACEExplosivesLocalization.pt_br.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.pt_br.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.pt_br.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.ru_ru.conf b/addons/explosives/Language/ACEExplosivesLocalization.ru_ru.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.ru_ru.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.ru_ru.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.uk_ua.conf b/addons/explosives/Language/ACEExplosivesLocalization.uk_ua.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.uk_ua.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.uk_ua.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Language/ACEExplosivesLocalization.zh_cn.conf b/addons/explosives/Language/ACEExplosivesLocalization.zh_cn.conf
index 44c509a5..c5df6a8b 100644
--- a/addons/explosives/Language/ACEExplosivesLocalization.zh_cn.conf
+++ b/addons/explosives/Language/ACEExplosivesLocalization.zh_cn.conf
@@ -1,2 +1,8 @@
 StringTableRuntime {
+ Ids {
+  "ACE-Explosives_DeminingUserAction_Name"
+ }
+ Texts {
+  "Disarm"
+ }
 }
\ No newline at end of file
diff --git a/addons/explosives/Prefabs/Weapons/Core/ExplosiveCharge_base.et b/addons/explosives/Prefabs/Weapons/Core/ExplosiveCharge_base.et
new file mode 100644
index 00000000..0430f361
--- /dev/null
+++ b/addons/explosives/Prefabs/Weapons/Core/ExplosiveCharge_base.et
@@ -0,0 +1,32 @@
+GenericEntity : "{CD00FFBAFD036BE2}Prefabs/Weapons/Core/Explosives_base.et" {
+ ID "5968D2B6A82C6019"
+ components {
+  ActionsManagerComponent "{5AA692DC30B9C623}" {
+   ActionContexts {
+    UserActionContext "{61B82D1B81E2313E}" {
+     ContextName "Empty"
+    }
+   }
+   additionalActions {
+    SCR_DisarmExplosiveChargeAction "{5F1CD13994BFA81F}" {
+     ParentContextList {
+      "Empty"
+     }
+     UIInfo UIInfo "{5F1A794DA78B2106}" {
+      Name ""
+     }
+     ActionTitle ""
+    }
+    ACE_Explosives_DeminingUserAction "{61B8246250D78F21}" {
+     ParentContextList {
+      "default"
+     }
+     UIInfo UIInfo "{61B82462489B738B}" {
+      Name "#ACE-Explosives_DeminingUserAction_Name"
+     }
+     VisibilityRange 1
+    }
+   }
+  }
+ }
+}
\ No newline at end of file
diff --git a/addons/explosives/Prefabs/Weapons/Core/ExplosiveCharge_base.et.meta b/addons/explosives/Prefabs/Weapons/Core/ExplosiveCharge_base.et.meta
new file mode 100644
index 00000000..f537609b
--- /dev/null
+++ b/addons/explosives/Prefabs/Weapons/Core/ExplosiveCharge_base.et.meta
@@ -0,0 +1,17 @@
+MetaFileClass {
+ Name "{7D968AE11F63B3F6}Prefabs/Weapons/Core/ExplosiveCharge_base.et"
+ Configurations {
+  EntityTemplateResourceClass PC {
+  }
+  EntityTemplateResourceClass XBOX_ONE : PC {
+  }
+  EntityTemplateResourceClass XBOX_SERIES : PC {
+  }
+  EntityTemplateResourceClass PS4 : PC {
+  }
+  EntityTemplateResourceClass PS5 : PC {
+  }
+  EntityTemplateResourceClass HEADLESS : PC {
+  }
+ }
+}
\ No newline at end of file
diff --git a/addons/explosives/Prefabs/Weapons/Core/Mine_base.et b/addons/explosives/Prefabs/Weapons/Core/Mine_base.et
index 0e71d251..cbf2768c 100644
--- a/addons/explosives/Prefabs/Weapons/Core/Mine_base.et
+++ b/addons/explosives/Prefabs/Weapons/Core/Mine_base.et
@@ -6,11 +6,11 @@ GenericEntity : "{CD00FFBAFD036BE2}Prefabs/Weapons/Core/Explosives_base.et" {
   }
   ActionsManagerComponent "{59E4E6938E65C2ED}" {
    additionalActions {
-    ACE_Explosives_DeminingUserAction "{61B77855355025F3}" {
+    ACE_Explosives_DeminingUserAction "{61B82460734EEF61}" {
      ParentContextList {
       "default"
      }
-     UIInfo UIInfo "{61B7785556CD0A18}" {
+     UIInfo UIInfo "{61B824606B6A2B03}" {
       Name "#ACE-Explosives_DeminingUserAction_Name"
      }
      VisibilityRange 1
diff --git a/addons/explosives/Prefabs/Weapons/Core/Mine_base.et.meta b/addons/explosives/Prefabs/Weapons/Core/Mine_base.et.meta
new file mode 100644
index 00000000..8612bf39
--- /dev/null
+++ b/addons/explosives/Prefabs/Weapons/Core/Mine_base.et.meta
@@ -0,0 +1,17 @@
+MetaFileClass {
+ Name "{9C80A507960AA473}Prefabs/Weapons/Core/Mine_base.et"
+ Configurations {
+  EntityTemplateResourceClass PC {
+  }
+  EntityTemplateResourceClass XBOX_ONE : PC {
+  }
+  EntityTemplateResourceClass XBOX_SERIES : PC {
+  }
+  EntityTemplateResourceClass PS4 : PC {
+  }
+  EntityTemplateResourceClass PS5 : PC {
+  }
+  EntityTemplateResourceClass HEADLESS : PC {
+  }
+ }
+}
\ No newline at end of file
diff --git a/addons/explosives/scripts/Game/ACE_Explosives/Demining/UserActions/ACE_Explosives_DeminingUserAction.c b/addons/explosives/scripts/Game/ACE_Explosives/Demining/UserActions/ACE_Explosives_DeminingUserAction.c
index d0e200cc..f1ab3601 100644
--- a/addons/explosives/scripts/Game/ACE_Explosives/Demining/UserActions/ACE_Explosives_DeminingUserAction.c
+++ b/addons/explosives/scripts/Game/ACE_Explosives/Demining/UserActions/ACE_Explosives_DeminingUserAction.c
@@ -1,9 +1,10 @@
 //------------------------------------------------------------------------------------------------
-//! Mine deletion user action
-class ACE_Explosives_DeminingUserAction : ACE_ShovelDestroyUserAction
-{	
+//! Explosive deletion user action
+class ACE_Explosives_DeminingUserAction : ACE_WrenchDestroyUserAction
+{
+	
 	//------------------------------------------------------------------------------------------------
-	//! Request deletion of the tree
+	//! Request deletion of the explosive
 	override void PerformAction(IEntity pOwnerEntity, IEntity pUserEntity) 
 	{
 		SCR_EntityHelper.DeleteEntityAndChildren(pOwnerEntity);