Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision baaf6020b9638bbeddeaed4bc264f5a0034fe4ec)
+++ postlfs/editors/emacs.xml	(revision 00d040d74181f1a30ca5768d0ad2b274211ec944)
@@ -125,23 +125,6 @@
 rm -vf /usr/lib/systemd/user/emacs.service</userinput></screen>
 
-    <para>
-
-      This package installs icon files into the <filename
-      class="directory">/usr/share/icons/hicolor</filename> hierarchy and
-      desktop files into the <filename
-      class="directory">/usr/share/applications</filename> hierarchy. You
-      can improve system performance and memory usage by updating
-      <filename>/usr/share/icons/hicolor/icon-theme.cache</filename> and
-      <filename>/usr/share/applications/mimeinfo.cache</filename>. To
-      perform the update you must have <xref linkend="gtk2"/> or <xref
-      linkend="gtk3"/> installed (for the icon cache) and <xref
-      linkend="desktop-file-utils"/> (for the desktop cache) and issue
-      the following commands as the <systemitem
-      class="username">root</systemitem> user:
-
-    </para>
-
-<screen role="root"><userinput>gtk-update-icon-cache -t -f --include-image-data /usr/share/icons/hicolor &amp;&amp;
-update-desktop-database</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-update-icon-cache.xml"/>
 
   </sect2>
Index: x/icons/lxde-icon-theme.xml
===================================================================
--- x/icons/lxde-icon-theme.xml	(revision baaf6020b9638bbeddeaed4bc264f5a0034fe4ec)
+++ x/icons/lxde-icon-theme.xml	(revision 00d040d74181f1a30ca5768d0ad2b274211ec944)
@@ -110,5 +110,5 @@
     </para>
 
-<screen role="root"><userinput>gtk-update-icon-cache -qf /usr/share/icons/nuoveXT2</userinput></screen>
+<screen role="nodump"><userinput>gtk-update-icon-cache -qf /usr/share/icons/nuoveXT2</userinput></screen>
 
   </sect2>
Index: xincludes/gtk-update-icon-cache.xml
===================================================================
--- xincludes/gtk-update-icon-cache.xml	(revision baaf6020b9638bbeddeaed4bc264f5a0034fe4ec)
+++ xincludes/gtk-update-icon-cache.xml	(revision 00d040d74181f1a30ca5768d0ad2b274211ec944)
@@ -17,4 +17,4 @@
       </para>
 
-<screen role="root"><userinput>gtk-update-icon-cache -qtf /usr/share/icons/hicolor</userinput></screen>
+<screen role="nodump"><userinput>gtk-update-icon-cache -qtf /usr/share/icons/hicolor</userinput></screen>
     </note>
Index: xincludes/update-icons-and-desktop.xml
===================================================================
--- xincludes/update-icons-and-desktop.xml	(revision baaf6020b9638bbeddeaed4bc264f5a0034fe4ec)
+++ xincludes/update-icons-and-desktop.xml	(revision 00d040d74181f1a30ca5768d0ad2b274211ec944)
@@ -22,5 +22,5 @@
       </para>
 
-<screen role="root"><userinput>gtk-update-icon-cache -qtf /usr/share/icons/hicolor &amp;&amp;
+<screen role="nodump"><userinput>gtk-update-icon-cache -qtf /usr/share/icons/hicolor &amp;&amp;
 update-desktop-database -q</userinput></screen>
     </note>
Index: xsoft/other/xarchiver.xml
===================================================================
--- xsoft/other/xarchiver.xml	(revision baaf6020b9638bbeddeaed4bc264f5a0034fe4ec)
+++ xsoft/other/xarchiver.xml	(revision 00d040d74181f1a30ca5768d0ad2b274211ec944)
@@ -140,12 +140,7 @@
 <screen role="root"><userinput>make DOCDIR=/usr/share/doc/xarchiver-&xarchiver-version; install</userinput></screen>
 
-    <para>
-      If <xref linkend="desktop-file-utils"/> and <xref
-      linkend="hicolor-icon-theme"/> are installed, issue, as <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>update-desktop-database &amp;&amp;
-gtk-update-icon-cache -t -f --include-image-data /usr/share/icons/hicolor</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/update-icons-and-desktop.xml"/>
+
   </sect2>
 
