diff --git a/src/module/actor/base.ts b/src/module/actor/base.ts
index a3bc6cb234c..5fb9664aac6 100644
--- a/src/module/actor/base.ts
+++ b/src/module/actor/base.ts
@@ -1722,9 +1722,7 @@ class ActorPF2e<TParent extends TokenDocumentPF2e | null = TokenDocumentPF2e | n
             if (combatant) {
                 combatant.toggleDefeated({ to: false });
             } else {
-                for (const tokenDoc of this.getActiveTokens(false, true)) {
-                    tokenDoc.update({ overlayEffect: "" });
-                }
+                this.toggleStatusEffect("dead");
             }
         }
     }
diff --git a/src/scripts/hooks/close-combat-tracker-config.ts b/src/scripts/hooks/close-combat-tracker-config.ts
index 744922ed934..a2dcd54df83 100644
--- a/src/scripts/hooks/close-combat-tracker-config.ts
+++ b/src/scripts/hooks/close-combat-tracker-config.ts
@@ -1,15 +1,18 @@
+import { htmlQuery } from "@util";
+
 /** Add a deathIcon setting to the CombatTrackerConfig application */
 export const CloseCombatTrackerConfig = {
     listen: (): void => {
         Hooks.on("closeCombatTrackerConfig", async (_app, $html): Promise<void> => {
-            const newIcon = String($html.find<HTMLInputElement>('input[name="deathIcon"]').val()).trim();
+            const html = $html[0];
+            const newIcon = htmlQuery<HTMLInputElement>(html, "file-picker")?.value;
             if (newIcon && newIcon !== game.settings.get("pf2e", "deathIcon")) {
                 await game.settings.set("pf2e", "deathIcon", newIcon);
             }
 
             const currentDeadAtZero = game.settings.get("pf2e", "automation.actorsDeadAtZero");
-            const newDeadAtZero = String($html.find<HTMLSelectElement>('select[name="actorsDeadAtZero"]').val());
-            if (currentDeadAtZero !== newDeadAtZero) {
+            const newDeadAtZero = htmlQuery<HTMLSelectElement>(html, "select[name=actorsDeadAtZero]")?.value;
+            if (newDeadAtZero && currentDeadAtZero !== newDeadAtZero) {
                 await game.settings.set("pf2e", "automation.actorsDeadAtZero", newDeadAtZero);
             }
         });
diff --git a/src/scripts/hooks/render-combat-tracker-config.ts b/src/scripts/hooks/render-combat-tracker-config.ts
index b5978a96169..239fbdcad2e 100644
--- a/src/scripts/hooks/render-combat-tracker-config.ts
+++ b/src/scripts/hooks/render-combat-tracker-config.ts
@@ -13,6 +13,11 @@ export const RenderCombatTrackerConfig = {
                     values: {
                         deathIcon: game.settings.get("pf2e", "deathIcon"),
                         actorsDeadAtZero: game.settings.get("pf2e", "automation.actorsDeadAtZero"),
+                        deadAtZeroOptions: [
+                            { value: "both", label: "PF2E.SETTINGS.Automation.ActorsDeadAtZero.Both" },
+                            { value: "npcsOnly", label: "PF2E.SETTINGS.Automation.ActorsDeadAtZero.NPCsOnly" },
+                            { value: "neither", label: "PF2E.SETTINGS.Automation.ActorsDeadAtZero.Neither" },
+                        ],
                     },
                 });
                 const tempElem = document.createElement("div");
diff --git a/static/templates/sidebar/encounter-tracker/config.hbs b/static/templates/sidebar/encounter-tracker/config.hbs
index 58f3fd7e56c..269e9af5ff6 100644
--- a/static/templates/sidebar/encounter-tracker/config.hbs
+++ b/static/templates/sidebar/encounter-tracker/config.hbs
@@ -2,8 +2,7 @@
     <div class="form-group">
         <label>{{localize "PF2E.SETTINGS.DeathIcon.Name"}}</label>
         <div class="form-fields">
-            {{filePicker target="deathIcon" type="imagevideo"}}
-            <input class="image" type="text" name="deathIcon" placeholder="path/image.png" value="{{values.deathIcon}}" />
+            <file-picker name="deathIcon" type="imagevideo" value="{{values.deathIcon}}"></file-picker>
         </div>
         <p class="hint">{{localize "PF2E.SETTINGS.DeathIcon.Hint"}}</p>
     </div>
@@ -11,11 +10,7 @@
         <label>{{localize "PF2E.SETTINGS.Automation.ActorsDeadAtZero.Name"}}</label>
         <div class="form-fields">
             <select name="actorsDeadAtZero">
-                {{#select values.actorsDeadAtZero}}
-                    <option value="both">{{localize "PF2E.SETTINGS.Automation.ActorsDeadAtZero.Both"}}</option>
-                    <option value="npcsOnly">{{localize "PF2E.SETTINGS.Automation.ActorsDeadAtZero.NPCsOnly"}}</option>
-                    <option value="neither">{{localize "PF2E.SETTINGS.Automation.ActorsDeadAtZero.Neither"}}</option>
-                {{/select}}
+                {{selectOptions values.deadAtZeroOptions selected=values.actorsDeadAtZero localize=true}}
             </select>
         </div>
         <p class="hint">{{localize "PF2E.SETTINGS.Automation.ActorsDeadAtZero.Hint"}}</p>