diff --git a/module/applications/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs
index e03d6658..e0517abe 100644
--- a/module/applications/dialogs/tagTeamDialog.mjs
+++ b/module/applications/dialogs/tagTeamDialog.mjs
@@ -236,11 +236,11 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
             }
         }
 
+        const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
+        const critSelected = !selectedRoll ? undefined : (selectedRoll?.roll?.isCritical ?? false);
+        const isCritical = critSelected || (critSelected === undefined && data.roll?.isCritical);
         if (data.damageRollData.main) {
-            const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
-            const critSelected = !selectedRoll ? undefined : (selectedRoll?.roll?.isCritical ?? false);
-            const useCritDamage = critSelected || (critSelected === undefined && data.roll?.isCritical);
-            data.damageRollData.main.options.isCritical = useCritDamage;
+            data.damageRollData.main.options.isCritical = isCritical;
         }
 
         return {
@@ -253,8 +253,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
             rollOptions,
             damageRollOptions,
             damage: data.damageRollData,
-            critDamage: this.getCriticalDamage(data.damageRollData),
-            useCritDamage: false
+            isCritical
         };
     }
 
diff --git a/styles/less/dialog/tag-team-dialog/sheet.less b/styles/less/dialog/tag-team-dialog/sheet.less
index 82bc0270..3a6778d8 100644
--- a/styles/less/dialog/tag-team-dialog/sheet.less
+++ b/styles/less/dialog/tag-team-dialog/sheet.less
@@ -252,11 +252,8 @@
                     width: 100%;
                     text-align: center;
 
-                    .result-info {
-                        display: flex;
-                        gap: 4px;
-                        align-items: center;
-                        justify-content: center;
+                    .damage-info {
+                        text-decoration: underline;
                     }
                 }
             }
diff --git a/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs b/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs
index e8bec150..4727d7e8 100644
--- a/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs
+++ b/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs
@@ -1,5 +1,5 @@
 {{#if damage.main}}
-    {{> damage roll=damage.main label=(localize "DAGGERHEART.GENERAL.damage") memberKey=key}}
+    {{> damage roll=damage.main label=(localize "DAGGERHEART.GENERAL.damage") memberKey=key isCritical=isCritical}}
 {{/if}}
 
 {{#each damage.resources as |roll key|}}
diff --git a/templates/dialogs/tagTeamDialog/result.hbs b/templates/dialogs/tagTeamDialog/result.hbs
index ffeeefd9..4351823e 100644
--- a/templates/dialogs/tagTeamDialog/result.hbs
+++ b/templates/dialogs/tagTeamDialog/result.hbs
@@ -6,18 +6,9 @@
                 {{#if hintText}}
                     <div class="hint">{{localize hintText}}</div>
                 {{else}}
-                    {{#if joinedRoll.rollData}}
-                        <div class="result-container">
-                            <span class="result-section-label">{{localize "DAGGERHEART.GENERAL.dualityRoll"}}</span>
-                            <div class="result-info">
-                                <div class="damage-info">{{joinedRoll.rollData.total}}</div>
-                                <div>{{localize "DAGGERHEART.GENERAL.withThing" thing=joinedRoll.roll.totalLabel}}</div>
-                            </div>
-                        </div>
-                    {{/if}}
                     {{#if joinedRoll.damageRollData}}
                         <div class="result-container">
-                            <span class="result-section-label">{{localize "DAGGERHEART.GENERAL.damage"}}</span>
+                            <div class="damage-info">{{joinedRoll.rollData.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=joinedRoll.roll.totalLabel}}</div>
                             {{#if joinedRoll.damageRollData.main}}
                                 {{> damageSummary roll=joinedRoll.damageRollData.main label=(localize "DAGGERHEART.GENERAL.damage")}}
                             {{/if}}
@@ -41,8 +32,5 @@
 </section>
 
 {{#*inline "damageSummary"}}
-    <div class="result-info">
-        <div>{{label}}</div>
-        <div class="damage-info">{{roll.total}}</div>
-    </div>
+    <div>{{label}} {{roll.total}}</div>
 {{/inline}}
\ No newline at end of file
diff --git a/templates/dialogs/tagTeamDialog/tagTeamMember.hbs b/templates/dialogs/tagTeamDialog/tagTeamMember.hbs
index 7758979b..079a2a6f 100644
--- a/templates/dialogs/tagTeamDialog/tagTeamMember.hbs
+++ b/templates/dialogs/tagTeamDialog/tagTeamMember.hbs
@@ -109,11 +109,7 @@
                             </div>
                         </span>
                         {{#if damage.active}}
-                            {{#if useCritDamage}}
-                                {{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=critDamage isCritical=true }}
-                            {{else}}
-                                {{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=damage }}
-                            {{/if}}
+                            {{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=damage isCritical=isCritical }}
                         {{else}}
                             <span class="hint">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}}</span>
                         {{/if}}