diff --git a/src/Tools/BaseDraw.gd b/src/Tools/BaseDraw.gd
index 9b1895bb1..8074b58bd 100644
--- a/src/Tools/BaseDraw.gd
+++ b/src/Tools/BaseDraw.gd
@@ -222,7 +222,7 @@ func update_mask(can_skip := true) -> void:
 	_mask = PackedFloat32Array(nulled_array)
 
 
-func update_line_polylines(start: Vector2, end: Vector2) -> void:
+func update_line_polylines(start: Vector2i, end: Vector2i) -> void:
 	var indicator := _create_line_indicator(_indicator, start, end)
 	_line_polylines = _create_polylines(indicator)
 
@@ -652,7 +652,7 @@ func _create_line_indicator(indicator: BitMap, start: Vector2i, end: Vector2i) -
 
 
 func _blit_indicator(dst: BitMap, indicator: BitMap, pos: Vector2i) -> void:
-	var rect := Rect2i(Vector2.ZERO, dst.get_size())
+	var rect := Rect2i(Vector2i.ZERO, dst.get_size())
 	var brush_size := indicator.get_size()
 	pos -= brush_size / 2
 	for y in brush_size.y:
diff --git a/src/UI/Canvas/Grid.gd b/src/UI/Canvas/Grid.gd
index 1d7f86570..dbc05ddbe 100644
--- a/src/UI/Canvas/Grid.gd
+++ b/src/UI/Canvas/Grid.gd
@@ -13,7 +13,7 @@ func _draw() -> void:
 	if Global.grid_draw_over_tile_mode:
 		target_rect = Global.current_project.tiles.get_bounding_rect()
 	else:
-		target_rect = Rect2i(Vector2.ZERO, Global.current_project.size)
+		target_rect = Rect2i(Vector2i.ZERO, Global.current_project.size)
 	if not target_rect.has_area():
 		return
 
diff --git a/src/UI/Canvas/Selection.gd b/src/UI/Canvas/Selection.gd
index 4c08f38e7..43c0b6254 100644
--- a/src/UI/Canvas/Selection.gd
+++ b/src/UI/Canvas/Selection.gd
@@ -821,7 +821,7 @@ func new_brush() -> void:
 func select_all() -> void:
 	var undo_data_tmp := get_undo_data(false)
 	clear_selection()
-	var full_rect := Rect2i(Vector2.ZERO, Global.current_project.size)
+	var full_rect := Rect2i(Vector2i.ZERO, Global.current_project.size)
 	select_rect(full_rect)
 	commit_undo("Select", undo_data_tmp)
 
diff --git a/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd b/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd
index a2dbc4152..aa4f81248 100644
--- a/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd
+++ b/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd
@@ -92,6 +92,6 @@ func _flip_selection(project := Global.current_project) -> void:
 	project.selection_map.fill(Color(0, 0, 0, 0))
 	project.selection_map.blend_rect(
 		smaller_bitmap_image,
-		Rect2i(Vector2.ZERO, smaller_bitmap_image.get_size()),
+		Rect2i(Vector2i.ZERO, smaller_bitmap_image.get_size()),
 		selection_rect.position
 	)