diff --git a/bin/replace_string_in_zip.sh b/bin/replace_string_in_zip.sh
index 184f37835bc7..5fcee528edc3 100755
--- a/bin/replace_string_in_zip.sh
+++ b/bin/replace_string_in_zip.sh
@@ -23,6 +23,7 @@ replacements["BentonSans Medium"]="Noto Sans"
 replacements["BentonSans"]="Noto Sans"
 replacements["AdvPS88D1"]="Noto Sans"
 replacements["NexusSansOT"]="Noto Sans"
+replacements["Segoe Script"]="Noto Sans"
 
 extracted_folder=".temp_extracted"
 
diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk
index b228ef1d0625..5d47c6ba0345 100644
--- a/sw/CppunitTest_sw_ooxmlw14export.mk
+++ b/sw/CppunitTest_sw_ooxmlw14export.mk
@@ -46,4 +46,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlw14export,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlw14export))
 
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_ooxmlw14export,abort))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx b/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx
index 7233104764bc..b1952d41b910 100644
Binary files a/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx and b/sw/qa/extras/ooxmlexport/data/TextEffects_StylisticSets_CntxtAlts.docx differ