diff --git a/docs/interface_guidelines/haiku.css b/docs/interface_guidelines/haiku.css
index cdd108d91d..ed5c6a99a7 100644
--- a/docs/interface_guidelines/haiku.css
+++ b/docs/interface_guidelines/haiku.css
@@ -12,7 +12,7 @@
 }
 cmdsynopsis, code, command, computeroutput, envar, filename, keycode, keysym,
 literal, option, parameter, sgmltag, systemitem {
-	font-family: "Noto Mono", Courier, "Courier New", monospace, fixed;
+	font-family: "Noto Sans Mono", Courier, "Courier New", monospace, fixed;
 }
 term {
   font-weight: bold;
diff --git a/src/kits/network/libnetapi/GopherRequest.cpp b/src/kits/network/libnetapi/GopherRequest.cpp
index 8b4bf68555..16122279bd 100644
--- a/src/kits/network/libnetapi/GopherRequest.cpp
+++ b/src/kits/network/libnetapi/GopherRequest.cpp
@@ -143,7 +143,7 @@ static const char *kStyleSheet = "\n"
 "body#gopher span {\n"
 "	margin-left: 1em;\n"
 "	padding-left: 2em;\n"
-"	font-family: 'Noto Mono', Courier, monospace;\n"
+"	font-family: 'Noto Sans Mono', Courier, monospace;\n"
 "	word-wrap: break-word;\n"
 "	white-space: pre-wrap; }\n"
 "\n"
diff --git a/src/servers/app/ServerConfig.h b/src/servers/app/ServerConfig.h
index 6d1dd65d99..a58b5eda43 100644
--- a/src/servers/app/ServerConfig.h
+++ b/src/servers/app/ServerConfig.h
@@ -35,7 +35,7 @@
 #define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT"
 #define DEFAULT_BOLD_FONT_STYLE "Bold"
 #define DEFAULT_BOLD_FONT_SIZE 12.0f
-#define DEFAULT_FIXED_FONT_FAMILY "Noto Mono"
+#define DEFAULT_FIXED_FONT_FAMILY "Noto Sans Mono"
 #define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT"
 #define DEFAULT_FIXED_FONT_STYLE "Regular"
 #define DEFAULT_FIXED_FONT_SIZE 12.0f
diff --git a/src/servers/app/font/FontManager.cpp b/src/servers/app/font/FontManager.cpp
index 9bdee12669..5ae176dd33 100644
--- a/src/servers/app/font/FontManager.cpp
+++ b/src/servers/app/font/FontManager.cpp
@@ -342,8 +342,8 @@ FontManager::_LoadRecentFontMappings()
 		_AddDefaultMapping("Noto Sans Display", "Bold", veraFontPath.Path());
 
 		veraFontPath.SetTo(ttfontsPath.Path());
-		veraFontPath.Append("NotoMono-Regular.ttf");
-		_AddDefaultMapping("Noto Mono", "Regular", veraFontPath.Path());
+		veraFontPath.Append("NotoSansMono-Regular.ttf");
+		_AddDefaultMapping("Noto Sans Mono", "Regular", veraFontPath.Path());
 
 		return true;
 	}