diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index cae053e090..b780e47238 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -851,7 +851,7 @@ static void window_map_paint(rct_window* w, rct_drawpixelinfo* dpi)
             for (uint32_t i = 0; i < std::size(RideKeyColours); i++)
             {
                 gfx_fill_rect(
-                    dpi, screenCoords.x, screenCoords.y + 2, screenCoords.x + 6, screenCoords.y + 8, RideKeyColours[i]);
+                    dpi, { screenCoords + ScreenCoordsXY{ 0, 2 }, screenCoords + ScreenCoordsXY{ 6, 8 } }, RideKeyColours[i]);
                 gfx_draw_string_left(dpi, mapLabels[i], w, COLOUR_BLACK, screenCoords + ScreenCoordsXY{ LIST_ROW_HEIGHT, 0 });
                 screenCoords.y += LIST_ROW_HEIGHT;
                 if (i == 3)
@@ -1060,11 +1060,8 @@ static void window_map_paint_peep_overlay(rct_drawpixelinfo* dpi)
             continue;
 
         MapCoordsXY c = window_map_transform_to_map_coords({ peep->x, peep->y });
-        int16_t left = c.x;
-        int16_t top = c.y;
-
-        int16_t right = left;
-        int16_t bottom = top;
+        auto leftTop = ScreenCoordsXY{ c.x, c.y };
+        auto rightBottom = leftTop;
 
         int16_t colour = PALETTE_INDEX_20;
 
@@ -1075,7 +1072,7 @@ static void window_map_paint_peep_overlay(rct_drawpixelinfo* dpi)
                 if ((gWindowMapFlashingFlags & (1 << 3)) != 0)
                 {
                     colour = PALETTE_INDEX_138;
-                    left--;
+                    leftTop.x--;
                     if ((gWindowMapFlashingFlags & (1 << 15)) == 0)
                         colour = PALETTE_INDEX_10;
                 }
@@ -1085,13 +1082,13 @@ static void window_map_paint_peep_overlay(rct_drawpixelinfo* dpi)
                 if ((gWindowMapFlashingFlags & (1 << 1)) != 0)
                 {
                     colour = PALETTE_INDEX_172;
-                    left--;
+                    leftTop.x--;
                     if ((gWindowMapFlashingFlags & (1 << 15)) == 0)
                         colour = PALETTE_INDEX_21;
                 }
             }
         }
-        gfx_fill_rect(dpi, left, top, right, bottom, colour);
+        gfx_fill_rect(dpi, { leftTop, rightBottom }, colour);
     }
 }
 
@@ -1113,7 +1110,7 @@ static void window_map_paint_train_overlay(rct_drawpixelinfo* dpi)
 
             MapCoordsXY c = window_map_transform_to_map_coords({ vehicle->x, vehicle->y });
 
-            gfx_fill_rect(dpi, c.x, c.y, c.x, c.y, PALETTE_INDEX_171);
+            gfx_fill_rect(dpi, { { c.x, c.y }, { c.x, c.y } }, PALETTE_INDEX_171);
         }
     }
 }
@@ -1135,26 +1132,27 @@ static void window_map_paint_hud_rectangle(rct_drawpixelinfo* dpi)
         return;
 
     auto offset = MiniMapOffsets[get_current_rotation()];
-    int16_t left = (viewport->viewPos.x >> 5) + offset.x;
-    int16_t right = ((viewport->viewPos.x + viewport->view_width) >> 5) + offset.x;
-    int16_t top = (viewport->viewPos.y >> 4) + offset.y;
-    int16_t bottom = ((viewport->viewPos.y + viewport->view_height) >> 4) + offset.y;
+    auto leftTop = ScreenCoordsXY{ (viewport->viewPos.x >> 5) + offset.x, (viewport->viewPos.y >> 4) + offset.y };
+    auto rightBottom = ScreenCoordsXY{ ((viewport->viewPos.x + viewport->view_width) >> 5) + offset.x,
+                                       ((viewport->viewPos.y + viewport->view_height) >> 4) + offset.y };
+    auto rightTop = ScreenCoordsXY{ rightBottom.x, leftTop.y };
+    auto leftBottom = ScreenCoordsXY{ leftTop.x, rightBottom.y };
 
     // top horizontal lines
-    gfx_fill_rect(dpi, left, top, left + 3, top, PALETTE_INDEX_56);
-    gfx_fill_rect(dpi, right - 3, top, right, top, PALETTE_INDEX_56);
+    gfx_fill_rect(dpi, { leftTop, leftTop + ScreenCoordsXY{ 3, 0 } }, PALETTE_INDEX_56);
+    gfx_fill_rect(dpi, { rightTop - ScreenCoordsXY{ 3, 0 }, rightTop }, PALETTE_INDEX_56);
 
     // left vertical lines
-    gfx_fill_rect(dpi, left, top, left, top + 3, PALETTE_INDEX_56);
-    gfx_fill_rect(dpi, left, bottom - 3, left, bottom, PALETTE_INDEX_56);
+    gfx_fill_rect(dpi, { leftTop, leftTop + ScreenCoordsXY{ 0, 3 } }, PALETTE_INDEX_56);
+    gfx_fill_rect(dpi, { leftBottom - ScreenCoordsXY{ 0, 3 }, leftBottom }, PALETTE_INDEX_56);
 
     // bottom horizontal lines
-    gfx_fill_rect(dpi, left, bottom, left + 3, bottom, PALETTE_INDEX_56);
-    gfx_fill_rect(dpi, right - 3, bottom, right, bottom, PALETTE_INDEX_56);
+    gfx_fill_rect(dpi, { leftBottom, leftBottom + ScreenCoordsXY{ 3, 0 } }, PALETTE_INDEX_56);
+    gfx_fill_rect(dpi, { rightBottom - ScreenCoordsXY{ 3, 0 }, rightBottom }, PALETTE_INDEX_56);
 
     // right vertical lines
-    gfx_fill_rect(dpi, right, top, right, top + 3, PALETTE_INDEX_56);
-    gfx_fill_rect(dpi, right, bottom - 3, right, bottom, PALETTE_INDEX_56);
+    gfx_fill_rect(dpi, { rightTop, rightTop + ScreenCoordsXY{ 0, 3 } }, PALETTE_INDEX_56);
+    gfx_fill_rect(dpi, { rightBottom - ScreenCoordsXY{ 0, 3 }, rightBottom }, PALETTE_INDEX_56);
 }
 
 /**