diff --git a/src/components/canvas/Canvas.tsx b/src/components/canvas/Canvas.tsx
index c7bca4d..ad114e5 100644
--- a/src/components/canvas/Canvas.tsx
+++ b/src/components/canvas/Canvas.tsx
@@ -312,8 +312,8 @@ function Canvas() {
 					break;
 				}
 				case "z":
-					if (!e.ctrlKey) return;
-					undo();
+					if (e.ctrlKey) undo();
+					else setTool("zoom");
 					break;
 				case "y":
 					if (!e.ctrlKey) return;
@@ -324,39 +324,33 @@ function Canvas() {
 					clipboard.copy();
 					break;
 				case "v":
-					if (!e.ctrlKey) return;
-					clipboard.paste();
+					if (e.ctrlKey) clipboard.paste();
+					else setTool("move");
 					break;
-				case "1":
+				case "h":
 					setTool("hand");
 					break;
-				case "2":
-					setTool("move");
-					break;
-				case "3":
+				case "m":
 					setTool("rectangle-select");
 					break;
-				case "4":
+				case "l":
 					setTool("lasso");
 					break;
-				case "5":
+				case "w":
 					setTool("magic-wand");
 					break;
-				case "6":
+				case "b":
 					setTool("pencil");
 					break;
-				case "7":
+				case "e":
 					setTool("eraser");
 					break;
-				case "8":
+				case "g":
 					setTool("paint-bucket");
 					break;
-				case "9":
+				case "i":
 					setTool("eyedropper");
 					break;
-				case "0":
-					setTool("zoom");
-					break;
 				case "ArrowRight": {
 					// Debug key combination
 					if (!e.altKey && !e.shiftKey) return;
diff --git a/src/components/toolbar/index.tsx b/src/components/toolbar/index.tsx
index 1d802a9..963edae 100644
--- a/src/components/toolbar/index.tsx
+++ b/src/components/toolbar/index.tsx
@@ -40,7 +40,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Hand (1)</p>
+						<p>Hand (H)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -52,7 +52,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Move (2)</p>
+						<p>Move (V)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -64,7 +64,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Rectangle Select (3)</p>
+						<p>Rectangle Select (M)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -76,7 +76,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Lasso (4)</p>
+						<p>Lasso (L)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -88,7 +88,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Magic Wand (5)</p>
+						<p>Magic Wand (W)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -100,7 +100,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Pencil (6)</p>
+						<p>Pencil (B)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -112,7 +112,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Eraser (7)</p>
+						<p>Eraser (E)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -124,7 +124,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Paint Bucket (8)</p>
+						<p>Paint Bucket (G)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -136,7 +136,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Eyedropper (9)</p>
+						<p>Eyedropper (I)</p>
 					</TooltipContent>
 				</Tooltip>
 
@@ -148,7 +148,7 @@ function Toolbar() {
 						</ToggleGroupItem>
 					</TooltipTrigger>
 					<TooltipContent side="right" sideOffset={10}>
-						<p>Zoom (0)</p>
+						<p>Zoom (Z)</p>
 					</TooltipContent>
 				</Tooltip>