diff --git a/OpenRA.Game/Graphics/SpriteFont.cs b/OpenRA.Game/Graphics/SpriteFont.cs
index ec0e770b3c..0137b0a308 100644
--- a/OpenRA.Game/Graphics/SpriteFont.cs
+++ b/OpenRA.Game/Graphics/SpriteFont.cs
@@ -49,8 +49,8 @@ namespace OpenRA.Graphics
 			Func<char, float> characterWidth = character => glyphs[Pair.New(character, Color.White)].Advance;
 			lineWidth = line => line.Sum(characterWidth) / deviceScale;
 
-			PrecacheColor(Color.White, name);
-			PrecacheColor(Color.Red, name);
+			if (size <= 24)
+				PrecacheColor(Color.White, name);
 		}
 
 		public void SetScale(float scale)
diff --git a/OpenRA.Game/Renderer.cs b/OpenRA.Game/Renderer.cs
index 7e6b084b19..7bc5913376 100644
--- a/OpenRA.Game/Renderer.cs
+++ b/OpenRA.Game/Renderer.cs
@@ -84,7 +84,7 @@ namespace OpenRA
 			{
 				if (fontSheetBuilder != null)
 					fontSheetBuilder.Dispose();
-				fontSheetBuilder = new SheetBuilder(SheetType.BGRA);
+				fontSheetBuilder = new SheetBuilder(SheetType.BGRA, 512);
 				Fonts = modData.Manifest.Fonts.ToDictionary(x => x.Key,
 					x => new SpriteFont(x.Value.First, modData.DefaultFileSystem.Open(x.Value.First).ReadAllBytes(),
 										x.Value.Second, Device.WindowScale, fontSheetBuilder)).AsReadOnly();