diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index e7aec74ff..e5f3bcf87 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -47,3 +47,22 @@ html.mobile *, html.rl-mobile * {
 input[type="search"]{
 	box-sizing: content-box;
 }
+
+.button-confirm-delete {
+	margin-right: 15px;
+	opacity: 0;
+	visibility: hidden;
+}
+.button-confirm-delete.delete-access {
+	margin-right: 0;
+	opacity: 1;
+	visibility: visible;
+}
+
+.drag-handle {
+	color: #eee;
+	cursor: grab;
+}
+tr:hover .drag-handle {
+	color: #aaa;
+}
diff --git a/dev/Styles/SettingsAccounts.less b/dev/Styles/SettingsAccounts.less
index d8282aa92..bbb1b4d99 100644
--- a/dev/Styles/SettingsAccounts.less
+++ b/dev/Styles/SettingsAccounts.less
@@ -20,14 +20,6 @@
 			line-height: 30px;
 		}
 
-		.drag-handle {
-			color: #eee;
-		}
-
-		tr:hover .drag-handle {
-			color: #aaa;
-		}
-
 		.account-img, .identity-img {
 			font-size: 12px;
 			margin-right: 5px;
@@ -68,26 +60,6 @@
 			cursor: pointer;
 		}
 
-		.drag-handle {
-			cursor: pointer;
-			cursor: all-scroll;
-		}
-
-		.button-delete {
-			margin-right: 15px;
-			margin-top: 5px;
-			visibility: hidden;
-			opacity: 0;
-		}
-
-		.delete-access {
-			&.button-delete {
-				visibility: visible;
-				margin-right: 0;
-				opacity: 1;
-			}
-		}
-
 		.delete-account {
 			cursor: pointer;
 			opacity: 0.5;
@@ -102,21 +74,6 @@
 			cursor: pointer;
 		}
 
-		.button-delete {
-			margin-right: 15px;
-			margin-top: 5px;
-			visibility: hidden;
-			opacity: 0;
-		}
-
-		.delete-access {
-			&.button-delete {
-				visibility: visible;
-				margin-right: 0;
-				opacity: 1;
-			}
-		}
-
 		.delete-identity {
 			cursor: pointer;
 			opacity: 0.5;
diff --git a/dev/Styles/SettingsFilters.less b/dev/Styles/SettingsFilters.less
index 1d38dbbac..ca3fb51a6 100644
--- a/dev/Styles/SettingsFilters.less
+++ b/dev/Styles/SettingsFilters.less
@@ -24,14 +24,6 @@
 			}
 		}
 
-		.drag-handle {
-			color: #eee;
-		}
-
-		tr:hover .drag-handle {
-			color: #aaa;
-		}
-
 		.filter-img {
 			font-size: 12px;
 			margin-right: 5px;
@@ -64,26 +56,6 @@
 			cursor: pointer;
 		}
 
-		.drag-handle {
-			cursor: pointer;
-			cursor: all-scroll;
-		}
-
-		.button-delete {
-			margin-right: 15px;
-			margin-top: 5px;
-			visibility: hidden;
-			opacity: 0;
-		}
-
-		.delete-access {
-			&.button-delete {
-				visibility: visible;
-				margin-right: 0;
-				opacity: 1;
-			}
-		}
-
 		.delete-filter {
 			cursor: pointer;
 			opacity: 0.5;
diff --git a/dev/Styles/SettingsFolders.less b/dev/Styles/SettingsFolders.less
index 5c872964c..283e06157 100644
--- a/dev/Styles/SettingsFolders.less
+++ b/dev/Styles/SettingsFolders.less
@@ -82,14 +82,6 @@
 			opacity: 0;
 		}
 
-		.delete-access {
-			&.button-delete {
-				visibility: visible;
-				margin-right: 0;
-				opacity: 1;
-			}
-		}
-
 		.delete-folder, .subscribe-folder, .unsubscribe-folder, .check-folder, .uncheck-folder {
 			cursor: pointer;
 			opacity: 0.6;
diff --git a/dev/Styles/SettingsOpenPGP.less b/dev/Styles/SettingsOpenPGP.less
index 5af820b7e..dccabccf2 100644
--- a/dev/Styles/SettingsOpenPGP.less
+++ b/dev/Styles/SettingsOpenPGP.less
@@ -41,21 +41,6 @@
 
 	.open-pgp-key-item {
 
-		.button-delete {
-			margin-right: 15px;
-			margin-top: 5px;
-			visibility: hidden;
-			opacity: 0;
-		}
-
-		.delete-access {
-			&.button-delete {
-				visibility: visible;
-				margin-right: 0;
-				opacity: 1;
-			}
-		}
-
 		.delete-open-pgp-key, .view-open-pgp-key {
 			cursor: pointer;
 			opacity: 0.7;
diff --git a/dev/Styles/SettingsTemplates.less b/dev/Styles/SettingsTemplates.less
index 742861aa9..89c7a7447 100644
--- a/dev/Styles/SettingsTemplates.less
+++ b/dev/Styles/SettingsTemplates.less
@@ -20,14 +20,6 @@
 			line-height: 30px;
 		}
 
-		.drag-handle {
-			color: #eee;
-		}
-
-		tr:hover .drag-handle {
-			color: #aaa;
-		}
-
 		.template-img {
 			font-size: 12px;
 			margin-right: 5px;
@@ -53,26 +45,6 @@
 			cursor: pointer;
 		}
 
-		.drag-handle {
-			cursor: pointer;
-			cursor: all-scroll;
-		}
-
-		.button-delete {
-			margin-right: 15px;
-			margin-top: 5px;
-			visibility: hidden;
-			opacity: 0;
-		}
-
-		.delete-access {
-			&.button-delete {
-				visibility: visible;
-				margin-right: 0;
-				opacity: 1;
-			}
-		}
-
 		.delete-template {
 			cursor: pointer;
 			opacity: 0.5;
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index e1ed63f13..2a14ca2e2 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -32,7 +32,7 @@
 							<span class="account-name" data-bind="text: email"></span>
 						</td>
 						<td>
-							<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oAccount) { $root.deleteAccount(oAccount); }">
+							<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oAccount) { $root.deleteAccount(oAccount); }">
 								<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/DELETING_ASK"></span>
 							</a>
 						</td>
@@ -82,7 +82,7 @@
 							</span>
 						</td>
 						<td>
-							<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }">
+							<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }">
 								<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/DELETING_ASK"></span>
 							</a>
 						</td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index ab642ef6d..b81efd05d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -87,7 +87,7 @@
 								<span class="filter-sub-name" data-bind="text: nameSub()"></span>
 							</td>
 							<td>
-								<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oFilter) { $root.deleteFilter(oFilter); }">
+								<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oFilter) { $root.deleteFilter(oFilter); }">
 									<span class="i18n" data-i18n="SETTINGS_FILTERS/DELETING_ASK"></span>
 								</a>
 							</td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
index 63350f1cf..740682189 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
@@ -8,7 +8,7 @@
 			autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 			data-bind="value: nameForEdit, visible: edited, hasfocus: edited, onEnter: function () { $root.folderEditOnEnter($data); }, onEsc: function () { $root.folderEditOnEsc($data); }" />
 
-		<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function() { $root.deleteFolder($data); }">
+		<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function() { $root.deleteFolder($data); }">
 			<span class="i18n" data-i18n="SETTINGS_FOLDERS/DELETING_ASK"></span>
 		</a>
 	</td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
index febca5616..c76490b9b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
@@ -49,7 +49,7 @@
 						<div class="open-pgp-key-user-address" data-bind="text: $data"></div>
 					<!-- /ko -->
 					</span>
-					<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }">
+					<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }">
 						<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
 					</a>
 				</td>
@@ -78,7 +78,7 @@
 						</div>
 					<!-- /ko -->
 					</span>
-					<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
+					<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
 						<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
 					</a>
 				</td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
index 994d5402a..fab013b17 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
@@ -31,7 +31,7 @@
 							<span class="template-name" data-bind="text: name"></span>
 						</td>
 						<td>
-							<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess}, click: function(oTemplate) { $root.deleteTemplate(oTemplate); }">
+							<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess}, click: function(oTemplate) { $root.deleteTemplate(oTemplate); }">
 								<span class="i18n" data-i18n="SETTINGS_TEMPLATES/DELETING_ASK"></span>
 							</a>
 						</td>