diff --git a/src/module/ds4.ts b/src/module/ds4.ts
index 4bcf222..f8d8866 100644
--- a/src/module/ds4.ts
+++ b/src/module/ds4.ts
@@ -38,6 +38,8 @@ async function registerHandlebarsPartials() {
         "systems/ds4/templates/item/partials/body.hbs",
         "systems/ds4/templates/actor/partials/items-overview.hbs",
         "systems/ds4/templates/actor/partials/talents-overview.hbs",
+        "systems/ds4/templates/actor/partials/overview-add-button.hbs",
+        "systems/ds4/templates/actor/partials/overview-control-buttons.hbs",
         "systems/ds4/templates/actor/partials/attributes-traits.hbs",
         "systems/ds4/templates/actor/partials/combat-values.hbs",
     ];
diff --git a/src/templates/actor/partials/items-overview.hbs b/src/templates/actor/partials/items-overview.hbs
index f3e5415..da54d2e 100644
--- a/src/templates/actor/partials/items-overview.hbs
+++ b/src/templates/actor/partials/items-overview.hbs
@@ -5,29 +5,6 @@
 {{!-- INLINE PARTIAL DEFINITIONS --}}
 {{!-- ======================================================================== --}}
 
-{{!--
-!-- Render an "add" button for a given data type.
-!--
-!-- @param datType: hand over the dataType to the partial as hash parameter
---}}
-{{#*inline "addItemButton"}}
-    <div class="item-controls">
-        <a class="item-control item-create" title="Create item" data-type="{{dataType}}">
-            <i class="fas fa-plus"></i>
-            {{localize 'DS4.UserInteractionAddItem'}}</a>
-    </div>
-{{/inline}}
-{{!--
-!-- Render a group of an "edit" and a "delete" button for the current item.
-!-- The current item is defined by the data-item-id HTML property of the parent li element.
---}}
-{{#*inline "itemControlButtons"}}
-    <div class="item-controls">
-        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-    </div>
-{{/inline}}
-
 
 {{!--
 !-- Render a header row for a given data type.
@@ -57,7 +34,7 @@
         {{!-- description --}}
         <div class="flex4">{{localize 'DS4.HeadingDescription'}}</div>
         {{!-- add button --}}
-        {{> addItemButton dataType=dataType }}
+        {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }}
     </li>
 {{/inline}}
 
@@ -94,7 +71,7 @@
         {{!-- description --}}
         <div class="flex4 item-description">{{{item.data.data.description}}}</div>
         {{!-- control buttons --}}
-        {{> itemControlButtons}}
+        {{> systems/ds4/templates/actor/partials/overview-control-buttons.hbs }}
     </li>
 {{/inline}}
 
diff --git a/src/templates/actor/partials/overview-add-button.hbs b/src/templates/actor/partials/overview-add-button.hbs
new file mode 100644
index 0000000..86e5d77
--- /dev/null
+++ b/src/templates/actor/partials/overview-add-button.hbs
@@ -0,0 +1,11 @@
+{{!
+!-- Render an "add" button for adding an item of given data type.
+!--
+!-- @param datType: hand over the dataType to the partial as hash parameter
+}}
+<div class="item-controls">
+    <a class="item-control item-create" title="Create item" data-type="{{dataType}}">
+        <i class="fas fa-plus"></i>
+        {{localize "DS4.UserInteractionAddItem"}}
+    </a>
+</div>
\ No newline at end of file
diff --git a/src/templates/actor/partials/overview-control-buttons.hbs b/src/templates/actor/partials/overview-control-buttons.hbs
new file mode 100644
index 0000000..d10dbc3
--- /dev/null
+++ b/src/templates/actor/partials/overview-control-buttons.hbs
@@ -0,0 +1,8 @@
+{{!--
+!-- Render a group of an "edit" and a "delete" button for the current item.
+!-- The current item is defined by the data-item-id HTML property of the parent li element.
+--}}
+<div class="item-controls">
+    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+</div>
diff --git a/src/templates/actor/partials/talents-overview.hbs b/src/templates/actor/partials/talents-overview.hbs
index af25941..3c2cfea 100644
--- a/src/templates/actor/partials/talents-overview.hbs
+++ b/src/templates/actor/partials/talents-overview.hbs
@@ -3,30 +3,15 @@
 {{!-- ======================================================================== --}}
 {{!-- TODO: remove duplicate add and delete button definition --}}
 
-{{!--
-!-- Render an "add" button for a given data type.
+
+{{!-- 
+!-- Render an input element for a rank value property of an item.
 !--
-!-- @param datType: hand over the dataType to the partial as hash parameter
+!-- @param item: the item
+!-- @param property: the key of the property in item.data.data (if 'base', the max value is set automatically)
+!-- @param disabled: if given, is placed plainly into the input as HTML property;
+!--     meant to be set to "disabled" to disable the input element
 --}}
-{{#*inline "addItemButton"}}
-    <div class="item-controls">
-        <a class="item-control item-create" title="Create item" data-type="{{dataType}}">
-            <i class="fas fa-plus"></i>
-            {{localize 'DS4.UserInteractionAddItem'}}</a>
-    </div>
-{{/inline}}
-{{!--
-!-- Render a group of an "edit" and a "delete" button for the current item.
-!-- The current item is defined by the data-item-id HTML property of the parent li element.
---}}
-{{#*inline "itemControlButtons"}}
-    <div class="item-controls">
-        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-    </div>
-{{/inline}}
-
-
 {{#*inline "talentRankValue"}}
     <input class="item-num-val item-change" data-dtype="Number" type="number" min="0" step="1"
         {{#if (eq property 'base') }}max="{{item.data.data.rank.max}}"{{/if}}
@@ -35,6 +20,7 @@
         title="{{localize localizeString}}" />
 {{/inline}}
 
+
 {{!--
 !-- Render a talent list row from a given item.
 !-- It is a flexbox with a child for each item value of interest.
@@ -68,7 +54,7 @@
         {{!-- description --}}
         <div class="flex4 item-description">{{{item.data.data.description}}}</div>
         {{!-- control buttons --}}
-        {{> itemControlButtons}}
+        {{> systems/ds4/templates/actor/partials/overview-control-buttons.hbs }}
     </li>
 {{/inline}}
 
@@ -88,7 +74,7 @@
             {{!-- description --}}
             <div class="flex4">{{localize 'DS4.HeadingDescription'}}</div>
             {{!-- add button --}}
-            {{> addItemButton dataType='talent' }}
+            {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='talent' }}
         </li>
         {{#each itemsByType.talent as |item id|}}
             {{> talentListEntry item=item}}