diff --git a/system.json b/system.json
index a7c79226..22153104 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "compatibility": {
         "minimum": "13",
         "verified": "13.350",
diff --git a/templates/sheets/actors/party/inventory.hbs b/templates/sheets/actors/party/inventory.hbs
index 65e042de..95845197 100644
--- a/templates/sheets/actors/party/inventory.hbs
+++ b/templates/sheets/actors/party/inventory.hbs
@@ -49,7 +49,6 @@
         canCreate=true
         hideResources=true
         hideContextMenu=true
-        isActor=true
         }}
         {{> 'daggerheart.inventory-items'
         title='TYPES.Item.armor'
@@ -60,7 +59,6 @@
         canCreate=true
         hideResources=true
         hideContextMenu=true
-        isActor=true
         }}
         {{> 'daggerheart.inventory-items'
         title='TYPES.Item.consumable'
@@ -70,7 +68,6 @@
         isGlassy=true
         canCreate=true
         hideContextMenu=true
-        isActor=true
         }}
         {{> 'daggerheart.inventory-items'
         title='TYPES.Item.loot'
@@ -80,7 +77,6 @@
         isGlassy=true
         canCreate=true
         hideContextMenu=true
-        isActor=true
         }}
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/party/party-members.hbs b/templates/sheets/actors/party/party-members.hbs
index a34959fd..b5903cfc 100644
--- a/templates/sheets/actors/party/party-members.hbs
+++ b/templates/sheets/actors/party/party-members.hbs
@@ -28,6 +28,7 @@
                 item=actor
                 type='character'
                 isActor=true
+                hideContextMenu=true
                 }}
             {{/each}}
         </ul>
diff --git a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
index e97bfd80..d2534a5a 100644
--- a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
+++ b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
@@ -10,6 +10,7 @@ Parameters:
 - isGlassy {boolean} : If true, applies the 'glassy' class to the fieldset.
 - cardView {boolean} : If true and type is 'domainCard', renders using domain card layout.
 - isActor {boolean} : Passed through to inventory-item partials.
+- isItem {boolean} : Passed through to inventory-item partials
 - actorType {boolean} : The actor type of the parent actor
 - canCreate {boolean} : If true, show createDoc anchor on legend
 - inVault {boolean} : If true, the domainCard is created with inVault=true
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 561e66c0..5c5ca845 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -4,6 +4,7 @@
 Parameters:
 - type {string} : The type of items in the list
 - isActor {boolean} : Passed through to inventory-item partials.
+- isItem {boolean} : Passed through to inventory-item partials
 - actorType {boolean} : The actor type of the parent actor
 - categoryAdversary {string} : Category adversary id.
 - noExtensible {boolean} : If true, the inventory-item-content would be collapsable/extendible else it always be showed
@@ -18,7 +19,7 @@ Parameters:
 
 <li class="inventory-item" data-item-id="{{item.id}}" {{#if (or (eq type 'action' ) (eq type 'attack' ))}}
   data-action-id="{{item.id}}" {{/if}} data-item-uuid="{{item.uuid}}" data-type="{{type}}" data-no-compendium-edit="{{noCompendiumEdit}}" draggable="true">
-  <div class="inventory-item-header {{#if (eq actorType 'party')}}padded{{/if}}" {{#unless noExtensible}}data-action="toggleExtended" {{/unless}}>
+  <div class="inventory-item-header {{#if hideContextMenu}}padded{{/if}}" {{#unless noExtensible}}data-action="toggleExtended" {{/unless}}>
     {{!-- Image --}}
     <div class="img-portait" data-action='{{ifThen (or (hasProperty item "use") (eq type "attack")) "useItem" (ifThen
       (hasProperty item "toChat" ) "toChat" "editDoc" ) }}' {{#unless hideTooltip}} {{#if (eq type 'attack' )}}
@@ -67,7 +68,7 @@ Parameters:
     {{!-- Controls --}}
     {{#unless hideControls}}
     <div class="controls">
-      {{#if isActor}}
+    {{#if isActor}}
       <a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.openActorWorld">
         <i class="fa-solid fa-globe"></i>
       </a>
@@ -81,7 +82,7 @@ Parameters:
         <i class='fas fa-trash'></i>
       </a>
       {{/if}}
-      {{else}}
+    {{else}}
       {{#unless (eq actorType 'party')}}
         {{#if (eq type 'weapon')}}
         <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
@@ -94,27 +95,30 @@ Parameters:
           <i class="fa-solid fa-shield"></i>
         </a>
         {{/if}}
+        {{#if (eq type 'domainCard')}}
+        <a data-action="toggleVault"
+          data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.inVault 'sendToLoadout' 'sendToVault' }}">
+          <i class="fa-solid {{ifThen item.system.inVault 'fa-arrow-up' 'fa-arrow-down'}}"></i>
+        </a>
+        {{else if (eq type 'effect')}}
+        <a data-action="toggleEffect"
+          data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.disabled 'enableEffect' 'disableEffect' }}">
+          <i class="{{ifThen item.disabled 'fa-solid fa-toggle-off' 'fa-solid fa-toggle-on'}}"></i>
+        </a>
+        {{/if}}
+        {{#if (hasProperty item "toChat")}}
+          <a data-action="toChat" data-tooltip="DAGGERHEART.UI.Tooltip.sendToChat">
+            <i class="fa-regular fa-message"></i>
+          </a>
+        {{/if}}
       {{else}}
+        <a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.openActorWorld">
+          <i class="fa-solid fa-globe"></i>
+        </a>
         <a data-action="deleteItem" data-tooltip="DAGGERHEART.UI.Tooltip.deleteItem">
           <i class="fa-solid fa-trash"></i>
         </a>
       {{/unless}}
-      {{#if (eq type 'domainCard')}}
-      <a data-action="toggleVault"
-        data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.inVault 'sendToLoadout' 'sendToVault' }}">
-        <i class="fa-solid {{ifThen item.system.inVault 'fa-arrow-up' 'fa-arrow-down'}}"></i>
-      </a>
-      {{else if (eq type 'effect')}}
-      <a data-action="toggleEffect"
-        data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.disabled 'enableEffect' 'disableEffect' }}">
-        <i class="{{ifThen item.disabled 'fa-solid fa-toggle-off' 'fa-solid fa-toggle-on'}}"></i>
-      </a>
-      {{/if}}
-      {{#if (and (hasProperty item "toChat") (not (eq actorType 'party')))}}
-      <a data-action="toChat" data-tooltip="DAGGERHEART.UI.Tooltip.sendToChat">
-        <i class="fa-regular fa-message"></i>
-      </a>
-      {{/if}}
       {{#unless hideContextMenu}}
       <a data-action="triggerContextMenu" data-tooltip="DAGGERHEART.UI.Tooltip.moreOptions">
         <i class="fa-solid fa-ellipsis-vertical"></i>
@@ -122,7 +126,7 @@ Parameters:
       {{/unless}}
       {{/if}}
     </div>
-    {{/unless}}
+  {{/unless}}
   </div>
   <div class="inventory-item-content{{#unless noExtensible}} extensible{{/unless}}">
     {{!-- Description --}}