diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
index f5463d4015..de59fc5c82 100644
--- a/src/gfx_layout.cpp
+++ b/src/gfx_layout.cpp
@@ -596,10 +596,8 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, const char *&str,
 			state.SetColour((TextColour)(c - SCC_BLUE));
 		} else if (c == SCC_PREVIOUS_COLOUR) { // Revert to the previous colour.
 			state.SetPreviousColour();
-		} else if (c == SCC_TINYFONT) {
-			state.SetFontSize(FS_SMALL);
-		} else if (c == SCC_BIGFONT) {
-			state.SetFontSize(FS_LARGE);
+		} else if (c >= SCC_FIRST_FONT && c <= SCC_LAST_FONT) {
+			state.SetFontSize((FontSize)(c - SCC_FIRST_FONT));
 		} else {
 			/* Filter out text direction characters that shouldn't be drawn, and
 			 * will not be handled in the fallback non ICU case because they are
diff --git a/src/strings.cpp b/src/strings.cpp
index fd7420259a..82669ddb23 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -2014,10 +2014,8 @@ bool MissingGlyphSearcher::FindMissingGlyphs(const char **str)
 		FontSize size = this->DefaultSize();
 		if (str != NULL) *str = text;
 		for (WChar c = Utf8Consume(&text); c != '\0'; c = Utf8Consume(&text)) {
-			if (c == SCC_TINYFONT) {
-				size = FS_SMALL;
-			} else if (c == SCC_BIGFONT) {
-				size = FS_LARGE;
+			if (c >= SCC_FIRST_FONT && c <= SCC_LAST_FONT) {
+				size = (FontSize)(c - SCC_FIRST_FONT);
 			} else if (!IsInsideMM(c, SCC_SPRITE_START, SCC_SPRITE_END) && IsPrintable(c) && !IsTextDirectionChar(c) && c != '?' && GetGlyph(size, c) == question_mark[size]) {
 				/* The character is printable, but not in the normal font. This is the case we were testing for. */
 				return true;
diff --git a/src/table/control_codes.h b/src/table/control_codes.h
index d6b1ad6f4e..ad620197a6 100644
--- a/src/table/control_codes.h
+++ b/src/table/control_codes.h
@@ -26,9 +26,13 @@ enum StringControlCode {
 	/* This must be the first entry. It's encoded in strings that are saved. */
 	SCC_ENCODED = SCC_CONTROL_START,
 
-	/* Display control codes */
-	SCC_TINYFONT,  ///< Switch to small font
-	SCC_BIGFONT,   ///< Switch to large font
+	/* Font selection codes, must be in same order as FontSize enum */
+	SCC_FIRST_FONT,
+	SCC_NORMALFONT = SCC_FIRST_FONT, ///< Switch to normal size font
+	SCC_TINYFONT,   ///< Switch to small font
+	SCC_BIGFONT,    ///< Switch to large font
+	SCC_MONOFONT,   ///< Switch to monospaced font
+	SCC_LAST_FONT = SCC_MONOFONT,
 
 	/* Formatting control codes */
 	SCC_REVISION,
diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h
index 322f1bc6bf..d4294fa84a 100644
--- a/src/table/strgen_tables.h
+++ b/src/table/strgen_tables.h
@@ -37,8 +37,10 @@ extern void EmitGender(Buffer *buffer, char *buf, int value);
 
 static const CmdStruct _cmd_structs[] = {
 	/* Font size */
+	{"NORMAL_FONT",       EmitSingleChar, SCC_NORMALFONT,         0, -1, C_NONE},
 	{"TINY_FONT",         EmitSingleChar, SCC_TINYFONT,           0, -1, C_NONE},
 	{"BIG_FONT",          EmitSingleChar, SCC_BIGFONT,            0, -1, C_NONE},
+	{"MONO_FONT",         EmitSingleChar, SCC_MONOFONT,           0, -1, C_NONE},
 
 	/* Colours */
 	{"BLUE",              EmitSingleChar, SCC_BLUE,               0, -1, C_DONTCOUNT},