diff --git a/bin/replace_missing_fonts.sh b/bin/replace_missing_fonts.sh
index 3dd078dc89e5..7c676d30052a 100755
--- a/bin/replace_missing_fonts.sh
+++ b/bin/replace_missing_fonts.sh
@@ -2,28 +2,28 @@
 
 declare -A replacements
 replacements["Agency FB"]="Noto Sans"
-replacements["Noto Sans Light"]="Noto Sans"
 replacements["Segoe UI"]="Noto Sans"
 replacements["Univers 45 Light"]="Noto Sans"
 replacements["Trebuchet MS"]="Noto Sans"
-replacements["Georgia"]="Noto Serif"
 replacements["Perpetua"]="Noto Sans"
-replacements["Garamond"]="Noto Serif"
 replacements["Calibri Light"]="Noto Sans"
-replacements["Consolas"]="DejaVu Sans Mono"
-replacements["Verdana"]="Noto Sans"
 replacements["Rockwell"]="Noto Sans"
-replacements["Tms Rmn"]="DejaVu Sans"
-replacements["Tahoma"]="Noto Sans"
 replacements["DFKai-SB"]="Noto Sans"
 replacements["Gill Sans MT"]="Noto Sans"
-replacements["Helvetica"]="Liberation Sans"
-replacements["Liberation Serif"]="DejaVu Sans"
 replacements["BentonSans Medium"]="Noto Sans"
 replacements["BentonSans"]="Noto Sans"
 replacements["AdvPS88D1"]="Noto Sans"
 replacements["NexusSansOT"]="Noto Sans"
 replacements["Segoe Script"]="Noto Sans"
+replacements["Impact"]="Noto Sans"
+replacements["Century Gothic"]="Noto Sans"
+replacements["Kings Caslon Text"]="Noto Sans"
+replacements["Times"]="Liberation Serif"
+replacements["Jokerman"]="Noto Sans"
+replacements["FreeSans"]="Noto Sans"
+replacements["DINPro-Medium"]="Noto Sans"
+replacements["Open Sans Light"]="Noto Sans"
+replacements["Lora - regular"]="Noto Sans"
 
 extracted_folder=".temp_extracted"
 
@@ -31,7 +31,7 @@ for file in $(find "$1" -type f); do
     file_name=$(basename "$file")
     current_extension="${file_name##*.}"
 
-    if [[ $current_extension == "docx" || $current_extension == "xlsx" || $current_extension == "pptx" ]]; then
+    if [[ $current_extension == "docx" || $current_extension == "xlsx" || $current_extension == "pptx" || $current_extension == "odt" ]]; then
         base_name="${file_name%.*}"
 
         # move the file to a new .zip file
diff --git a/sw/CppunitTest_sw_ooxmlexport6.mk b/sw/CppunitTest_sw_ooxmlexport6.mk
index 9b3ebe18146c..bad555c42bb9 100644
--- a/sw/CppunitTest_sw_ooxmlexport6.mk
+++ b/sw/CppunitTest_sw_ooxmlexport6.mk
@@ -11,4 +11,8 @@
 
 $(eval $(call sw_ooxmlexport_test,6))
 
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_ooxmlexport6,abort))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/ooxmlexport/data/TestVMLData.docx b/sw/qa/extras/ooxmlexport/data/TestVMLData.docx
index a2f89b146c7e..25dd8d4d36e1 100644
Binary files a/sw/qa/extras/ooxmlexport/data/TestVMLData.docx and b/sw/qa/extras/ooxmlexport/data/TestVMLData.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo74110.docx b/sw/qa/extras/ooxmlexport/data/fdo74110.docx
index 6b7ab0e415c2..105522971d2b 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo74110.docx and b/sw/qa/extras/ooxmlexport/data/fdo74110.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/gradient-fill-preservation.docx b/sw/qa/extras/ooxmlexport/data/gradient-fill-preservation.docx
index c9abc10d2922..8bb32e5fe43b 100644
Binary files a/sw/qa/extras/ooxmlexport/data/gradient-fill-preservation.docx and b/sw/qa/extras/ooxmlexport/data/gradient-fill-preservation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/image_data.docx b/sw/qa/extras/ooxmlexport/data/image_data.docx
index a2f89b146c7e..08d0eb841643 100644
Binary files a/sw/qa/extras/ooxmlexport/data/image_data.docx and b/sw/qa/extras/ooxmlexport/data/image_data.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf119054.docx b/sw/qa/extras/ooxmlexport/data/tdf119054.docx
index 9c3657c24a97..f57fe7b7549c 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf119054.docx and b/sw/qa/extras/ooxmlexport/data/tdf119054.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf128752.docx b/sw/qa/extras/ooxmlexport/data/tdf128752.docx
index 0e49291414d7..d5d7552053f5 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf128752.docx and b/sw/qa/extras/ooxmlexport/data/tdf128752.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf132514.docx b/sw/qa/extras/ooxmlexport/data/tdf132514.docx
index d32f84104e26..bd18d8a2f592 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf132514.docx and b/sw/qa/extras/ooxmlexport/data/tdf132514.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf153891.docx b/sw/qa/extras/ooxmlexport/data/tdf153891.docx
index 6fe8092982b6..876c0bb50ae9 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf153891.docx and b/sw/qa/extras/ooxmlexport/data/tdf153891.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf93676-1.odt b/sw/qa/extras/ooxmlexport/data/tdf93676-1.odt
index 37d621b903cd..26f186e37955 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf93676-1.odt and b/sw/qa/extras/ooxmlexport/data/tdf93676-1.odt differ
diff --git a/sw/qa/extras/ooxmlexport/data/testOuterShdw.docx b/sw/qa/extras/ooxmlexport/data/testOuterShdw.docx
index cc559a323c9a..19b7e57b71f3 100644
Binary files a/sw/qa/extras/ooxmlexport/data/testOuterShdw.docx and b/sw/qa/extras/ooxmlexport/data/testOuterShdw.docx differ