diff --git a/test/integration/fixtures/scenario-test.svg b/test/integration/fixtures/scenario-test.svg
index d4d8453..9c31cd7 100644
--- a/test/integration/fixtures/scenario-test.svg
+++ b/test/integration/fixtures/scenario-test.svg
@@ -25,7 +25,6 @@
   </style>
   <defs>
     <polygon id="hex" points="0,10 8.66,5 8.66,-5 0,-10 -8.66,-5 -8.66,5"/>
-    <circle id="counter-base" cx="0" cy="0" r="5"/>
 
     <line id="ast-line" x1="-1.2" y1="0" x2="1.2" y2="0"/>
 
@@ -45,13 +44,36 @@
       <use x="-8.66" style="transform-origin: -8.66px 0;" class="ccw-60-deg" href="#ast-line"/>
     </pattern>
 
-    <g id="t-1" class="troop-counter-template"><use href="#counter-base"/><text>1</text></g>
-    <g id="t-2" class="troop-counter-template"><use href="#counter-base"/><text>2</text></g>
-    <g id="t-3" class="troop-counter-template"><use href="#counter-base"/><text>3</text></g>
-    <g id="t-4" class="troop-counter-template"><use href="#counter-base"/><text>4</text></g>
-    <g id="t-5" class="troop-counter-template"><use href="#counter-base"/><text>5</text></g>
-    <g id="t-6" class="troop-counter-template"><use href="#counter-base"/><text>6</text></g>
-    <g id="t-7" class="troop-counter-template"><use href="#counter-base"/><text>7</text></g>
+    <circle id="counter-base" style="r: inherit;" cx="0" cy="0" r="5"/>
+
+    <g style="r: inherit;" id="number-1">
+      <use style="r: inherit;" href="#counter-base"/>
+      <text style="fill: var(--text-fill); transform: translateY(var(--translateY))">1</text>
+    </g>
+    <g style="r: inherit;" id="number-2">
+      <use style="r: inherit;" href="#counter-base"/>
+      <text style="fill: var(--text-fill); transform: translateY(var(--translateY))">2</text>
+    </g>
+    <g style="r: inherit;" id="number-3">
+      <use style="r: inherit;" href="#counter-base"/>
+      <text style="fill: var(--text-fill); transform: translateY(var(--translateY))">3</text>
+    </g>
+    <g style="r: inherit;" id="number-4">
+      <use style="r: inherit;" href="#counter-base"/>
+      <text style="fill: var(--text-fill); transform: translateY(var(--translateY))">4</text>
+    </g>
+    <g style="r: inherit;" id="number-5">
+      <use style="r: inherit;" href="#counter-base"/>
+      <text style="fill: var(--text-fill); transform: translateY(var(--translateY))">5</text>
+    </g>
+    <g style="r: inherit;" id="number-6">
+      <use style="r: inherit;" href="#counter-base"/>
+      <text style="fill: var(--text-fill); transform: translateY(var(--translateY))">6</text>
+    </g>
+    <g style="r: inherit;" id="number-7">
+      <use style="r: inherit;" href="#counter-base"/>
+      <text style="fill: var(--text-fill); transform: translateY(var(--translateY))">7</text>
+    </g>
 
     <g id="semi-auto">
       <line x1="-2" y1="1" x2="2" y2="1"/>
@@ -64,19 +86,22 @@
       <line x1="-2" y1="2" x2="2" y2="2"/>
     </g>
 
-    <g id="rifle" class="weapon-symbol">
+    <g id="rifle" style="r: inherit;" class="weapon-symbol">
+      <use style="r: inherit;" href="#counter-base"/>
       <use href="#semi-auto"/>
       <line x1="0" y1="-5" x2="0" y2="5"/>
-      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
+      <polyline style="fill: none;" points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
 
-    <g id="smg" class="weapon-symbol">
+    <g id="smg" style="r: inherit;" class="weapon-symbol">
+      <use style="r: inherit;" href="#counter-base"/>
       <use href="#auto"/>
       <line x1="0" y1="-5" x2="0" y2="4.5"/>
       <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
     </g>
 
-    <g id="blazer" class="weapon-symbol">
+    <g id="blazer" style="r: inherit;" class="weapon-symbol">
+      <use style="r: inherit;" href="#counter-base"/>
       <use href="#auto"/>
       <polyline points="0,-5 0,-3 -3,-2.5 3,-1.5 0,-1 0,2.5 -3,3, 3,4 0,4.5 0,5"/>
       <polyline points="-2,-3.5 0,-5 2,-3.5"/>
@@ -85,7 +110,6 @@
     <image id="counter-prone" href="counter_prone.jpg" width="10"/>
     <image id="counter-grenade" href="counter_grenade.jpg" width="10"/>
   </defs>
-
   <rect id="background"/>
 
   <g class="gameboard">
@@ -104,7 +128,11 @@
       <g data-y="1">
         <g data-x="0"><use href="#hex"/></g>
         <g data-x="1"><use href="#hex"/>
-          <g class="counter" data-allegiance="attacker" data-number="1"><use href="#counter-base"/><use class="troop-number" href="#t-2"/><use class="squad-number" href="#t-1"/><use class="primary-weapon" href="#rifle"/></g>
+          <g class="counter" data-allegiance="attacker" data-number="1">
+            <use class="primary-weapon" href="#rifle"/>
+            <use class="troop-number" href="#number-1"/>
+            <use class="squad-number" href="#number-1"/>
+          </g>
         </g>
         <g data-x="2"><use href="#hex"/></g>
       </g>