diff --git a/module/data/action/damageAction.mjs b/module/data/action/damageAction.mjs
index b4b3e17c..51735543 100644
--- a/module/data/action/damageAction.mjs
+++ b/module/data/action/damageAction.mjs
@@ -2,4 +2,17 @@ import DHBaseAction from './baseAction.mjs';
 
 export default class DHDamageAction extends DHBaseAction {
     static extraSchemas = [...super.extraSchemas, 'damage', 'target', 'effects'];
+
+    /**
+     * Return a display ready damage formula string
+     * @returns Formula string
+     */
+    getDamageFormula() {
+        const strings = [];
+        for (const { value } of this.damage.parts) {
+            strings.push(Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {}));
+        }
+
+        return strings.join(' + ');
+    }
 }
diff --git a/module/helpers/handlebarsHelper.mjs b/module/helpers/handlebarsHelper.mjs
index 2aa72dfc..2faea830 100644
--- a/module/helpers/handlebarsHelper.mjs
+++ b/module/helpers/handlebarsHelper.mjs
@@ -35,14 +35,8 @@ export default class RegisterHandlebarsHelpers {
         return accum;
     }
 
-    static damageFormula(attack, actor) {
-        const traitTotal = actor.system.traits?.[attack.roll.trait]?.value;
-        const instances = [
-            attack.damage.parts.map(x => Roll.replaceFormulaData(x.value.getFormula(), actor)).join(' + '),
-            traitTotal
-        ].filter(x => x);
-
-        return instances.join(traitTotal > 0 ? ' + ' : ' - ');
+    static damageFormula(attack) {
+        return attack.getDamageFormula();
     }
 
     static formulaValue(formula, item) {
diff --git a/templates/sheets/actors/adversary/sidebar.hbs b/templates/sheets/actors/adversary/sidebar.hbs
index cf724e7d..d2fca5f1 100644
--- a/templates/sheets/actors/adversary/sidebar.hbs
+++ b/templates/sheets/actors/adversary/sidebar.hbs
@@ -64,9 +64,9 @@
             </div>
             <ul class="items-sidebar-list">
                 {{> 'daggerheart.inventory-item-compact'
-                item=document.system.attack
-                type='action'
-                noCompendiumEdit=true
+                    item=document.system.attack
+                    type='attack'
+                    noCompendiumEdit=true
                 }}
             </ul>
         </div>
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index 9ef3939a..7f470b0a 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -104,16 +104,16 @@
             </div>
             <ul class="items-sidebar-list">
                 {{#if document.system.usedUnarmed}}
-                    {{> 'daggerheart.inventory-item-compact'
+                {{> 'daggerheart.inventory-item-compact'
                     item=document.system.usedUnarmed
-                    type='action'
-                    }}
+                    type='attack'
+                }}
                 {{/if}}
                 {{#each document.items as |item|}}
                 {{#if item.system.equipped}}
                 {{> 'daggerheart.inventory-item-compact'
-                item=item
-                type=item.type
+                    item=item
+                    type=item.type
                 }}
                 {{/if}}
                 {{/each}}
diff --git a/templates/sheets/actors/companion/details.hbs b/templates/sheets/actors/companion/details.hbs
index 1142dfa5..af2e4622 100644
--- a/templates/sheets/actors/companion/details.hbs
+++ b/templates/sheets/actors/companion/details.hbs
@@ -28,7 +28,7 @@
         <ul class="items-list">
             {{> 'daggerheart.inventory-item-compact'
             item=document.system.attack
-            type='action'
+            type='attack'
             hideTooltip=true
             }}
         </ul>
diff --git a/templates/ui/tooltip/adversary.hbs b/templates/ui/tooltip/adversary.hbs
index 86c399c5..bba7e696 100644
--- a/templates/ui/tooltip/adversary.hbs
+++ b/templates/ui/tooltip/adversary.hbs
@@ -44,7 +44,7 @@
         </div>
         <div class="tooltip-information">
             <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
-            <div>{{damageFormula item.system.attack item}}</div>
+            <div>{{damageFormula item.system.attack}}</div>
         </div>
     </div>
 
diff --git a/templates/ui/tooltip/attack.hbs b/templates/ui/tooltip/attack.hbs
index e07e1d55..efd40311 100644
--- a/templates/ui/tooltip/attack.hbs
+++ b/templates/ui/tooltip/attack.hbs
@@ -4,22 +4,28 @@
     <div class="tooltip-description">{{{description}}}</div>
 
     <div class="tooltip-information-section spaced">
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
-            {{#with (lookup config.ACTOR.abilities attack.roll.trait) as | trait |}}
-                <div>{{localize trait.label}}</div>
-            {{/with}}
-        </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
-            {{#with (lookup config.GENERAL.range attack.range) as | range |}}
-                <div>{{localize range.label}}</div>
-            {{/with}}
-        </div>
+
+        {{#if (lookup config.ACTOR.abilities attack.roll.trait)}}
+            <div class="tooltip-information">
+                <label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
+                {{#with (lookup config.ACTOR.abilities attack.roll.trait) as | trait |}}
+                    <div>{{localize trait.label}}</div>
+                {{/with}}
+            </div>
+        {{/if}}
+
+        {{#if (lookup config.GENERAL.range attack.range)}}
+            <div class="tooltip-information">
+                <label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
+                {{#with (lookup config.GENERAL.range attack.range) as | range |}}
+                    <div>{{localize range.label}}</div>
+                {{/with}}
+            </div>
+        {{/if}}
 
         <div class="tooltip-information">
             <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
-            <div>{{{damageFormula attack parent}}}</div>
+            <div>{{{damageFormula attack}}}</div>
         </div>
         <div class="tooltip-information">
             <label>{{localize "DAGGERHEART.GENERAL.damageType"}}</label>
diff --git a/templates/ui/tooltip/weapon.hbs b/templates/ui/tooltip/weapon.hbs
index 582bfc50..3c2a1407 100644
--- a/templates/ui/tooltip/weapon.hbs
+++ b/templates/ui/tooltip/weapon.hbs
@@ -30,7 +30,7 @@
         </div>
         <div class="tooltip-information">
             <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
-            <div>{{{damageFormula item.system.attack item.parent}}}</div>
+            <div>{{{damageFormula item.system.attack}}}</div>
         </div>
         <div class="tooltip-information">
             <label>{{localize "DAGGERHEART.GENERAL.damageType"}}</label>