diff --git a/TormentaRPG-PDF_Based/fichaTormenta.css b/TormentaRPG-PDF_Based/fichaTormenta.css
index 65e326181e..0b5ce70e88 100644
--- a/TormentaRPG-PDF_Based/fichaTormenta.css
+++ b/TormentaRPG-PDF_Based/fichaTormenta.css
@@ -6,6 +6,7 @@
   margin: 0;
   outline: 0;
   list-style: none;
+  font-size: 0;
   line-height: 100%;
   box-sizing: border-box; }
 
@@ -70,7 +71,7 @@ body {
       background: #FFF;
       font-size: 14px;
       color: #222;
-      font-family: "Open Sans";
+      font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
       transition: .3s; }
       .sheet-tormenta_charsheet .sheet-cabecalho input[type=text]:focus, .sheet-tormenta_charsheet .sheet-cabecalho input[type=text]:focus:hover,
       .sheet-tormenta_charsheet .sheet-cabecalho input[type=number]:focus,
@@ -167,7 +168,7 @@ body {
         padding: 3px 3px 0;
         font-size: 14px;
         color: #222;
-        font-family: "Open Sans";
+        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
         text-align: center;
         transition: .3s; }
         .sheet-tormenta_charsheet .sheet-classes .sheet-classes_list .sheet-class_item .sheet-class_column input:focus {
@@ -230,7 +231,7 @@ body {
           padding: 0 3px;
           font-size: 14px;
           color: #222;
-          font-family: "Open Sans";
+          font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
           text-align: center;
           transition: .3s; }
           .sheet-tormenta_charsheet .sheet-middle .sheet-attributes .sheet-attributes_list .sheet-attribute_item .sheet-attribute_column input:not(:disabled):focus {
@@ -274,7 +275,7 @@ body {
           font-weight: 700;
           font-size: 20px;
           color: #A4A4A4;
-          font-family: "Open Sans";
+          font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
           line-height: 34px;
           text-align: center;
           border: 3px solid #A4A4A4;
@@ -302,7 +303,7 @@ body {
           padding: 0 3px;
           font-size: 14px;
           color: #222;
-          font-family: "Open Sans";
+          font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
           text-align: center;
           transition: .3s; }
           .sheet-tormenta_charsheet .sheet-middle .sheet-ac_res .sheet-armor_class .sheet-armor_class_column input:not(:disabled):focus, .sheet-tormenta_charsheet .sheet-middle .sheet-ac_res .sheet-armor_class .sheet-armor_class_column input:not(:disabled):focus:hover {
@@ -379,7 +380,7 @@ body {
                 padding: 0 3px;
                 font-size: 14px;
                 color: #222;
-                font-family: "Open Sans";
+                font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
                 text-align: center;
                 transition: .3s; }
                 .sheet-tormenta_charsheet .sheet-middle .sheet-ac_res .sheet-resistences_vitals .sheet-vitals .sheet-vitals_item .sheet-vitals_column input:not(:disabled):focus {
@@ -457,7 +458,7 @@ body {
                 padding: 0 3px;
                 font-size: 14px;
                 color: #222;
-                font-family: "Open Sans";
+                font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
                 text-align: center;
                 transition: .3s; }
                 .sheet-tormenta_charsheet .sheet-middle .sheet-ac_res .sheet-resistences_vitals .sheet-resistences .sheet-resistences_item .sheet-resistences_column input:not(:disabled):focus, .sheet-tormenta_charsheet .sheet-middle .sheet-ac_res .sheet-resistences_vitals .sheet-resistences .sheet-resistences_item .sheet-resistences_column input:not(:disabled):focus:hover {
@@ -526,7 +527,7 @@ body {
           background: #FFF;
           border: 3px solid #222;
           padding: 0 3px;
-          font-family: "Open Sans";
+          font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
           text-align: center;
           font-size: 14px;
           color: #222;
@@ -579,7 +580,7 @@ body {
           border: 0;
           border-bottom: 3px solid #222;
           padding: 3px 3px 0;
-          font-family: "Open Sans";
+          font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
           text-align: center;
           font-size: 14px;
           color: #222;
@@ -605,7 +606,7 @@ body {
           padding: 3px 7px 0;
           font-size: 14px;
           color: #222;
-          font-family: "Open Sans";
+          font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
           transition: .3s; }
           .sheet-tormenta_charsheet .sheet-middle .sheet-attacks_armors .sheet-resistences_imunities label input:focus, .sheet-tormenta_charsheet .sheet-middle .sheet-attacks_armors .sheet-resistences_imunities label textarea:focus {
             border-color: #c15353; }
@@ -652,7 +653,7 @@ body {
               text-align: center;
               font-size: 14px;
               color: #222;
-              font-family: "Open Sans";
+              font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
               transition: .3s; }
               .sheet-tormenta_charsheet .sheet-middle .sheet-attacks_armors .sheet-deslocamentos .sheet-deslocamentos_column label input:focus {
                 border-color: #c15353; }
@@ -672,7 +673,7 @@ body {
         line-height: 16px;
         font-size: 12px;
         color: #222;
-        font-family: "Open Sans"; }
+        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; }
         .sheet-tormenta_charsheet .sheet-middle .sheet-skills .sheet-skills_list .sheet-skills_note:first-of-type {
           padding-top: 20px; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-skills .sheet-skills_list .sheet-skills_column {
@@ -696,7 +697,7 @@ body {
             text-align: center;
             font-size: 14px;
             color: #A4A4A4;
-            font-family: "Open Sans"; }
+            font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; }
         .sheet-tormenta_charsheet .sheet-middle .sheet-skills .sheet-skills_list .sheet-skills_column > input,
         .sheet-tormenta_charsheet .sheet-middle .sheet-skills .sheet-skills_list .sheet-skills_column > select {
           display: block;
@@ -709,7 +710,7 @@ body {
           text-align: center;
           font-size: 14px;
           color: #222;
-          font-family: "Open Sans";
+          font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
           transition: .3s; }
           .sheet-tormenta_charsheet .sheet-middle .sheet-skills .sheet-skills_list .sheet-skills_column > input:not(:disabled):focus,
           .sheet-tormenta_charsheet .sheet-middle .sheet-skills .sheet-skills_list .sheet-skills_column > select:not(:disabled):focus {
@@ -755,7 +756,7 @@ body {
             line-height: 40px;
             font-size: 14px;
             color: #222;
-            font-family: "Open Sans"; }
+            font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; }
           .sheet-tormenta_charsheet .sheet-middle .sheet-skills .sheet-skills_list .sheet-skills_column .sheet-skills_item_name .sheet-skill_item_check {
             display: inline-block;
             vertical-align: top;
@@ -796,7 +797,7 @@ body {
             text-align: left;
             font-size: 12px;
             color: #222;
-            font-family: "Open Sans";
+            font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
             transition: .3s; }
             .sheet-tormenta_charsheet .sheet-middle .sheet-skills .sheet-skills_list .sheet-skills_column .sheet-skills_item_name input[type=text]:focus {
               border-color: #c15353; }
@@ -945,8 +946,11 @@ body {
         vertical-align: middle;
         width: 30px;
         height: 30px;
+        margin: 0;
+        padding: 0;
         background: #222;
         border: 0;
+        border-radius: 0;
         font-family: "dicefontd20";
         line-height: 30px;
         font-size: 24px;
@@ -966,7 +970,7 @@ body {
         text-align: left;
         font-size: 12px;
         color: #222;
-        font-family: "Open Sans";
+        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
         transition: border-color .3s; }
         .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item .sheet-weapons_item:focus {
           border-color: #c15353; }
@@ -1009,7 +1013,7 @@ body {
       padding: 7px;
       font-size: 14px;
       color: #222;
-      font-family: "Open Sans";
+      font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
       line-height: 160%;
       transition: .3s; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-racials_classabs .sheet-racial_classabs_textarea:focus {
@@ -1040,7 +1044,7 @@ body {
         padding: 7px;
         font-size: 14px;
         color: #222;
-        font-family: "Open Sans";
+        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
         line-height: 160%;
         transition: .3s; }
         .sheet-tormenta_charsheet .sheet-middle .sheet-inventario_talentos_magias .sheet-inventario_talentos_magias-col .sheet-inventario_talentos_magias_textarea.sheet-languages_textarea {
@@ -1063,7 +1067,7 @@ body {
         font-size: 16px;
         color: #222;
         text-align: center;
-        font-family: "Open Sans"; }
+        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-inventario_talentos_magias .sheet-money .sheet-money_item .sheet-money_item_text {
         display: inline-block;
         vertical-align: middle;
@@ -1078,7 +1082,7 @@ body {
         text-align: left;
         font-size: 16px;
         color: #222;
-        font-family: "Open Sans";
+        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
         transition: border-color .3s; }
         .sheet-tormenta_charsheet .sheet-middle .sheet-inventario_talentos_magias .sheet-money .sheet-money_item .sheet-money_item_text:focus {
           border-color: #c15353; }
diff --git a/TormentaRPG-PDF_Based/fichaTormentaHtml.html b/TormentaRPG-PDF_Based/fichaTormentaHtml.html
index 158e00f6d2..eb6e1ba458 100644
--- a/TormentaRPG-PDF_Based/fichaTormentaHtml.html
+++ b/TormentaRPG-PDF_Based/fichaTormentaHtml.html
@@ -1108,7 +1108,7 @@
                     <li class="sheet-skills_item">
                         <div class="sheet-skills_column">
                             <div class="sheet-skills_item_name">
-                                <button name="attr_acrobacia-roll" class="sheet-skills_item_roll" type="button">t</button>
+                                <button name="attr_acrobacia-roll" class="sheet-skills_item_roll" type="button"></button>
 
                                 <label class="sheet-skill_item_check">
                                     <input type="checkbox" name="attr_acrobacia_check" title="acrobacia_check">
@@ -2495,64 +2495,66 @@
                         </div>
                     </li>
                    
-                    <li class="repeating_weapon sheet-weapons_item">
-                        <div class="sheet-weapons_item_col">
-                            <button name="attr_weapon-roll" class="sheet-weapons_roll" type="roll" value="@{macro-texto}">t</button>
-                            
-                            <input type="text" name="attr_weapon_name" title="repeating_weapon_X_name" placeholder="Nome da arma" class="sheet-weapons_item">
-                        </div>
-                        
-                        <div class="sheet-weapons_item_col">
-                            <input type="number" name="attr_weapon_bonus_ataque" title="repeating_weapon_X_bonus_ataque" class="sheet-weapons_item" value="0">
-                        </div>
-                        
-                        <div class="sheet-weapons_item_col">
-                            <select name="attr_weapon_arma_mod" name="attr_repeating_weapon_X_arma_mod" class="sheet-weapons_item">
-                                <option value="0" selected>Corpo a Corpo</option>
-                                <option value="0">A Distância</option>
-                            </select>
-                        </div>
-                        
-                        <div class="sheet-weapons_item_col">
-                            <input type="text" name="attr_weapon_bonus_dano" title="repeating_weapon_X_bonus_dano" class="sheet-weapons_item" value="1d6" placeholder="Dano">
-                        </div>
-                        
-                        <div class="sheet-weapons_item_col">
-                            <select name="attr_weapon_arma_dano_mod" name="attr_repeating_weapon_X_arma_dano_mod" class="sheet-weapons_item">
-                                <option value="0" selected>--</option>
-                                <option value="0">For +1</option>
-                                <option value="0">Des +1</option>
-                                <option value="0">Con +1</option>
-                                <option value="0">Int +1</option>
-                                <option value="0">Sab +1</option>
-                                <option value="0">Car +1</option>
-                            </select>
-                        </div>
-                        
-                        <div class="sheet-weapons_item_col">
-                            <input type="text" name="attr_weapon_crit" title="repeating_weapon_X_crit" class="sheet-weapons_item" value="20 x2" placeholder="Crítico">
-                        </div>
-                        
-                        <div class="sheet-weapons_item_col">
-                            <input type="text" name="attr_weapon_distance" title="repeating_weapon_X_distance" class="sheet-weapons_item" placeholder="Alcance">
-                        </div>
-                        
-                        <div class="sheet-weapons_item_col">
-                            <input type="text" name="attr_weapon_type" title="repeating_weapon_X_type" class="sheet-weapons_item" placeholder="Tipo de Dano">
-                        </div>
-                        
-                        <div class="sheet-weapons_item_col">
-                            <input type="number" name="attr_weapon_municao" title="repeating_weapon_X_municao" class="sheet-weapons_item" value="0">
-                        </div>
-                        
-                        <div class="sheet-weapon_macro">
-                            <div class="sheet-weapon_macro_title">Mostrar macro</div>
-                            
-                            <input type="checkbox">
-                            <div class="sheet-weapon_macro_input"></div>
-                           
-                            <textarea name="attr_weapon_macro" title="repeating_weapon_X_macro" class="sheet-weapons_item sheet-weapons_item_textarea">/em está atacando com @{weapon_name}&#x00A;&#x00A;Resultado do Ataque: [[1d20 + @{weapon_arma_mod} + @{weapon_bonus_ataque}]]&#x00A;Resultado do Dano: [[@{weapon_bonus_dano} + @{weapon_arma_dano_mod}]]&#x00A;Crítico: @{weapon_crit}&#x00A;Tipo de Dano: @{weapon_type}&#x00A;</textarea>
-                        </div>
+                    <li class="sheet-weapons_item">
+                        <fieldset class="repeating_weapon">
+                            <div class="sheet-weapons_item_col">
+                                <button name="attr_weapon-roll" class="sheet-weapons_roll" type="roll" value="@{macro-texto}"></button>
+
+                                <input type="text" name="attr_weapon_name" title="repeating_weapon_X_name" placeholder="Nome da arma" class="sheet-weapons_item">
+                            </div>
+
+                            <div class="sheet-weapons_item_col">
+                                <input type="number" name="attr_weapon_bonus_ataque" title="repeating_weapon_X_bonus_ataque" class="sheet-weapons_item" value="0">
+                            </div>
+
+                            <div class="sheet-weapons_item_col">
+                                <select name="attr_weapon_arma_mod" name="attr_repeating_weapon_X_arma_mod" class="sheet-weapons_item">
+                                    <option value="0" selected>Corpo a Corpo</option>
+                                    <option value="0">A Distância</option>
+                                </select>
+                            </div>
+
+                            <div class="sheet-weapons_item_col">
+                                <input type="text" name="attr_weapon_bonus_dano" title="repeating_weapon_X_bonus_dano" class="sheet-weapons_item" value="1d6" placeholder="Dano">
+                            </div>
+
+                            <div class="sheet-weapons_item_col">
+                                <select name="attr_weapon_arma_dano_mod" name="attr_repeating_weapon_X_arma_dano_mod" class="sheet-weapons_item">
+                                    <option value="0" selected>--</option>
+                                    <option value="0">For +1</option>
+                                    <option value="0">Des +1</option>
+                                    <option value="0">Con +1</option>
+                                    <option value="0">Int +1</option>
+                                    <option value="0">Sab +1</option>
+                                    <option value="0">Car +1</option>
+                                </select>
+                            </div>
+
+                            <div class="sheet-weapons_item_col">
+                                <input type="text" name="attr_weapon_crit" title="repeating_weapon_X_crit" class="sheet-weapons_item" value="20 x2" placeholder="Crítico">
+                            </div>
+
+                            <div class="sheet-weapons_item_col">
+                                <input type="text" name="attr_weapon_distance" title="repeating_weapon_X_distance" class="sheet-weapons_item" placeholder="Alcance">
+                            </div>
+
+                            <div class="sheet-weapons_item_col">
+                                <input type="text" name="attr_weapon_type" title="repeating_weapon_X_type" class="sheet-weapons_item" placeholder="Tipo de Dano">
+                            </div>
+
+                            <div class="sheet-weapons_item_col">
+                                <input type="number" name="attr_weapon_municao" title="repeating_weapon_X_municao" class="sheet-weapons_item" value="0">
+                            </div>
+
+                            <div class="sheet-weapon_macro">
+                                <div class="sheet-weapon_macro_title">Mostrar macro</div>
+
+                                <input type="checkbox">
+                                <div class="sheet-weapon_macro_input"></div>
+
+                                <textarea name="attr_weapon_macro" title="repeating_weapon_X_macro" class="sheet-weapons_item sheet-weapons_item_textarea">/em está atacando com @{weapon_name}&#x00A;&#x00A;Resultado do Ataque: [[1d20 + @{weapon_arma_mod} + @{weapon_bonus_ataque}]]&#x00A;Resultado do Dano: [[@{weapon_bonus_dano} + @{weapon_arma_dano_mod}]]&#x00A;Crítico: @{weapon_crit}&#x00A;Tipo de Dano: @{weapon_type}</textarea>
+                            </div>
+                        </fieldset>
                     </li>
                 </ul>
             </div>