diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp
index e8e7a2a6c8..09c9383d16 100644
--- a/src/openrct2/drawing/Font.cpp
+++ b/src/openrct2/drawing/Font.cpp
@@ -18,7 +18,7 @@
 
 static constexpr const int32_t SpriteFontLineHeight[] = { 6, 10, 10, 18 };
 
-static uint8_t _spriteFontCharacterWidths[896];
+static uint8_t _spriteFontCharacterWidths[FONT_SIZE_COUNT * FONT_SPRITE_GLYPH_COUNT];
 
 #ifndef NO_TTF
 TTFFontSetDescriptor *gCurrentTTFFontSet;
diff --git a/src/openrct2/drawing/Font.h b/src/openrct2/drawing/Font.h
index 90b0f0f32b..78a9ce2629 100644
--- a/src/openrct2/drawing/Font.h
+++ b/src/openrct2/drawing/Font.h
@@ -25,10 +25,10 @@ enum {
     FONT_SPRITE_BASE_MEDIUM_EXTRA_DARK = -2,
     FONT_SPRITE_BASE_MEDIUM_DARK = -1,
 
-    FONT_SPRITE_BASE_TINY = 448,
-    FONT_SPRITE_BASE_SMALL = 0,
-    FONT_SPRITE_BASE_MEDIUM = 224,
-    FONT_SPRITE_BASE_BIG = 672
+    FONT_SPRITE_BASE_TINY = FONT_SIZE_TINY * FONT_SPRITE_GLYPH_COUNT,
+    FONT_SPRITE_BASE_SMALL = FONT_SIZE_SMALL * FONT_SPRITE_GLYPH_COUNT,
+    FONT_SPRITE_BASE_MEDIUM = FONT_SIZE_MEDIUM * FONT_SPRITE_GLYPH_COUNT,
+    FONT_SPRITE_BASE_BIG = FONT_SIZE_BIG * FONT_SPRITE_GLYPH_COUNT
 };
 
 #ifndef NO_TTF