diff --git a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/common/css_leftaligned_squads.ftl b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/common/css_leftaligned_squads.ftl
index 5c0a46e..c0ab592 100644
--- a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/common/css_leftaligned_squads.ftl
+++ b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/common/css_leftaligned_squads.ftl
@@ -8,6 +8,9 @@
            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
            font-style: normal;
          }
+    .red {
+        color: red;
+    }     
          
     .shields-symbol { font-family: "x-wing-symbols";
                font-size: 1.7em;
diff --git a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/epic_squad_detail.ftl b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/epic_squad_detail.ftl
index d7e61e5..0aa885e 100644
--- a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/epic_squad_detail.ftl
+++ b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/epic_squad_detail.ftl
@@ -8,8 +8,8 @@
 		<span> ${pilot.name} </span>
 	  </div>
 	  	<div>
-   	      <span><b class="agility">${fun.findShipAgility(pilot.ship)}</b> <span class="agility-symbol">^</span> </span>
   	      <span><b class="attack">${fun.findShipAttack(pilot.ship)}</b> <span class="attack-symbol">%</span> </span>
+   	      <span><b class="agility">${fun.findShipAgility(pilot.ship)}</b> <span class="agility-symbol">^</span> </span>
 		  <span>
 		   <b class="shields">${(pilot.shields)!"0"}</b>
 		   <span class="shields-symbol">*</span>&nbsp;&nbsp;
diff --git a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/leftaligned_squad_detail.ftl b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/leftaligned_squad_detail.ftl
index 58c791f..ccb30f4 100644
--- a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/leftaligned_squad_detail.ftl
+++ b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/leftaligned_squad_detail.ftl
@@ -5,6 +5,9 @@
 	  <span>${fun.pilotAliveDead(pilot)}</span>
 	</#if> 
 	<span> ${pilot.name} </span>
+	<#if pilot.hasCriticalDamage()>
+	<span> <i class="xwing-miniatures-font xwing-miniatures-font-token-crit red"></i></span>
+	</#if>
   </div>
   	<div>
   	  <span><span class="attack-symbol">%</span>&nbsp;<b class="attack">${fun.findShipAttack(pilot.ship)}&nbsp;</b></span>	  
diff --git a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/rightaligned_squad_detail.ftl b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/rightaligned_squad_detail.ftl
index cb7bc53..2b1a9c0 100644
--- a/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/rightaligned_squad_detail.ftl
+++ b/bundles/us.nineworlds.xstreamer.templates/templates/squads/html/rightaligned_squad_detail.ftl
@@ -5,6 +5,9 @@
 	  <span>${fun.pilotAliveDead(pilot)}</span>
 	</#if> 
 	<span> ${pilot.name} </span>
+	<#if pilot.hasCriticalDamage()>
+	<span> <i class="xwing-miniatures-font xwing-miniatures-font-token-crit red"></i></span>
+	</#if>
   </div>
   	<div>
 	  <span>[${pilot.points}]&nbsp;</span>