diff --git a/data/json/bionics.json b/data/json/bionics.json
index 2a8c7f1ce66a..008914acea85 100644
--- a/data/json/bionics.json
+++ b/data/json/bionics.json
@@ -571,7 +571,7 @@
     "name": { "str": "Finger-Mounted Laser" },
     "description": "One of your fingers has a small high-powered laser surgically embedded in it.  This long range weapon is not incredibly damaging, but is very accurate, and has the potential to start fires.",
     "occupied_bodyparts": [ [ "hand_r", 1 ] ],
-    "act_cost": "30 kJ",
+    "act_cost": "10 kJ",
     "fake_item": "bio_laser_gun",
     "flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
   },
@@ -601,7 +601,7 @@
     "description": "The index fingers of both hands have powerful fire starters which extend from the tip.",
     "occupied_bodyparts": [ [ "hand_l", 1 ], [ "hand_r", 1 ] ],
     "fake_item": "fake_firestarter",
-    "act_cost": "3 kJ"
+    "act_cost": "1 kJ"
   },
   {
     "id": "bio_lockpick",
diff --git a/data/json/items/tool/fire.json b/data/json/items/tool/fire.json
index a191e4d6696d..33625ab0443b 100644
--- a/data/json/items/tool/fire.json
+++ b/data/json/items/tool/fire.json
@@ -4,10 +4,9 @@
     "type": "TOOL",
     "name": { "str": "electric firestarter" },
     "description": "This is a crudely made electric firestarter, which can function as an inefficient lighter.",
-    "copy-from": "lighter",
+    "weight": "100 g",
     "volume": "250 ml",
     "magazine_well": "250 ml",
-    "max_charges": 10,
     "price": "1 USD",
     "price_postapoc": "10 cent",
     "material": "steel",
@@ -264,20 +263,16 @@
   },
   {
     "id": "electric_lighter",
+    "copy-from": "crude_firestarter",
     "type": "TOOL",
     "name": { "str": "electric lighter" },
     "description": "A battery-powered lighter.  More efficient than a crude electric firestarter, its batteries last for quite a while.",
-    "copy-from": "lighter",
+    "weight": "14 g",
     "volume": "50 ml",
-    "magazine_well": "50 ml",
-    "max_charges": 5,
-    "price": "1 USD",
-    "price_postapoc": "10 cent",
-    "material": "steel",
-    "color": "light_gray",
     "looks_like": "lighter",
-    "ammo": "battery",
+    "charges_per_use": 1,
     "use_action": { "type": "firestarter", "moves": 50 },
+    "magazine_well": "50 ml",
     "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] ] ]
   }
 ]
diff --git a/data/json/obsoletion/charge_removal.json b/data/json/obsoletion/charge_removal.json
index 18478dd7a17d..7c19c573843e 100644
--- a/data/json/obsoletion/charge_removal.json
+++ b/data/json/obsoletion/charge_removal.json
@@ -105,7 +105,9 @@
       "reading_light",
       "reading_light_on",
       "22_casing_new",
-      "hobo_stove"
+      "hobo_stove",
+      "crude_firestarter",
+      "electric_lighter"
     ]
   }
 ]