diff --git a/data/core/units/dunefolk/Burner.cfg b/data/core/units/dunefolk/Burner.cfg
index abfe6fe85d54..6ac46730e292 100644
--- a/data/core/units/dunefolk/Burner.cfg
+++ b/data/core/units/dunefolk/Burner.cfg
@@ -26,7 +26,7 @@
     [attack]
         name=naphtha attack
         description= _ "naphtha attack"
-        icon=attacks/torch.png
+        icon=attacks/fire-blast.png
         type=fire
         range=melee
         damage=8
diff --git a/data/core/units/dunefolk/Firetrooper.cfg b/data/core/units/dunefolk/Firetrooper.cfg
index d113ab18642f..890ce9f446e9 100644
--- a/data/core/units/dunefolk/Firetrooper.cfg
+++ b/data/core/units/dunefolk/Firetrooper.cfg
@@ -26,8 +26,8 @@
     {DEFENSE_ANIM "units/dunefolk/firetrooper.png" "units/dunefolk/firetrooper.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=naphtha attack
-        description=_"naphtha attack"
-        icon=attacks/fireball.png #TODO: add "correct" naphtha!
+        description= _ "naphtha attack"
+        icon=attacks/fire-blast.png
         type=fire
         range=melee
         damage=10
diff --git a/data/core/units/dunefolk/Scorcher.cfg b/data/core/units/dunefolk/Scorcher.cfg
index d70f89a8162a..e8d822ed3b64 100644
--- a/data/core/units/dunefolk/Scorcher.cfg
+++ b/data/core/units/dunefolk/Scorcher.cfg
@@ -1,6 +1,5 @@
 #textdomain wesnoth-units
 [unit_type]
-    # Below unit id changed to use underscores in unit ID only (not in displayed name) to fix bug #18117
     id=Dune Scorcher
     name= _ "Dune Scorcher"
     race=dunefolk
@@ -27,7 +26,7 @@
     [attack]
         name=naphtha attack
         description= _ "naphtha attack"
-        icon=attacks/fireball.png #TODO: add "correct" naphtha!
+        icon=attacks/fire-blast.png
         type=fire
         range=melee
         damage=10