diff --git a/bin/replace_missing_fonts.sh b/bin/replace_missing_fonts.sh
index 7c676d30052a..f06e6b7a6c72 100755
--- a/bin/replace_missing_fonts.sh
+++ b/bin/replace_missing_fonts.sh
@@ -24,6 +24,13 @@ replacements["FreeSans"]="Noto Sans"
 replacements["DINPro-Medium"]="Noto Sans"
 replacements["Open Sans Light"]="Noto Sans"
 replacements["Lora - regular"]="Noto Sans"
+replacements["Tahoma"]="Noto Sans"
+replacements["Thorndale"]="Liberation Serif"
+replacements["Albany"]="Liberation Sans"
+replacements["Lucida Sans Unicode"]="Noto Sans"
+replacements["Candara"]="Noto Sans"
+replacements["Verdana"]="Noto Sans"
+replacements["Gill Sans MT"]="Noto Sans"
 
 extracted_folder=".temp_extracted"
 
diff --git a/sw/CppunitTest_sw_ooxmlexport5.mk b/sw/CppunitTest_sw_ooxmlexport5.mk
index 71eea4a09b69..cbb21cb34039 100644
--- a/sw/CppunitTest_sw_ooxmlexport5.mk
+++ b/sw/CppunitTest_sw_ooxmlexport5.mk
@@ -16,4 +16,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_ooxmlexport5, \
     svx \
 ))
 
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_ooxmlexport5,abort))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77727.docx b/sw/qa/extras/ooxmlexport/data/fdo77727.docx
index 9f553e210df6..db172b10bd26 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo77727.docx and b/sw/qa/extras/ooxmlexport/data/fdo77727.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77887.docx b/sw/qa/extras/ooxmlexport/data/fdo77887.docx
index cb3f4537dd86..c77ddb6fc07a 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo77887.docx and b/sw/qa/extras/ooxmlexport/data/fdo77887.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78420.docx b/sw/qa/extras/ooxmlexport/data/fdo78420.docx
index 6b253b189f5c..b81aa8bae0be 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo78420.docx and b/sw/qa/extras/ooxmlexport/data/fdo78420.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79822.docx b/sw/qa/extras/ooxmlexport/data/fdo79822.docx
index 2844671d607d..ee3966cabc52 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo79822.docx and b/sw/qa/extras/ooxmlexport/data/fdo79822.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt
index 35a1858e533e..55bc2f1c19d8 100644
Binary files a/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt and b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt differ