diff --git a/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.css b/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.css
index bdfe192b89..6d1cebe4fd 100644
--- a/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.css
+++ b/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.css
@@ -60,6 +60,11 @@ button[type=roll].sheet-skill-roll::before {
     content: none;
 }
 
+button[type=roll].sheet-d6 {
+    font-family: dicefontd6;
+    font-size: large;
+}
+
 .sheet-skills.sheet-content {
     border-color: #000000;
     border-radius: 0;
@@ -92,6 +97,10 @@ button[type=roll].sheet-skill-roll::before {
     width: 26px;
 }
 
+.sheet-skill-roll {
+    width: 20px;
+}
+
 select.sheet-skills::-ms-expand {
     display: none;
 }
diff --git a/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.html b/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.html
index f6b9995395..bf7d7b74fd 100644
--- a/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.html
+++ b/BattleTech-A-Time-of-War/BattleTech-A-Time-of-War.html
@@ -460,6 +460,7 @@
         <span class="skills skills-modifier">Mod</span>
         <span class="skills skills-tnc">TN/C</span>
         <span class="skills skills-xp">XP</span>
+        <span class="skills skill-roll"></span>
     </div>
     <fieldset class="repeating_skills">
         <div class="skills-container">
@@ -562,7 +563,6 @@
                 <option value="zero_g_operations">Zero-G Operations</option>
             </select>
             <input type="text" name="attr_sub_skill" class="skills skill content" title="@{repeating_skills_$id_sub_skill}">
-            <button type="roll" name="roll_skill_check" value="@{skill_roll_value}" class="skill-roll" title="@{repeating_skills_$id_skill_check}">
                 <span name="attr_skill_level" class="skills content skills-labels skills-skill-level" title="@{repeating_skills_$id_skill_level}"></span>
                 <input type="hidden" name="attr_skill_level">
                 <span name="attr_skill_linked_attributes" class="skills content skills-labels skills-linked-attributes" title="@{repeating_skills_$id_skill_linked_attributes}"></span>
@@ -572,10 +572,12 @@
                 <span name="attr_skill_tnc" class="skills content skills-labels skills-tnc" title="@{repeating_skills_$id_skill_tnc}"></span>
                 <input type="hidden" name="attr_skill_tnc">
                 <input type="hidden" name="attr_target_number">
-            </button>
             <input type="number" name="attr_skill_xp" class="skills content skills-labels skills-xp" title="@{repeating_skills_$id_skill_xp}">
             <input type="hidden" name="attr_skill_roll_value" value="Acrobatics/Free-Fall Skill Check
                                         Margin of Success: [[2d6 + @{skill_modifier}[MOD] - @{target_number}[TN]]]">
+            <span class="skills skills-labels">
+                <button type="roll" name="roll_skill_check" value="@{skill_roll_value}" class="skill-roll skills-labels d6" title="@{repeating_skills_$id_skill_check}">l</button>
+            </span>
         </div>
     </fieldset>
 </div>