diff --git a/css/style.css b/css/style.css
index 4ad355d..b3f1587 100644
--- a/css/style.css
+++ b/css/style.css
@@ -21,10 +21,6 @@
     background-position: 16px center;
 }
 
-.icon-button-add {
-    background-image: var(--original-icon-add-white);
-}
-
 #new-note-fixed {
     z-index: 111; /* navigation menu is 110 ;-) */
     line-height: 44px;
@@ -125,6 +121,18 @@
     min-height: 75px;
 }
 
+.icon-button-add {
+    background-image: var(--original-icon-add-white);
+}
+
+.icon-delete-note {
+    background-image: var(--original-icon-delete-dark);
+}
+
+.icon-delete-note:hover {
+    background-image: var(--icon-delete-color-red);
+}
+
 .icon-header-note {
     cursor: pointer;
     float: right;
@@ -283,6 +291,7 @@ box-shadow: 0 0 0 2px var(--color-primary);
 
 .slim-share,
 .slim-tag {
+    background-repeat: no-repeat;
     display: inline-block;
     cursor: pointer;
     padding: 0px 6px 0 24px;
@@ -303,6 +312,13 @@ box-shadow: 0 0 0 2px var(--color-primary);
     margin-top: 5px;
 }
 
+.slim-share {
+    background-image: var(--original-icon-user-dark);
+}
+
+.slim-tag {
+    background-image: var(--original-icon-tag-dark);
+}
 
 /* Restore defaults select2 rules */
 
diff --git a/js/templates/attachts.handlebars b/js/templates/attachts.handlebars
index bc97a08..393a74a 100644
--- a/js/templates/attachts.handlebars
+++ b/js/templates/attachts.handlebars
@@ -5,7 +5,7 @@
 				<div class="attach-preview note-attach" attach-file-id="{{file_id}}" data-background-image="{{preview_url}}"></div>
 			</a>
 			{{#if ../can_delete}}
-				<div class="attach-remove icon-delete" title="{{t "quicknotes" "Delete attachment"}}"></div>
+				<div class="attach-remove original-icon-delete-dark" title="{{t "quicknotes" "Delete attachment"}}"></div>
 			{{/if}}
 		</div>
 	{{/each}}
diff --git a/js/templates/note-item.handlebars b/js/templates/note-item.handlebars
index 11bd3de..2391435 100644
--- a/js/templates/note-item.handlebars
+++ b/js/templates/note-item.handlebars
@@ -15,7 +15,7 @@
 			{{else}}
 				<div class="icon-header-note icon-pin hide-header-icon" title="{{t "quicknotes" "Pin note"}}"></div>
 			{{/if}}
-			<div class="icon-header-note icon-delete hide-header-icon icon-delete-note" title="{{t "quicknotes" "Delete note"}}"></div>
+			<div class="icon-header-note hide-header-icon icon-delete-note" title="{{t "quicknotes" "Delete note"}}"></div>
 			<div class='note-title'>
 				{{{ title }}}
 			</div>
@@ -24,12 +24,12 @@
 			</div>
 			<div class='note-shares'>
 				{{#each sharedWith}}
-					<div class="icon-user slim-share" share-id="{{ shared_user }}" title="Shared with {{ display_name }}">{{{ display_name }}}</div>
+					<div class="slim-share" share-id="{{ shared_user }}" title="Shared with {{ display_name }}">{{{ display_name }}}</div>
 				{{/each}}
 			</div>
 			<div class='note-tags'>
 				{{#each tags}}
-					<div class="icon-tag slim-tag" tag-id="{{ id }}">{{{ name }}}</div>
+					<div class="slim-tag" tag-id="{{ id }}">{{{ name }}}</div>
 				{{/each}}
 			</div>
 		<div>
diff --git a/js/templates/notes.handlebars b/js/templates/notes.handlebars
index 05441be..682c778 100644
--- a/js/templates/notes.handlebars
+++ b/js/templates/notes.handlebars
@@ -15,14 +15,14 @@
 			<div class='note-body'>
 				{{#if sharedBy}}
 					<div class="icon-header-note icon-share" title="{{tSB sharedBy.0.display_name}}"></div>
-					<div class="icon-header-note icon-delete hide-header-icon icon-delete-note" title="{{t "quicknotes" "Leave this shared note"}}"></div>
+					<div class="icon-header-note hide-header-icon icon-delete-note" title="{{t "quicknotes" "Leave this shared note"}}"></div>
 				{{else}}
 					{{#if isPinned}}
 						<div class="icon-header-note icon-pinned fixed-header-icon" title="{{t "quicknotes" "Unpin note"}}"></div>
 					{{else}}
 						<div class="icon-header-note icon-pin hide-header-icon" title="{{t "quicknotes" "Pin note"}}"></div>
 					{{/if}}
-					<div class="icon-header-note icon-delete hide-header-icon icon-delete-note" title="{{t "quicknotes" "Delete note"}}"></div>
+					<div class="icon-header-note hide-header-icon icon-delete-note" title="{{t "quicknotes" "Delete note"}}"></div>
 				{{/if}}
 				<div class='note-title'>
 					{{{ title }}}
@@ -32,12 +32,12 @@
 				</div>
 				<div class='note-shares'>
 					{{#each sharedWith}}
-						<div class="icon-user slim-share" share-id="{{ shared_user }}" title="{{tSW display_name}}">{{{ display_name }}}</div>
+						<div class="slim-share" share-id="{{ shared_user }}" title="{{tSW display_name}}">{{{ display_name }}}</div>
 					{{/each}}
 				</div>
 				<div class='note-tags'>
 					{{#each tags}}
-						<div class='icon-tag slim-tag' tag-id="{{ id }}">
+						<div class='slim-tag' tag-id="{{ id }}">
 							{{{ name }}}
 						</div>
 					{{/each}}
diff --git a/js/templates/shares.handlebars b/js/templates/shares.handlebars
index 5d5f2f8..85614f1 100644
--- a/js/templates/shares.handlebars
+++ b/js/templates/shares.handlebars
@@ -1,5 +1,5 @@
 <div class='note-shares'>
 	{{#each sharedWith}}
-		<div class="icon-user slim-share" share-id="{{ shared_user }}" title="{{tSW display_name}}">{{{ display_name }}}</div>
+		<div class="slim-share" share-id="{{ shared_user }}" title="{{tSW display_name}}">{{{ display_name }}}</div>
 	{{/each}}
 </div>
\ No newline at end of file
diff --git a/js/templates/tags.handlebars b/js/templates/tags.handlebars
index a680f47..ef4025c 100644
--- a/js/templates/tags.handlebars
+++ b/js/templates/tags.handlebars
@@ -1,5 +1,5 @@
 <div class='note-tags'>
 	{{#each tags}}
-		<div class="icon-tag slim-tag" tag-id="{{ id }}">{{{ name }}}</div>
+		<div class="slim-tag" tag-id="{{ id }}">{{{ name }}}</div>
 	{{/each}}
 </div>
\ No newline at end of file