diff --git a/dist/WeaponsDrawn.js b/dist/WeaponsDrawn.js
index 04f29d7..0c18c59 100644
--- a/dist/WeaponsDrawn.js
+++ b/dist/WeaponsDrawn.js
@@ -46,6 +46,7 @@ Hooks.once('ready', function () {
 Hooks.on('renderTokenConfig', onRenderTokenConfig);
 Hooks.on('createCombatant', onCreateCombatant);
 Hooks.on('deleteCombatant', onDeleteCombatant);
+Hooks.on('deleteCombat', onDeleteCombat);
 Hooks.on('createToken', onCreateToken);
 
 function onCreateToken (scene, token, _, userId) {
@@ -82,6 +83,20 @@ function onDeleteCombatant (combat, combatant, _, userId) {
 	updateTokenImg(combatant.token._id, true, tokenImgPath, combat.data.scene);
 }
 
+ // Return icons to idle state on end of combat
+ function onDeleteCombat (combat, _, userId) {
+	if (game.userId !== userId) {
+		// Only act if we initiated the update ourselves
+		return;
+	}
+	var combatant;
+	for  (combatant of combat.combatants) {
+		const actorEntity = game.actors.get(combatant.actor.data._id);
+		const tokenImgPath = getStateTokenImgPath(actorEntity, false);
+		updateTokenImg(combatant.token._id, true, tokenImgPath, combat.data.scene);
+	}
+}
+
 function getStateTokenImgPath (actorEntity, inCombat) {
 	let idleTokenImage = "";
 	let combatTokenImage = "";