diff --git a/website/canvas.html b/website/canvas.html
index ead6c4c..d49322a 100644
--- a/website/canvas.html
+++ b/website/canvas.html
@@ -62,6 +62,7 @@
 				transition: background 0.2s;
 				white-space: nowrap;
 				text-align: left;
+				touch-action: manipulation;
 			}
 
 			.toolbar-group-toggle:hover {
@@ -102,6 +103,7 @@
 				text-align: left;
 				white-space: nowrap;
 				transition: background 0.15s;
+				touch-action: manipulation;
 			}
 
 			.toolbar-dropdown button:hover {
@@ -160,6 +162,7 @@
 				text-align: left;
 				white-space: nowrap;
 				transition: background 0.15s;
+				touch-action: manipulation;
 			}
 
 			#toolbar-panel-body button:hover {
@@ -196,6 +199,7 @@
 				transition: background 0.2s;
 				white-space: nowrap;
 				text-align: left;
+				touch-action: manipulation;
 			}
 
 			#toolbar > button:hover {
@@ -844,8 +848,9 @@
 				#toolbar .toolbar-group-toggle {
 					width: 100%;
 					text-align: left;
-					padding: 10px 12px;
-					font-size: 13px;
+					padding: 12px 14px;
+					font-size: 14px;
+					min-height: 44px;
 				}
 
 				#toolbar .toolbar-dropdown {
@@ -856,14 +861,16 @@
 				}
 
 				#toolbar .toolbar-dropdown button {
-					padding: 10px 12px;
-					font-size: 13px;
+					padding: 12px 14px;
+					font-size: 14px;
+					min-height: 44px;
 				}
 
 				#toolbar > button {
 					width: 100%;
 					text-align: left;
-					padding: 10px 12px;
+					padding: 12px 14px;
+					min-height: 44px;
 				}
 
 				#toolbar .toolbar-sep {
@@ -2183,7 +2190,30 @@
 					transform: translate(-50%, -50%);
 					transition: width 0.1s, height 0.1s;
 				`;
+				const cancelBtn = document.createElement("button");
+				cancelBtn.textContent = "✕";
+				cancelBtn.style.cssText = `
+					position: absolute; top: -16px; right: -16px;
+					width: 32px; height: 32px; border-radius: 50%;
+					border: 2px solid #14b8a6; background: white; color: #14b8a6;
+					font-size: 16px; font-weight: bold; cursor: pointer;
+					pointer-events: auto; z-index: 10000;
+					display: flex; align-items: center; justify-content: center;
+					box-shadow: 0 2px 8px rgba(0,0,0,0.15);
+				`;
+				cancelBtn.addEventListener("pointerdown", (e) => {
+					e.preventDefault();
+					e.stopPropagation();
+					clearPendingTool();
+				});
+				ghostEl.appendChild(cancelBtn);
 				document.body.appendChild(ghostEl);
+
+				// Center ghost for touch devices (no mousemove fires after toolbar tap)
+				if (window.matchMedia("(pointer: coarse)").matches) {
+					ghostEl.style.left = (window.innerWidth / 2) + "px";
+					ghostEl.style.top = (window.innerHeight / 2) + "px";
+				}
 			}
 
 			function clearPendingTool() {
@@ -2193,7 +2223,7 @@
 			}
 
 			// Track ghost position
-			document.addEventListener("mousemove", (e) => {
+			document.addEventListener("pointermove", (e) => {
 				if (ghostEl) {
 					ghostEl.style.left = e.clientX + "px";
 					ghostEl.style.top = e.clientY + "px";