diff --git a/platform/base_scripts.pk3dir/fonts/menu_header.font b/platform/base_scripts.pk3dir/fonts/menu_header.font
index f5c0e38b..bdb00899 100644
--- a/platform/base_scripts.pk3dir/fonts/menu_header.font
+++ b/platform/base_scripts.pk3dir/fonts/menu_header.font
@@ -1,2 +1,3 @@
-rendersize "16 21"
-path gfx/shell/arialbd.ttf
\ No newline at end of file
+rendersize "21 16"
+path gfx/shell/arialbd.ttf
+size 16
\ No newline at end of file
diff --git a/platform/base_scripts.pk3dir/fonts/menu_main.font b/platform/base_scripts.pk3dir/fonts/menu_main.font
index 88c40f60..df0bb413 100644
--- a/platform/base_scripts.pk3dir/fonts/menu_main.font
+++ b/platform/base_scripts.pk3dir/fonts/menu_main.font
@@ -1,2 +1,3 @@
 rendersize "14 11 12"
-path gfx/shell/arial.ttf
\ No newline at end of file
+path gfx/shell/arial.ttf
+size 12
\ No newline at end of file
diff --git a/src/client/font.qc b/src/client/font.qc
index 6803932a..4c546ddc 100644
--- a/src/client/font.qc
+++ b/src/client/font.qc
@@ -29,7 +29,7 @@ Font_Load(string strFile, font_s &fntNew)
 
 	filestream fileFont = fopen(strFile, FILE_READ);
 	fntNew.iID = 0;
-	fntNew.iScaleX = fntNew.iScaleY = 8;
+	fntNew.iScaleX = fntNew.iScaleY = -1;
 	fntNew.vecColor = [1,1,1];
 	fntNew.flAlpha = 1.0f;
 	fntNew.iFlags = 0;
@@ -72,7 +72,11 @@ Font_Load(string strFile, font_s &fntNew)
 		}
 		fclose(fileFont);
 	} else {
-		error(sprintf("[MENU] Cannot load font file %s!", strFile));
+		error(sprintf("[FONT] Cannot load font file %s!", strFile));
+	}
+
+	if (!fntNew.iScaleX || !fntNew.iScaleY) {
+		error(sprintf("[FONT] No valid size defined for %s!", strFile));
 	}
 
 	//print(sprintf("[FONT] %s: %s %s\n", strFile, strFontPath, strRenderSize));
@@ -88,6 +92,7 @@ Font_DrawText(vector vecOrigin, string strText, font_s fnt)
 {
 	drawfont = (float)fnt.iID;
 	drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], fnt.vecColor, fnt.flAlpha, (float)fnt.iFlags);
+	drawfont = 0;
 }
 
 void
@@ -95,6 +100,7 @@ Font_DrawText_A(vector vecOrigin, string strText, vector rgb, float a, font_s fn
 {
 	drawfont = (float)fnt.iID;
 	drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], fnt.vecColor, a, (float)fnt.iFlags);
+	drawfont = 0;
 }
 
 void
@@ -102,6 +108,7 @@ Font_DrawText_RGB(vector vecOrigin, string strText, vector rgb, font_s fnt)
 {
 	drawfont = (float)fnt.iID;
 	drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], rgb, fnt.flAlpha, (float)fnt.iFlags);
+	drawfont = 0;
 }
 
 void
@@ -109,13 +116,18 @@ Font_DrawText_RGBA(vector vecOrigin, string strText, vector rgb, float a, font_s
 {
 	drawfont = (float)fnt.iID;
 	drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], rgb, a, (float)fnt.iFlags);
+	drawfont = 0;
 }
 
 void
 Font_DrawField(vector vecOrigin, vector vecSize, string strText, font_s fnt, int iAlignFlags)
 {
 	drawfont = (float)fnt.iID;
+	drawfontscale[0] = (float)fnt.iScaleX / 8;
+	drawfontscale[1] = (float)fnt.iScaleY / 8;
 	drawtextfield(vecOrigin, vecSize, (float)iAlignFlags, strText);
+	drawfont = 0;
+	drawfontscale = [1,1,0];
 }
 
 string
diff --git a/src/menu-fn/w_label.qc b/src/menu-fn/w_label.qc
index a661c7f0..6e880b48 100644
--- a/src/menu-fn/w_label.qc
+++ b/src/menu-fn/w_label.qc
@@ -62,15 +62,14 @@ WLabel_StaticR(int x, int y, string msg, int sx, int sy, vector col,
 	x += g_menuofs[0] - stringwidth(msg, TRUE,[sx,sy]);
 	y += g_menuofs[1];
 	drawstring([x,y], msg, [sx,sy], col, alpha, flags);
+	drawfont = 0;
 }
 
 void
 WField_Static(int x, int y, string msg, int sx, int sy, vector col,
 				float alpha, float flags, font_s font)
 {
-	drawfont = Font_GetID(font);
 	x += g_menuofs[0];
 	y += g_menuofs[1];
-	drawtextfield([x,y], [sx,sy], flags, sprintf("%s%s", 
-				  Colors_RGB8_to_HEX(col), msg));
+	Font_DrawField([x,y], [sx,sy], sprintf("%s%s", Colors_RGB8_to_HEX(col), msg), font, (int)flags);
 }