diff --git a/src/module/ds4.ts b/src/module/ds4.ts
index 1351b96c..131e6675 100644
--- a/src/module/ds4.ts
+++ b/src/module/ds4.ts
@@ -64,6 +64,8 @@ async function registerHandlebarsPartials() {
         "systems/ds4/templates/actor/partials/profile.hbs",
         "systems/ds4/templates/actor/partials/character-progression.hbs",
         "systems/ds4/templates/actor/partials/special-creature-abilites-overview.hbs",
+        "systems/ds4/templates/actor/partials/character-inventory.hbs",
+        "systems/ds4/templates/actor/partials/creature-inventory.hbs",
     ];
     return loadTemplates(templatePaths);
 }
diff --git a/src/templates/actor/character-sheet.hbs b/src/templates/actor/character-sheet.hbs
index 5c0b4358..b1008c7a 100644
--- a/src/templates/actor/character-sheet.hbs
+++ b/src/templates/actor/character-sheet.hbs
@@ -71,7 +71,7 @@
     {{!-- Sheet Body --}}
     <section class="sheet-body">
         {{!-- Items Tab --}}
-        {{> systems/ds4/templates/actor/partials/items-overview.hbs}}
+        {{> systems/ds4/templates/actor/partials/character-inventory.hbs}}
 
         {{!-- Spells Tab --}}
         {{> systems/ds4/templates/actor/partials/spells-overview.hbs}}
diff --git a/src/templates/actor/creature-sheet.hbs b/src/templates/actor/creature-sheet.hbs
index 2ebf5977..7571eaba 100644
--- a/src/templates/actor/creature-sheet.hbs
+++ b/src/templates/actor/creature-sheet.hbs
@@ -61,7 +61,7 @@
     {{!-- Sheet Body --}}
     <section class="sheet-body">
         {{!-- Items Tab --}}
-        {{> systems/ds4/templates/actor/partials/items-overview.hbs}}
+        {{> systems/ds4/templates/actor/partials/creature-inventory.hbs}}
 
         {{!-- Special Creature Abilities Tab --}}
         {{> systems/ds4/templates/actor/partials/special-creature-abilites-overview.hbs}}
diff --git a/src/templates/actor/partials/character-inventory.hbs b/src/templates/actor/partials/character-inventory.hbs
new file mode 100644
index 00000000..19a4009d
--- /dev/null
+++ b/src/templates/actor/partials/character-inventory.hbs
@@ -0,0 +1,21 @@
+<div class="tab inventory" data-group="primary" data-tab="inventory">
+
+    {{!-- Money--}}
+    <h4 class="items-list-title">{{localize 'DS4.CharacterCurrency'}}</h4>
+    <ol class="items-list">
+        <li class="item flexrow item-header">
+            <label for="data.currency.gold" class="flex05">{{config.characterCurrency.gold}}</label>
+            <input class="flex3 item-num-val item-change" type="number" min="0" step="1" name="data.currency.gold"
+                id="data.currency.gold" value="{{data.currency.gold}}" data-dtype="Number" />
+            <label for="data.currency.silver" class="flex05">{{config.characterCurrency.silver}}</label>
+            <input class="flex3 item-num-val item-change" type="number" min="0" step="1" name="data.currency.silver"
+                id="data.currency.silver" value="{{data.currency.silver}}" data-dtype="Number" />
+            <label for="data.currency.copper" class="flex05">{{config.characterCurrency.copper}}</label>
+            <input class="flex3 item-num-val item-change" type="number" min="0" step="1" name="data.currency.copper"
+                id="data.currency.copper" value="{{data.currency.copper}}" data-dtype="Number" />
+        </li>
+    </ol>
+
+    {{> systems/ds4/templates/actor/partials/items-overview.hbs}}
+
+</div>
\ No newline at end of file
diff --git a/src/templates/actor/partials/creature-inventory.hbs b/src/templates/actor/partials/creature-inventory.hbs
new file mode 100644
index 00000000..b9b8acd6
--- /dev/null
+++ b/src/templates/actor/partials/creature-inventory.hbs
@@ -0,0 +1,5 @@
+<div class="tab inventory" data-group="primary" data-tab="inventory">
+
+    {{> systems/ds4/templates/actor/partials/items-overview.hbs}}
+
+</div>
\ No newline at end of file
diff --git a/src/templates/actor/partials/items-overview.hbs b/src/templates/actor/partials/items-overview.hbs
index a941e6bb..55b34411 100644
--- a/src/templates/actor/partials/items-overview.hbs
+++ b/src/templates/actor/partials/items-overview.hbs
@@ -93,126 +93,106 @@
 
 {{!-- ======================================================================== --}}
 
+{{!-- WEAPONS --}}
+<h4 class="items-list-title">{{localize 'DS4.ItemTypeWeaponPlural'}}</h4>
+{{!-- {{#if (and (ne itemsByType.weapon undefined) (gt itemsByType.weapon.length 0)) }} --}}
+{{#> ifHasItemOfType itemsArray=itemsByType.weapon dataType='weapon' }}
+<ol class="items-list">
+    {{#> itemListHeader dataType='weapon'}}
+    <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="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 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="flex05 item-num-val">{{ item.data.data.weaponBonus}}</div>
+    <div class="flex05 item-num-val">{{ item.data.data.opponentDefense}}</div>
+    {{/itemListEntry}}
+    {{/each}}
+</ol>
+{{!-- {{else}}
+{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='weapon' }} --}}
+{{/ifHasItemOfType}}
 
-<div class="tab inventory" data-group="primary" data-tab="inventory">
-
-    {{!-- Money--}}
-    <h4 class="items-list-title">{{localize 'DS4.CharacterCurrency'}}</h4>
-    <ol class="items-list">
-        <li class="item flexrow item-header">
-            <label for="data.currency.gold" class="flex05">{{config.characterCurrency.gold}}</label>
-            <input class="flex3 item-num-val item-change" type="number" min="0" step="1" name="data.currency.gold"
-                id="data.currency.gold" value="{{data.currency.gold}}" data-dtype="Number" />
-            <label for="data.currency.silver" class="flex05">{{config.characterCurrency.silver}}</label>
-            <input class="flex3 item-num-val item-change" type="number" min="0" step="1" name="data.currency.silver"
-                id="data.currency.silver" value="{{data.currency.silver}}" data-dtype="Number" />
-            <label for="data.currency.copper" class="flex05">{{config.characterCurrency.copper}}</label>
-            <input class="flex3 item-num-val item-change" type="number" min="0" step="1" name="data.currency.copper"
-                id="data.currency.copper" value="{{data.currency.copper}}" data-dtype="Number" />
-        </li>
-    </ol>
-
-    {{!-- WEAPONS --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeWeaponPlural'}}</h4>
-    {{!-- {{#if (and (ne itemsByType.weapon undefined) (gt itemsByType.weapon.length 0)) }} --}}
-    {{#> ifHasItemOfType itemsArray=itemsByType.weapon dataType='weapon' }}
-    <ol class="items-list">
-        {{#> itemListHeader dataType='weapon'}}
-        <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="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 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="flex05 item-num-val">{{ item.data.data.weaponBonus}}</div>
-        <div class="flex05 item-num-val">{{ item.data.data.opponentDefense}}</div>
-        {{/itemListEntry}}
-        {{/each}}
-    </ol>
-    {{!-- {{else}}
-    {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='weapon' }} --}}
-    {{/ifHasItemOfType}}
-
-    {{!-- ARMOR --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeArmorPlural'}}</h4>
-    {{#> ifHasItemOfType itemsArray=itemsByType.armor dataType='armor' }}
-    <ol class="items-list">
-        {{#> itemListHeader dataType='armor'}}
-        <div title="{{localize 'DS4.ArmorMaterialType'}}">{{localize 'DS4.ArmorMaterialTypeAbbr'}}</div>
-        <div title="{{localize 'DS4.ArmorType'}}">{{localize 'DS4.ArmorTypeAbbr'}}</div>
-        <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">
-            {{localize 'DS4.ArmorValueAbbr'}}
-        </div>
-        {{/itemListHeader}}
-        {{#each itemsByType.armor as |item id|}}
-        {{#> itemListEntry item=item }}
-        <div title="{{lookup ../../config.armorMaterialTypes  item.data.data.armorMaterialType}}">
-            {{lookup ../../config.armorMaterialTypesAbbr item.data.data.armorMaterialType}}
-        </div>
-        <div title="{{lookup ../../config.armorTypes  item.data.data.armorType}}">
-            {{lookup ../../config.armorTypesAbbr item.data.data.armorType}}
-        </div>
-        <div class="flex05 item-num-val">{{ item.data.data.armorValue}}</div>
-        {{/itemListEntry}}
-        {{/each}}
-    </ol>
-    {{/ifHasItemOfType}}
+{{!-- ARMOR --}}
+<h4 class="items-list-title">{{localize 'DS4.ItemTypeArmorPlural'}}</h4>
+{{#> ifHasItemOfType itemsArray=itemsByType.armor dataType='armor' }}
+<ol class="items-list">
+    {{#> itemListHeader dataType='armor'}}
+    <div title="{{localize 'DS4.ArmorMaterialType'}}">{{localize 'DS4.ArmorMaterialTypeAbbr'}}</div>
+    <div title="{{localize 'DS4.ArmorType'}}">{{localize 'DS4.ArmorTypeAbbr'}}</div>
+    <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">
+        {{localize 'DS4.ArmorValueAbbr'}}
+    </div>
+    {{/itemListHeader}}
+    {{#each itemsByType.armor as |item id|}}
+    {{#> itemListEntry item=item }}
+    <div title="{{lookup ../../config.armorMaterialTypes  item.data.data.armorMaterialType}}">
+        {{lookup ../../config.armorMaterialTypesAbbr item.data.data.armorMaterialType}}
+    </div>
+    <div title="{{lookup ../../config.armorTypes  item.data.data.armorType}}">
+        {{lookup ../../config.armorTypesAbbr item.data.data.armorType}}
+    </div>
+    <div class="flex05 item-num-val">{{ item.data.data.armorValue}}</div>
+    {{/itemListEntry}}
+    {{/each}}
+</ol>
+{{/ifHasItemOfType}}
 
 
-    {{!-- SHIELD --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeShieldPlural'}}</h4> {{!-- SPECIFIC --}}
-    {{#> ifHasItemOfType itemsArray=itemsByType.shield dataType='shield' }}
-    <ol class="items-list">
-        {{#> itemListHeader dataType='shield' }}
-        <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">
-            {{localize 'DS4.ArmorValueAbbr'}}
-        </div>
-        {{/itemListHeader}}
-        {{#each itemsByType.shield as |item id|}}
-        {{#> itemListEntry item=item }}
-        <div class="flex05 item-num-val">{{item.data.data.armorValue}}</div> {{!-- SPECIFIC --}}
-        {{/itemListEntry}}
-        {{/each}}
-    </ol>
-    {{/ifHasItemOfType}}
+{{!-- SHIELD --}}
+<h4 class="items-list-title">{{localize 'DS4.ItemTypeShieldPlural'}}</h4> {{!-- SPECIFIC --}}
+{{#> ifHasItemOfType itemsArray=itemsByType.shield dataType='shield' }}
+<ol class="items-list">
+    {{#> itemListHeader dataType='shield' }}
+    <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">
+        {{localize 'DS4.ArmorValueAbbr'}}
+    </div>
+    {{/itemListHeader}}
+    {{#each itemsByType.shield as |item id|}}
+    {{#> itemListEntry item=item }}
+    <div class="flex05 item-num-val">{{item.data.data.armorValue}}</div> {{!-- SPECIFIC --}}
+    {{/itemListEntry}}
+    {{/each}}
+</ol>
+{{/ifHasItemOfType}}
 
-    {{!-- TRINKET --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeTrinketPlural'}}</h4>
-    {{#> ifHasItemOfType itemsArray=itemsByType.trinket dataType='trinket' }}
-    <ol class="items-list">
-        {{#> itemListHeader dataType='trinket'}}
-        <div class="flex2">{{localize 'DS4.StorageLocation'}}</div>
-        {{/itemListHeader}}
-        {{#each itemsByType.trinket as |item id|}}
-        {{#> itemListEntry item=item }}
-        <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}}
-    </ol>
-    {{/ifHasItemOfType}}
+{{!-- TRINKET --}}
+<h4 class="items-list-title">{{localize 'DS4.ItemTypeTrinketPlural'}}</h4>
+{{#> ifHasItemOfType itemsArray=itemsByType.trinket dataType='trinket' }}
+<ol class="items-list">
+    {{#> itemListHeader dataType='trinket'}}
+    <div class="flex2">{{localize 'DS4.StorageLocation'}}</div>
+    {{/itemListHeader}}
+    {{#each itemsByType.trinket as |item id|}}
+    {{#> itemListEntry item=item }}
+    <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}}
+</ol>
+{{/ifHasItemOfType}}
 
-    {{!-- EQUIPMENT --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeEquipmentPlural'}}</h4>
-    {{#> ifHasItemOfType itemsArray=itemsByType.equipment dataType='equipment' }}
-    <ol class="items-list">
-        {{#> itemListHeader dataType='equipment'}}
-        <div class="flex2">{{localize 'DS4.StorageLocation'}}</div>
-        {{/itemListHeader}}
-        {{#each itemsByType.equipment as |item id|}}
-        {{#> itemListEntry item=item }}
-        <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}}
-    </ol>
-    {{/ifHasItemOfType}}
-</div>
\ No newline at end of file
+{{!-- EQUIPMENT --}}
+<h4 class="items-list-title">{{localize 'DS4.ItemTypeEquipmentPlural'}}</h4>
+{{#> ifHasItemOfType itemsArray=itemsByType.equipment dataType='equipment' }}
+<ol class="items-list">
+    {{#> itemListHeader dataType='equipment'}}
+    <div class="flex2">{{localize 'DS4.StorageLocation'}}</div>
+    {{/itemListHeader}}
+    {{#each itemsByType.equipment as |item id|}}
+    {{#> itemListEntry item=item }}
+    <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}}
+</ol>
+{{/ifHasItemOfType}}
\ No newline at end of file