diff --git a/src/templates/actor/partials/items-overview.hbs b/src/templates/actor/partials/items-overview.hbs
index 4faefc94..dac99439 100644
--- a/src/templates/actor/partials/items-overview.hbs
+++ b/src/templates/actor/partials/items-overview.hbs
@@ -12,7 +12,7 @@
 --}}
 {{#*inline "addItemButton"}}
     <div class="item-controls">
-        <a class="item-control item-create" title="Create item" data-type="{{dataType}}" {{!-- SPECIFIC --}}>
+        <a class="item-control item-create" title="Create item" data-type="{{dataType}}">
             <i class="fas fa-plus"></i>
             {{localize 'DS4.UserInteractionAddItem'}}</a>
     </div>
@@ -44,14 +44,14 @@
     <li class="item flexrow item-header">
         {{!-- equipped --}}
         {{#if (ne dataType 'equipment')}}
-            <div title="{{localize 'DS4.ItemEquipped'}}" class="flex05">E</div>
+            <div class="flex05" title="{{localize 'DS4.ItemEquipped'}}">E</div>
         {{/if}}
         {{!-- image --}}
-        <div class="item-image" class="flex05"></div>
+        <div class="flex05 item-image"></div>
         {{!-- amount --}}
-        <div class="item-num-val" title="{{localize 'DS4.Quantity'}}" class="flex05">#</div>
+        <div class="flex05 item-num-val" title="{{localize 'DS4.Quantity'}}">#</div>
         {{!-- name --}}
-        <div class="item-name flex3">{{localize 'DS4.ItemName'}}</div>
+        <div class="flex3 item-name">{{localize 'DS4.ItemName'}}</div>
         {{!-- item type specifics --}}
         {{> @partial-block }}
         {{!-- description --}}
@@ -108,22 +108,22 @@
     <h4 class="items-list-title">{{localize 'DS4.ItemTypeWeapon'}}</h4>
     <ol class="items-list">
         {{#> itemListHeader dataType='weapon'}}
-            <div title="{{localize 'DS4.AttackType'}}" class="flex05">{{localize 'DS4.AttackTypeAbbr'}}</div>
-            <div class="item-num-val flex05" title="{{localize 'DS4.WeaponBonus'}}">
+            <div class="flex05 item-image" title="{{localize 'DS4.AttackType'}}">{{localize 'DS4.AttackTypeAbbr'}}</div>
+            <div class="flex05 item-num-val" title="{{localize 'DS4.WeaponBonus'}}">
                 {{localize 'DS4.WeaponBonusAbbr'}}
             </div>
-            <div class="item-num-val flex05" title="{{localize 'DS4.OpponentDefense'}}">
+            <div class="flex05 item-num-val" title="{{localize 'DS4.OpponentDefense'}}">
                 {{localize 'DS4.OpponentDefenseAbbr'}}
             </div>
         {{/itemListHeader}}
         {{#each itemsByType.weapon as |item id|}}
             {{#> itemListEntry item=item}}
-                <div class="flex05">
+                <div class="flex05 item-image">
                     <img src="{{lookup ../../config.attackTypesIcons  item.data.data.attackType}}"
                         title="{{lookup ../../config.attackTypes  item.data.data.attackType}}" width="24" height="24" />
                 </div>
-                <div class="item-num-val flex05">{{ item.data.data.weaponBonus}}</div>
-                <div class="item-num-val flex05">{{ item.data.data.opponentDefense}}</div>
+                <div class="flex05 item-num-val">{{ item.data.data.weaponBonus}}</div>
+                <div class="flex05 item-num-val">{{ item.data.data.opponentDefense}}</div>
             {{/itemListEntry}}
         {{/each}}
     </ol>
@@ -175,7 +175,7 @@
         {{/itemListHeader}}
         {{#each itemsByType.trinket as |item id|}}
             {{#> itemListEntry item=item }}
-                <input type="text" class="flex2 item-change" value="{{item.data.data.storageLocation}}" data-dtype="String"
+                <input class="flex2 item-change" type="text" value="{{item.data.data.storageLocation}}" data-dtype="String"
                     data-property="data.storageLocation" title="{{localize 'DS4.StorageLocation'}}">
             {{/itemListEntry}}
         {{/each}}
@@ -189,7 +189,7 @@
         {{/itemListHeader}}
         {{#each itemsByType.equipment as |item id|}}
             {{#> itemListEntry item=item }}
-                <input type="text" class="flex2 item-change" value="{{item.data.data.storageLocation}}" data-dtype="String"
+                <input class="flex2 item-change" type="text" value="{{item.data.data.storageLocation}}" data-dtype="String"
                     data-property="data.storageLocation" title="{{localize 'DS4.StorageLocation'}}">
             {{/itemListEntry}}
         {{/each}}