diff --git a/rpg-docs/client/views/character/buffs/buffListItem/buffListItem.html b/rpg-docs/client/views/character/buffs/buffListItem/buffListItem.html
index dbef48eb..cb6d1b66 100644
--- a/rpg-docs/client/views/character/buffs/buffListItem/buffListItem.html
+++ b/rpg-docs/client/views/character/buffs/buffListItem/buffListItem.html
@@ -3,5 +3,13 @@
 		<div class="flex">
 			{{buff.name}}
 		</div>
+
+		{{#if canEditCharacter buff.charId}}
+			<paper-icon-button class="deleteButton"
+							   role="button"
+							   tabindex="0"
+							   icon="delete">
+			</paper-icon-button>
+		{{/if}}
 	</div>
-</template>
\ No newline at end of file
+</template>
diff --git a/rpg-docs/client/views/character/buffs/buffListItem/buffListItem.js b/rpg-docs/client/views/character/buffs/buffListItem/buffListItem.js
index e695af62..23f1d9ed 100644
--- a/rpg-docs/client/views/character/buffs/buffListItem/buffListItem.js
+++ b/rpg-docs/client/views/character/buffs/buffListItem/buffListItem.js
@@ -14,4 +14,8 @@ Template.buffListItem.events({
 			element:   event.currentTarget,
 		});
 	},
-});
\ No newline at end of file
+	"tap .deleteButton": function(event){
+		event.stopPropagation();
+		Buffs.remove(this.buff._id);
+	},
+});
diff --git a/rpg-docs/client/views/character/buffs/conditionView/conditionView.html b/rpg-docs/client/views/character/buffs/conditionView/conditionView.html
index 38659a6d..4dff87ab 100644
--- a/rpg-docs/client/views/character/buffs/conditionView/conditionView.html
+++ b/rpg-docs/client/views/character/buffs/conditionView/conditionView.html
@@ -3,5 +3,13 @@
 		<div class="flex">
 			{{condition.name}}
 		</div>
+
+		{{#if canEditCharacter condition.charId}}
+			<paper-icon-button class="deleteButton"
+							   role="button"
+							   tabindex="0"
+							   icon="delete">
+			</paper-icon-button>
+		{{/if}}
 	</div>
 </template>
diff --git a/rpg-docs/client/views/character/buffs/conditionView/conditionView.js b/rpg-docs/client/views/character/buffs/conditionView/conditionView.js
index 752a9ba6..8d22a0ea 100644
--- a/rpg-docs/client/views/character/buffs/conditionView/conditionView.js
+++ b/rpg-docs/client/views/character/buffs/conditionView/conditionView.js
@@ -8,4 +8,8 @@ Template.conditionView.events({
 			element:   event.currentTarget,
 		});
 	},
+	"tap .deleteButton": function(event){
+		event.stopPropagation();
+		Conditions.remove(this.condition._id);
+	},
 });