diff --git a/dev/External/User/ko.js b/dev/External/User/ko.js
index 8f80d431b..c3cbb4206 100644
--- a/dev/External/User/ko.js
+++ b/dev/External/User/ko.js
@@ -92,7 +92,7 @@ ko.bindingHandlers.dragmessages = {
 			dragImage || (dragImage = elementById('messagesDragImage'));
 			if (data && dragImage && !ThemeStore.isMobile()) {
 				dragImage.querySelector('.text').textContent = data.uids.length;
-				let img = dragImage.querySelector('.icon-white');
+				let img = dragImage.querySelector('i');
 				img.classList.toggle('icon-copy', e.ctrlKey);
 				img.classList.toggle('icon-mail', !e.ctrlKey);
 
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index 731cd602a..f2b1ccfcb 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -1,11 +1,8 @@
-/*
+
 .g-ui-user-select-none {
-	webkit-touch-callout: none;
 	user-select: none;
-	standard-user-select: none;
-	touch-callout: none;
+	-webkit-touch-callout: none;
 }
-*/
 
 .g-ui-link {
 	color: #369;
diff --git a/dev/dragdropgecko.js b/dev/dragdropgecko.js
index 9eac72a60..171717011 100644
--- a/dev/dragdropgecko.js
+++ b/dev/dragdropgecko.js
@@ -93,7 +93,7 @@
 			if (dragSource) {
 				// get ready to start dragging
 				lastTouch = e;
-				e.preventDefault(); // prevent scrolling NOTE: this creates a bug that click will not work
+//				dragSource.style.userSelect = 'none';
 
 				// 1000 ms to wait, chrome on android triggers dragstart in 600
 				holdInterval = setTimeout(() => {
@@ -130,10 +130,6 @@
 
 	touchend = e => {
 		if (dragSource) {
-			if (!isDragging) {
-				// touched the element but didn't drag, so simulate a click
-				dispatchEvent(lastTouch, 'click', e.target);
-			}
 			// finish dragging
 			allowDrop && 'touchcancel' !== e.type && dispatchEvent(lastTouch, 'drop', lastTarget);
 			reset();