diff --git a/Assets/Graphics/Tools/Brush.png b/Assets/Graphics/Tools/Brush.png
deleted file mode 100644
index bbe69ea15..000000000
Binary files a/Assets/Graphics/Tools/Brush.png and /dev/null differ
diff --git a/Assets/Graphics/Tools/Brush_l.png b/Assets/Graphics/Tools/Brush_l.png
deleted file mode 100644
index 56025b2f9..000000000
Binary files a/Assets/Graphics/Tools/Brush_l.png and /dev/null differ
diff --git a/Assets/Graphics/Tools/Brush_l_r.png b/Assets/Graphics/Tools/Brush_l_r.png
deleted file mode 100644
index 325695e4c..000000000
Binary files a/Assets/Graphics/Tools/Brush_l_r.png and /dev/null differ
diff --git a/Assets/Graphics/Tools/Brush_r.png b/Assets/Graphics/Tools/Brush_r.png
deleted file mode 100644
index 046d7f7f4..000000000
Binary files a/Assets/Graphics/Tools/Brush_r.png and /dev/null differ
diff --git a/Assets/Graphics/Tools/Bucket_Cursor.png b/Assets/Graphics/Tools/Bucket_Cursor.png
index 559450e7c..df0283999 100644
Binary files a/Assets/Graphics/Tools/Bucket_Cursor.png and b/Assets/Graphics/Tools/Bucket_Cursor.png differ
diff --git a/Assets/Graphics/Tools/ColorPicker_Cursor.png b/Assets/Graphics/Tools/ColorPicker_Cursor.png
index 7fbd41137..e41dab416 100644
Binary files a/Assets/Graphics/Tools/ColorPicker_Cursor.png and b/Assets/Graphics/Tools/ColorPicker_Cursor.png differ
diff --git a/Assets/Graphics/Tools/Eraser_Cursor.png b/Assets/Graphics/Tools/Eraser_Cursor.png
new file mode 100644
index 000000000..a1504949a
Binary files /dev/null and b/Assets/Graphics/Tools/Eraser_Cursor.png differ
diff --git a/Assets/Graphics/Tools/Brush_l_r.png.import b/Assets/Graphics/Tools/Eraser_Cursor.png.import
similarity index 67%
rename from Assets/Graphics/Tools/Brush_l_r.png.import
rename to Assets/Graphics/Tools/Eraser_Cursor.png.import
index daffc1dbd..94ad7eb9d 100644
--- a/Assets/Graphics/Tools/Brush_l_r.png.import
+++ b/Assets/Graphics/Tools/Eraser_Cursor.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Brush_l_r.png-5b0b2b1d5aaa3b4883404b24ddd63152.stex"
+path="res://.import/Eraser_Cursor.png-f692572693acb37ec2194276528a81d8.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Graphics/Tools/Brush_l_r.png"
-dest_files=[ "res://.import/Brush_l_r.png-5b0b2b1d5aaa3b4883404b24ddd63152.stex" ]
+source_file="res://Assets/Graphics/Tools/Eraser_Cursor.png"
+dest_files=[ "res://.import/Eraser_Cursor.png-f692572693acb37ec2194276528a81d8.stex" ]
 
 [params]
 
diff --git a/Assets/Graphics/Tools/LightenDarken_Cursor.png b/Assets/Graphics/Tools/LightenDarken_Cursor.png
new file mode 100644
index 000000000..219b9fbde
Binary files /dev/null and b/Assets/Graphics/Tools/LightenDarken_Cursor.png differ
diff --git a/Assets/Graphics/Tools/Brush_l.png.import b/Assets/Graphics/Tools/LightenDarken_Cursor.png.import
similarity index 65%
rename from Assets/Graphics/Tools/Brush_l.png.import
rename to Assets/Graphics/Tools/LightenDarken_Cursor.png.import
index 3b5442a0b..6bf432cc6 100644
--- a/Assets/Graphics/Tools/Brush_l.png.import
+++ b/Assets/Graphics/Tools/LightenDarken_Cursor.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Brush_l.png-f1a1213816b51e44e3c5cea82f1143f1.stex"
+path="res://.import/LightenDarken_Cursor.png-4c3a225d3133a1ea63f3ad47f599a686.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Graphics/Tools/Brush_l.png"
-dest_files=[ "res://.import/Brush_l.png-f1a1213816b51e44e3c5cea82f1143f1.stex" ]
+source_file="res://Assets/Graphics/Tools/LightenDarken_Cursor.png"
+dest_files=[ "res://.import/LightenDarken_Cursor.png-4c3a225d3133a1ea63f3ad47f599a686.stex" ]
 
 [params]
 
diff --git a/Assets/Graphics/Tools/Pencil_Cursor.png b/Assets/Graphics/Tools/Pencil_Cursor.png
new file mode 100644
index 000000000..0927a589c
Binary files /dev/null and b/Assets/Graphics/Tools/Pencil_Cursor.png differ
diff --git a/Assets/Graphics/Tools/Brush.png.import b/Assets/Graphics/Tools/Pencil_Cursor.png.import
similarity index 67%
rename from Assets/Graphics/Tools/Brush.png.import
rename to Assets/Graphics/Tools/Pencil_Cursor.png.import
index 1d4fc0f67..5cb830596 100644
--- a/Assets/Graphics/Tools/Brush.png.import
+++ b/Assets/Graphics/Tools/Pencil_Cursor.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Brush.png-be161d4821aadbd04edeb9bfd3d48744.stex"
+path="res://.import/Pencil_Cursor.png-835e48cc824d523278a13c95a3b3ec6e.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Graphics/Tools/Brush.png"
-dest_files=[ "res://.import/Brush.png-be161d4821aadbd04edeb9bfd3d48744.stex" ]
+source_file="res://Assets/Graphics/Tools/Pencil_Cursor.png"
+dest_files=[ "res://.import/Pencil_Cursor.png-835e48cc824d523278a13c95a3b3ec6e.stex" ]
 
 [params]
 
diff --git a/Assets/Graphics/Tools/RectSelect_Cursor.png b/Assets/Graphics/Tools/RectSelect_Cursor.png
new file mode 100644
index 000000000..d7d2a1ee2
Binary files /dev/null and b/Assets/Graphics/Tools/RectSelect_Cursor.png differ
diff --git a/Assets/Graphics/Tools/Brush_r.png.import b/Assets/Graphics/Tools/RectSelect_Cursor.png.import
similarity index 66%
rename from Assets/Graphics/Tools/Brush_r.png.import
rename to Assets/Graphics/Tools/RectSelect_Cursor.png.import
index c8fe90d31..dba1fb732 100644
--- a/Assets/Graphics/Tools/Brush_r.png.import
+++ b/Assets/Graphics/Tools/RectSelect_Cursor.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Brush_r.png-2dd42e7ea71b8fd6ecbfc2c28079712f.stex"
+path="res://.import/RectSelect_Cursor.png-a7675c7d3d9b92992266b4bedca7e03f.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Graphics/Tools/Brush_r.png"
-dest_files=[ "res://.import/Brush_r.png-2dd42e7ea71b8fd6ecbfc2c28079712f.stex" ]
+source_file="res://Assets/Graphics/Tools/RectSelect_Cursor.png"
+dest_files=[ "res://.import/RectSelect_Cursor.png-a7675c7d3d9b92992266b4bedca7e03f.stex" ]
 
 [params]
 
diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd
index 68cc71510..bd9747780 100644
--- a/Scripts/Canvas.gd
+++ b/Scripts/Canvas.gd
@@ -108,10 +108,7 @@ func _process(delta : float) -> void:
 			Global.cursor_position_label.text = "[%s×%s]    %s, %s" % [size.x, size.y, mouse_pos_floored.x, mouse_pos_floored.y]
 			if !cursor_inside_canvas:
 				cursor_inside_canvas = true
-				if Global.current_left_tool == "Bucket":
-					Input.set_custom_mouse_cursor(preload("res://Assets/Graphics/Tools/Bucket_Cursor.png"), 0, Vector2(6, 27))
-				elif Global.current_left_tool == "ColorPicker":
-					Input.set_custom_mouse_cursor(preload("res://Assets/Graphics/Tools/ColorPicker_Cursor.png"), 0, Vector2(5, 28))
+				Input.set_custom_mouse_cursor(load("res://Assets/Graphics/Tools/%s_Cursor.png" % Global.current_left_tool), 0, Vector2(3, 24))
 		else:
 			if !Input.is_mouse_button_pressed(BUTTON_LEFT) && !Input.is_mouse_button_pressed(BUTTON_RIGHT):
 				if mouse_inside_canvas: