diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d5a94b01b6..458650f144 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2668,13 +2668,10 @@ HID_OFAPAGE_AUTOFORMAT_CLB,35075,
 HID_OFAPAGE_MSFLTR2_CLB,35146,
 HID_OFAPAGE_SMARTTAG_OPTIONS,35155,
 HID_OFA_CONNPOOL_DRIVERLIST,35149,
-HID_OFA_FONT_SUBSTITUTION,35083,
 HID_OFA_FONT_SUBST_CLB,35084,
 HID_OFA_HYPERLINK_NAME,35079,
 HID_OFA_HYPERLINK_TARGET,35053,
 HID_OFA_HYPERLINK_URL,35081,
-HID_OFA_SUBST_APPLY,35085,
-HID_OFA_SUBST_DELETE,35086,
 HID_OFA_TP_LANGUAGES,35147,
 HID_OFA_TP_MEMORY,35152,
 HID_OFA_TP_MISC,35036,
diff --git a/source/text/shared/optionen/01010700.xhp b/source/text/shared/optionen/01010700.xhp
index 9cd4402791..af6bf74d9d 100644
--- a/source/text/shared/optionen/01010700.xhp
+++ b/source/text/shared/optionen/01010700.xhp
@@ -33,22 +33,21 @@
 <bookmark_value>Basic; fonts for source display</bookmark_value>
 <bookmark_value>fonts;for HTML and Basic</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_FONT_SUBSTITUTION" id="bm_id3147209" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/OptFontsPage" id="bm_id3147209" localize="false"/>
 <paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010700.xhp" name="Fonts">Fonts</link></paragraph>
-<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_OFA_FONT_SUBSTITUTION">Substitutes a font with a font of your choice. The substitution replaces a font only when it is displayed on screen, or on screen and when printing. The replacement does not change the font settings that are saved in the document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="cui/ui/optfontspage/replacements">Substitutes a font with a font of your choice. The substitution replaces a font only when it is displayed on screen, or on screen and when printing. The replacement does not change the font settings that are saved in the document.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="46">If you want, you can override the default substitution font that your operating system uses when it encounters an unavailable font in a document.</paragraph>
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#schriers"/>
 </section>
 <paragraph role="note" id="par_id3145610" xml-lang="en-US" l10n="U" oldref="25">Font replacement also affects the display of fonts on the $[officename] user interface.</paragraph>
-<!-- removed HID OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE -->
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE" id="bm_id1615039" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/usetable" id="bm_id1615039" localize="false"/>
 <paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="2" l10n="U" oldref="3">Apply replacement table</paragraph>
-<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="OFFMGR:CHECKBOX:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE">Enables the font replacement settings that you define.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_FONT_SUBST_CLB" id="bm_id3150360" localize="false"/>
+<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="cui/ui/optfontspage/usetable">Enables the font replacement settings that you define.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/checklb" id="bm_id3150360" localize="false"/>
 <paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="2" l10n="U" oldref="4">Replacement table</paragraph>
-<paragraph role="paragraph" id="par_id3154073" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="HID_OFA_FONT_SUBST_CLB">Lists the original font and the font that will replace it. Select <emph>Always</emph> to replace the font, even if the original font is installed on your system. Select <emph>Screen only </emph>to replace the screen font only and never replace the font for printing.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154073" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="cui/ui/optfontspage/checklb">Lists the original font and the font that will replace it. Select <emph>Always</emph> to replace the font, even if the original font is installed on your system. Select <emph>Screen only </emph>to replace the screen font only and never replace the font for printing.</ahelp></paragraph>
 <table id="tbl_id0520200803425582">
 <tablerow>
 <tablecell>
@@ -107,17 +106,15 @@
 </tablerow>
 </table>
 
-<!-- removed HID OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT1 -->
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1" id="bm_id8428907" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/font1" id="bm_id8428907" localize="false"/>
 <paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="2" l10n="U" oldref="9">Font</paragraph>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT1">Enter or select the name of the font that you want to replace.</ahelp></paragraph>
-<!-- removed HID OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2 -->
-<bookmark xml-lang="en-US" branch="hid/cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2" id="bm_id1337321" localize="false"/>
+<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="cui/ui/optfontspage/font1">Enter or select the name of the font that you want to replace.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/font2" id="bm_id1337321" localize="false"/>
 <paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="2" l10n="U" oldref="10">Replace with</paragraph>
-<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR:COMBOBOX:RID_SVX_FONT_SUBSTITUTION:CB_FONT2">Enter or select the name of the replacement font.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_SUBST_APPLY" id="bm_id3150010" localize="false"/>
+<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="cui/ui/optfontspage/font2">Enter or select the name of the replacement font.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/apply" id="bm_id3150010" localize="false"/>
 <paragraph role="heading" id="hd_id3153363" xml-lang="en-US" level="2" l10n="U" oldref="11">Apply</paragraph>
-<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_OFA_SUBST_APPLY">Applies the selected font replacement.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="cui/ui/optfontspage/apply">Applies the selected font replacement.</ahelp></paragraph>
 <table id="tbl_id3151116">
 <tablerow>
 <tablecell>
@@ -131,9 +128,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFA_SUBST_DELETE" id="bm_id3148647" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/delete" id="bm_id3148647" localize="false"/>
 <paragraph role="heading" id="hd_id3147443" xml-lang="en-US" level="2" l10n="U" oldref="12">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_OFA_SUBST_DELETE">Deletes the selected font replacement.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="cui/ui/optfontspage/delete">Deletes the selected font replacement.</ahelp></paragraph>
 <table id="tbl_id3148456">
 <tablerow>
 <tablecell>
@@ -149,17 +146,14 @@
 
 <paragraph role="heading" id="hd_id3150715" xml-lang="en-US" level="2" l10n="U" oldref="52">Font settings for HTML and Basic sources</paragraph>
 <paragraph role="paragraph" id="par_id3153950" xml-lang="en-US" l10n="U" oldref="53">Select the font and font size for the display of HTML and Basic source code.</paragraph>
-<!-- removed HID OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME -->
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME" id="bm_id4237800" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/fontname" id="bm_id4237800" localize="false"/>
 <paragraph role="heading" id="hd_id3153838" xml-lang="en-US" level="3" l10n="U" oldref="54">Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3146990" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME">Select the font for the display of HTML and Basic source code.</ahelp> Select <emph>Automatic</emph> to detect a suitable font automatically.</paragraph>
-<!-- removed HID OFFMGR_CHECKBOX_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP -->
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP" id="bm_id1382183" localize="false"/>
+<paragraph role="paragraph" id="par_id3146990" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="cui/ui/optfontspage/fontname">Select the font for the display of HTML and Basic source code.</ahelp> Select <emph>Automatic</emph> to detect a suitable font automatically.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/nonpropfontonly" id="bm_id1382183" localize="false"/>
 <paragraph role="heading" id="hd_id3146791" xml-lang="en-US" level="3" l10n="U" oldref="56">Non-proportional fonts only</paragraph>
-<paragraph role="paragraph" id="par_id3154362" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="OFFMGR_CHECKBOX_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP">Check to display only non-proportional fonts in the <emph>Fonts</emph> list box.</ahelp></paragraph>
-<!-- removed HID OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT -->
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT" id="bm_id6423841" localize="false"/>
+<paragraph role="paragraph" id="par_id3154362" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="cui/ui/optfontspage/nonpropfontonl">Check to display only non-proportional fonts in the <emph>Fonts</emph> list box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfontspage/fontheight" id="bm_id6423841" localize="false"/>
 <paragraph role="heading" id="hd_id3153765" xml-lang="en-US" level="3" l10n="U" oldref="58">Size</paragraph>
-<paragraph role="paragraph" id="par_id3150323" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="OFFMGR_LISTBOX_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT">Select a font size for the display of HTML and Basic source code.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150323" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="cui/ui/optfontspage/fontheight">Select a font size for the display of HTML and Basic source code.</ahelp></paragraph>
 </body>
 </helpdocument>