diff --git a/src/scss/character.scss b/src/scss/character.scss
index f4ffc21f..1198d0ab 100644
--- a/src/scss/character.scss
+++ b/src/scss/character.scss
@@ -233,6 +233,11 @@
       }
     }
   }
+  /* tag overflow */
+    .tag-row {
+      display: flex;
+      overflow: hidden;
+    }
   /* ----------------------------------------- */
   /*  Item Controls                            */
   /* ----------------------------------------- */
diff --git a/src/templates/actors/partials/character-inventory-tab.html b/src/templates/actors/partials/character-inventory-tab.html
index 2aa15beb..af0f2a21 100644
--- a/src/templates/actors/partials/character-inventory-tab.html
+++ b/src/templates/actors/partials/character-inventory-tab.html
@@ -22,7 +22,7 @@
           style="background-image: url({{item.img}})"
         ></div>
         <h4 class="item-name" title="{{item.name}}">{{item.name~}}</h4>
-        <div class="icon-row flexrow">
+        <div class="tag-row icon-row">
           {{#each item.data.data.manualTags as |tag|}} {{#if (getTagIcon
           tag.value)}}
           <img
diff --git a/src/templates/items/armor-sheet.html b/src/templates/items/armor-sheet.html
index 156e1037..c693fa2a 100644
--- a/src/templates/items/armor-sheet.html
+++ b/src/templates/items/armor-sheet.html
@@ -5,11 +5,25 @@
       <h1 class="charname">
         <input name="name" type="text" value="{{name}}" placeholder="Name" />
       </h1>
-    </div>
+      <ol class="tag-list">
+          {{#each data.manualTags as |tag|}}
+          <li class="tag" title="{{tag.title}}" data-tag="{{tag.value}}">
+            <span>{{tag.value}}</span>
+            <a class="tag-delete"><i class="fas fa-times"></i></a>
+          </li>
+          {{/each}}
+        </ol>
+    </div>  
   </header>
   <section class="sheet-body">
     <div class="flexrow">
       <div class="stats">
+        <div class="form-group">
+          <div class="form-fields">
+            <input type="text" data-action="add-tag" title="{{localize 'OSE.items.typeTag'}}"
+              placeholder="{{localize 'OSE.items.enterTag'}}" />
+          </div>
+        </div>
         <div class="form-group">
           <label>{{localize 'OSE.items.ArmorAC'}}</label>
           <div class="form-fields">
diff --git a/src/templates/items/item-sheet.html b/src/templates/items/item-sheet.html
index 56739137..99da1fd3 100644
--- a/src/templates/items/item-sheet.html
+++ b/src/templates/items/item-sheet.html
@@ -5,11 +5,25 @@
       <h1 class="charname">
         <input name="name" type="text" value="{{name}}" placeholder="Name" />
       </h1>
+      <ol class="tag-list">
+        {{#each data.manualTags as |tag|}}
+        <li class="tag" title="{{tag.title}}" data-tag="{{tag.value}}">
+          <span>{{tag.value}}</span>
+          <a class="tag-delete"><i class="fas fa-times"></i></a>
+        </li>
+        {{/each}}
+      </ol>
     </div>
   </header>
   <section class="sheet-body">
     <div class="flexrow">
       <div class="stats">
+        <div class="form-group">
+          <div class="form-fields">
+            <input type="text" data-action="add-tag" title="{{localize 'OSE.items.typeTag'}}"
+              placeholder="{{localize 'OSE.items.enterTag'}}" />
+          </div>
+        </div>
         <div class="form-group">
           <label>{{localize 'OSE.items.Quantity'}}</label>
           <div class="form-fields">