diff --git a/src/windows/map.c b/src/windows/map.c
index c7e389f1dc..f93f5e0f5e 100644
--- a/src/windows/map.c
+++ b/src/windows/map.c
@@ -203,6 +203,8 @@ static void window_map_close()
 		RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWNUMBER, uint16) == w->number) {
 		tool_cancel();
 	}
+	//Reset land tool size
+	RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 0;
 }
 
 /**
@@ -231,9 +233,11 @@ static void window_map_mouseup()
 	//RCT2_CALLPROC_EBPSAFE(0x0068CFC1);
 	sint16 var_idx;
 	rct_window* var_w;
+	//Maximum land ownership tool size
+	int land_tool_limit;
 
 	window_widget_get_registers(var_w, var_idx);
-	
+
 	switch (var_idx)
 	{
 	case WIDX_CLOSE:
@@ -290,18 +294,20 @@ static void window_map_mouseup()
 
 	case WIDX_LAND_TOOL_SMALLER:
 		--RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16);
+		land_tool_limit=1;
 
-		if (RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) < 1)
-			RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 1;
+		if (RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) < land_tool_limit)
+			RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = land_tool_limit;
 
 		window_invalidate(var_w);
 		break;
 
 	case WIDX_LAND_TOOL_LARGER:
 		++RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16);
+		land_tool_limit=64;
 
-		if (RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) > 7)
-			RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 7;
+		if (RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) > land_tool_limit)
+			RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = land_tool_limit;
 
 		window_invalidate(var_w);
 		break;
@@ -538,8 +544,8 @@ static void window_map_invalidate()
 				w->widgets[WIDX_LAND_TOOL_LARGER].type = WWT_TRNBTN;
 				for (i = 0; i < 4; i++)
 					w->widgets[WIDX_LAND_OWNED_CHECKBOX + i].type = WWT_CHECKBOX;
-				w->widgets[WIDX_LAND_TOOL].image = SPR_LAND_TOOL_SIZE_0 +
-					RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, uint16);
+				w->widgets[WIDX_LAND_TOOL].image = RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, uint16) <= 7 ? SPR_LAND_TOOL_SIZE_0 +
+					RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, uint16) : 0xFFFFFFFF;
 			}
 		// if no tool is active: show the default scenario editor buttons
 		} else {
@@ -563,6 +569,20 @@ static void window_map_paint()
 
 	window_draw_widgets(w, dpi);
 
+	x = w->x + (window_map_widgets[WIDX_LAND_TOOL].left + window_map_widgets[WIDX_LAND_TOOL].right) / 2;
+	y = w->y + (window_map_widgets[WIDX_LAND_TOOL].top + window_map_widgets[WIDX_LAND_TOOL].bottom) / 2;
+
+	// FEATURE larger land tool size support
+	if ((RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) > 7) &&
+		(RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == WC_MAP)) {
+		RCT2_GLOBAL(0x009BC677, char) = FORMAT_BLACK;
+		RCT2_GLOBAL(0x009BC678, char) = FORMAT_COMMA16;
+		RCT2_GLOBAL(0x009BC679, char) = 0;
+		RCT2_GLOBAL(0x013CE952, sint16) = RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16);
+		gfx_draw_string_centred(dpi, 3165, x, y - 2, 0, (void*)0x013CE952);
+	}
+	y = w->y + window_map_widgets[WIDX_LAND_TOOL].bottom + 5;
+
 	// guest tab image (animated)
 	image_id = SPR_TAB_GUESTS_0;
 	if (w->selected_tab == 0)
@@ -606,8 +626,8 @@ static void window_map_paint()
 		}
 	} else {
 		if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE) &&
-			(RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) != WC_MAP) &&
-			(RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint8) != WIDX_SET_LAND_RIGHTS))
+			(RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == WC_MAP) &&
+			(RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint8) == WIDX_SET_LAND_RIGHTS))
 			return;
 
 		gfx_draw_string_left(dpi, STR_MAP_SIZE, 0, 0, w->x + 4, w->y + w->widgets[WIDX_MAP_SIZE_SPINNER].top + 1);
@@ -887,4 +907,4 @@ static void window_map_center_on_view_point()
 	w_map->scrolls[0].h_left = cx;
 	w_map->scrolls[0].v_top = dx;
 	widget_scroll_update_thumbs(w_map, WIDX_MAP);
-}
\ No newline at end of file
+}