[gimp-help-2] Introduce more icon button images. Clean-ups.



commit f47a5072bcff8b4d79408993bd1804496b5d85f8
Author: SimaMoto,RyôTa <liangtai s4 gmail com>
Date:   Sun Jan 10 01:14:01 2010 +0900

    Introduce more icon button images. Clean-ups.
    
    Signed-off-by: Ulf-D. Ehlert <ulfehlert svn gnome org>

 images/C/dialogs/stock-color-picker-black-18.png   |  Bin 0 -> 527 bytes
 images/C/dialogs/stock-color-picker-gray-18.png    |  Bin 0 -> 546 bytes
 images/C/dialogs/stock-color-picker-white-18.png   |  Bin 0 -> 548 bytes
 images/C/dialogs/stock-edit-clear-16.png           |  Bin 0 -> 761 bytes
 images/C/dialogs/stock-fileopen-16.png             |  Bin 0 -> 601 bytes
 images/C/dialogs/stock-flip-horizontal-16.png      |  Bin 0 -> 418 bytes
 images/C/dialogs/stock-gtk-add-16.png              |  Bin 0 -> 409 bytes
 images/C/dialogs/stock-histogram-linear-16.png     |  Bin 0 -> 409 bytes
 .../C/dialogs/stock-histogram-logarithmic-16.png   |  Bin 0 -> 377 bytes
 images/C/dialogs/stock-image-16.png                |  Bin 0 -> 546 bytes
 images/C/dialogs/stock-layer-16.png                |  Bin 0 -> 647 bytes
 images/C/dialogs/stock-path-16.png                 |  Bin 0 -> 412 bytes
 images/C/dialogs/stock-path-stroke-16.png          |  Bin 0 -> 728 bytes
 images/C/dialogs/stock-redo-16.png                 |  Bin 0 -> 552 bytes
 images/C/dialogs/stock-reload-16.png               |  Bin 0 -> 907 bytes
 images/C/dialogs/stock-remove-16.png               |  Bin 0 -> 230 bytes
 images/C/dialogs/stock-reset-16.png                |  Bin 0 -> 451 bytes
 images/C/dialogs/stock-revert-16.png               |  Bin 0 -> 822 bytes
 images/C/dialogs/stock-save-16.png                 |  Bin 0 -> 829 bytes
 images/C/dialogs/stock-undo-16.png                 |  Bin 0 -> 576 bytes
 images/C/dialogs/stock-zoom-best-fit-16.png        |  Bin 0 -> 877 bytes
 images/C/dialogs/stock-zoom-in-16.png              |  Bin 0 -> 836 bytes
 images/C/dialogs/stock-zoom-original-16.png        |  Bin 0 -> 837 bytes
 images/C/dialogs/stock-zoom-out-16.png             |  Bin 0 -> 819 bytes
 src/concepts/brushes.xml                           |    4 +-
 src/concepts/fonts-and-text.xml                    |   37 +++--
 src/concepts/gradients.xml                         |   30 ++---
 src/concepts/image-types.xml                       |   47 +++----
 src/concepts/layer-modes.xml                       |   22 +---
 src/concepts/layers.xml                            |    8 +-
 src/concepts/palettes.xml                          |   38 ++---
 src/concepts/plugins.xml                           |   31 ++---
 src/concepts/undo.xml                              |   11 +-
 src/dialogs/brushes-dialog.xml                     |   28 ++++-
 src/dialogs/channel-menu.xml                       |   11 +-
 src/dialogs/channel-selection-mask.xml             |   18 +--
 src/dialogs/device-status-dialog.xml               |   21 ++--
 src/dialogs/dialogs-content.xml                    |    7 +-
 src/dialogs/dialogs-management.xml                 |    7 +-
 src/dialogs/dialogs-misc.xml                       |    7 +-
 src/dialogs/dialogs-structure.xml                  |    7 +-
 src/dialogs/dialogs_introduction.xml               |   10 +-
 src/dialogs/document-dialog.xml                    |   42 ++++--
 src/dialogs/error-console.xml                      |   43 ++++---
 src/dialogs/fonts-dialog.xml                       |   10 +-
 src/dialogs/gradient-dialog.xml                    |   29 +++-
 src/dialogs/gradient-editor-dialog.xml             |   48 +++++--
 src/dialogs/histogram-dialog.xml                   |   27 +++--
 src/dialogs/indexed-palette-dialog.xml             |    9 +-
 src/dialogs/layer-mask.xml                         |   19 +--
 src/dialogs/navigation-dialog.xml                  |   36 +++--
 src/dialogs/palettes-dialog.xml                    |   99 +++++++++++--
 src/dialogs/path-dialog.xml                        |   27 +++-
 src/dialogs/patterns-dialog.xml                    |   31 +++--
 src/dialogs/pointer-dialog.xml                     |   55 ++------
 src/dialogs/sample-points.xml                      |   44 ++-----
 src/dialogs/templates-dialog.xml                   |   36 +++++-
 src/dialogs/tools-dialog.xml                       |   15 ++-
 src/dialogs/undo-history-dialog.xml                |   16 ++-
 src/filters/alpha-to-logo/alien-glow.xml           |    4 +-
 src/filters/alpha-to-logo/alien-neon.xml           |    4 +-
 src/filters/alpha-to-logo/chrome.xml               |   65 ++++-----
 src/filters/alpha-to-logo/frosty.xml               |   65 ++++-----
 src/filters/artistic.xml                           |    7 +-
 src/filters/artistic/introduction.xml              |    7 +-
 src/filters/artistic/oilify.xml                    |   45 +++----
 src/filters/artistic/photocopy.xml                 |   47 +++----
 src/filters/artistic/vangogh-lic.xml               |  145 +++++++------------
 src/filters/combine.xml                            |    7 +-
 src/filters/decor.xml                              |    7 +-
 src/filters/decor/fuzzyborder.xml                  |    8 +-
 src/filters/enhance/destripe.xml                   |    8 +-
 src/filters/light_effects/flarefx.xml              |   16 +--
 src/filters/light_effects/gflare.xml               |   35 +++--
 src/filters/light_effects/lighting.xml             |   13 +--
 src/filters/light_effects/perspective-shadow.xml   |    4 +-
 src/filters/map.xml                                |    7 +-
 src/filters/map/illusion.xml                       |    4 +-
 src/filters/map/introduction.xml                   |   16 +-
 src/filters/map/make-seamless.xml                  |   32 ++--
 src/filters/map/tile.xml                           |   66 ++++-----
 src/filters/map/warp.xml                           |   38 ++++--
 src/filters/noise.xml                              |    7 +-
 src/filters/noise/pick.xml                         |    6 +-
 src/filters/render.xml                             |    7 +-
 src/filters/render/fractalexplorer.xml             |    6 +-
 src/filters/render/maze.xml                        |    5 +-
 src/filters/render/spheredesigner.xml              |   47 +++----
 src/help-missing.xml                               |   16 +--
 src/introduction/whats-new.xml                     |    8 +-
 src/menus/colors/auto.xml                          |    6 +-
 src/menus/colors/components/channel-mixer.xml      |    5 +-
 src/menus/colors/components/decompose.xml          |    6 +-
 src/menus/colors/map/rotate-colormap.xml           |    8 +-
 src/menus/colors/vinvert.xml                       |    4 +-
 src/menus/edit/introduction.xml                    |    4 +-
 src/menus/filters/reshow.xml                       |   18 ++-
 src/menus/help/about.xml                           |    4 +-
 src/menus/help/gimp-online.xml                     |    6 +-
 src/menus/help/plug-in-browser.xml                 |    4 +-
 src/menus/layer/alpha-selection-add.xml            |    4 +-
 src/menus/layer/threshold-alpha.xml                |    4 +-
 src/menus/view/fullscreen.xml                      |    7 +-
 src/menus/view/introduction.xml                    |    4 +-
 src/toolbox/other-tools.xml                        |    7 +-
 src/toolbox/tool-blend.xml                         |   82 ++++++------
 src/toolbox/tool-brush.xml                         |   17 ++-
 src/toolbox/tool-bucket-fill.xml                   |   36 +++--
 src/toolbox/tool-convolve.xml                      |   10 +-
 src/toolbox/tool-curves.xml                        |   13 ++-
 src/toolbox/tool-fuzzy-select.xml                  |   41 ++----
 src/toolbox/tool-hue-saturation.xml                |    4 +-
 src/toolbox/tool-levels.xml                        |   74 +++++++----
 src/toolbox/tool-measure.xml                       |   13 +-
 src/toolbox/tool-move.xml                          |   18 ++-
 src/toolbox/tool-path.xml                          |   11 +-
 src/toolbox/tool-perspective.xml                   |   20 ++--
 src/toolbox/tool-posterize.xml                     |   18 +--
 src/toolbox/tool-rect-select.xml                   |   21 ++--
 src/toolbox/tool-scale.xml                         |    4 +-
 src/toolbox/tool-shear.xml                         |   10 +-
 src/toolbox/tool-text.xml                          |   12 ++-
 src/toolbox/tools-color.xml                        |    7 +-
 src/toolbox/tools-paint.xml                        |    7 +-
 src/using/animated-brushes.xml                     |   13 +-
 src/using/brushes.xml                              |   12 +-
 src/using/fileformats.xml                          |   14 +-
 src/using/fonts-and-text.xml                       |    3 +
 src/using/layers.xml                               |    7 +-
 src/using/paths.xml                                |   12 +-
 src/using/photography.xml                          |   87 +++---------
 src/using/preferences/prefs-default-grid.xml       |   14 +-
 src/using/preferences/prefs-environment.xml        |   18 +--
 src/using/preferences/prefs-folders-data.xml       |   16 ++-
 src/using/preferences/prefs-folders.xml            |   10 +-
 .../preferences/prefs-image-window-appearance.xml  |   14 +-
 src/using/setup.xml                                |    7 +-
 src/using/shortcuts.xml                            |   22 +--
 src/using/variable-size-brush.xml                  |   65 ++++-----
 139 files changed, 1242 insertions(+), 1263 deletions(-)
---
diff --git a/images/C/dialogs/stock-color-picker-black-18.png b/images/C/dialogs/stock-color-picker-black-18.png
new file mode 100644
index 0000000..6505a94
Binary files /dev/null and b/images/C/dialogs/stock-color-picker-black-18.png differ
diff --git a/images/C/dialogs/stock-color-picker-gray-18.png b/images/C/dialogs/stock-color-picker-gray-18.png
new file mode 100644
index 0000000..96b79de
Binary files /dev/null and b/images/C/dialogs/stock-color-picker-gray-18.png differ
diff --git a/images/C/dialogs/stock-color-picker-white-18.png b/images/C/dialogs/stock-color-picker-white-18.png
new file mode 100644
index 0000000..7269919
Binary files /dev/null and b/images/C/dialogs/stock-color-picker-white-18.png differ
diff --git a/images/C/dialogs/stock-edit-clear-16.png b/images/C/dialogs/stock-edit-clear-16.png
new file mode 100644
index 0000000..579d1e3
Binary files /dev/null and b/images/C/dialogs/stock-edit-clear-16.png differ
diff --git a/images/C/dialogs/stock-fileopen-16.png b/images/C/dialogs/stock-fileopen-16.png
new file mode 100644
index 0000000..56dd02c
Binary files /dev/null and b/images/C/dialogs/stock-fileopen-16.png differ
diff --git a/images/C/dialogs/stock-flip-horizontal-16.png b/images/C/dialogs/stock-flip-horizontal-16.png
new file mode 100644
index 0000000..b95181e
Binary files /dev/null and b/images/C/dialogs/stock-flip-horizontal-16.png differ
diff --git a/images/C/dialogs/stock-gtk-add-16.png b/images/C/dialogs/stock-gtk-add-16.png
new file mode 100644
index 0000000..e157611
Binary files /dev/null and b/images/C/dialogs/stock-gtk-add-16.png differ
diff --git a/images/C/dialogs/stock-histogram-linear-16.png b/images/C/dialogs/stock-histogram-linear-16.png
new file mode 100644
index 0000000..9d1ce0b
Binary files /dev/null and b/images/C/dialogs/stock-histogram-linear-16.png differ
diff --git a/images/C/dialogs/stock-histogram-logarithmic-16.png b/images/C/dialogs/stock-histogram-logarithmic-16.png
new file mode 100644
index 0000000..a02f44f
Binary files /dev/null and b/images/C/dialogs/stock-histogram-logarithmic-16.png differ
diff --git a/images/C/dialogs/stock-image-16.png b/images/C/dialogs/stock-image-16.png
new file mode 100644
index 0000000..c6f5c40
Binary files /dev/null and b/images/C/dialogs/stock-image-16.png differ
diff --git a/images/C/dialogs/stock-layer-16.png b/images/C/dialogs/stock-layer-16.png
new file mode 100644
index 0000000..a957485
Binary files /dev/null and b/images/C/dialogs/stock-layer-16.png differ
diff --git a/images/C/dialogs/stock-path-16.png b/images/C/dialogs/stock-path-16.png
new file mode 100644
index 0000000..1e3d35e
Binary files /dev/null and b/images/C/dialogs/stock-path-16.png differ
diff --git a/images/C/dialogs/stock-path-stroke-16.png b/images/C/dialogs/stock-path-stroke-16.png
new file mode 100644
index 0000000..23c066a
Binary files /dev/null and b/images/C/dialogs/stock-path-stroke-16.png differ
diff --git a/images/C/dialogs/stock-redo-16.png b/images/C/dialogs/stock-redo-16.png
new file mode 100644
index 0000000..d32ba65
Binary files /dev/null and b/images/C/dialogs/stock-redo-16.png differ
diff --git a/images/C/dialogs/stock-reload-16.png b/images/C/dialogs/stock-reload-16.png
new file mode 100644
index 0000000..25b1f64
Binary files /dev/null and b/images/C/dialogs/stock-reload-16.png differ
diff --git a/images/C/dialogs/stock-remove-16.png b/images/C/dialogs/stock-remove-16.png
new file mode 100644
index 0000000..9626f64
Binary files /dev/null and b/images/C/dialogs/stock-remove-16.png differ
diff --git a/images/C/dialogs/stock-reset-16.png b/images/C/dialogs/stock-reset-16.png
new file mode 100644
index 0000000..665d40b
Binary files /dev/null and b/images/C/dialogs/stock-reset-16.png differ
diff --git a/images/C/dialogs/stock-revert-16.png b/images/C/dialogs/stock-revert-16.png
new file mode 100644
index 0000000..12ea0f0
Binary files /dev/null and b/images/C/dialogs/stock-revert-16.png differ
diff --git a/images/C/dialogs/stock-save-16.png b/images/C/dialogs/stock-save-16.png
new file mode 100644
index 0000000..d1510d3
Binary files /dev/null and b/images/C/dialogs/stock-save-16.png differ
diff --git a/images/C/dialogs/stock-undo-16.png b/images/C/dialogs/stock-undo-16.png
new file mode 100644
index 0000000..f054674
Binary files /dev/null and b/images/C/dialogs/stock-undo-16.png differ
diff --git a/images/C/dialogs/stock-zoom-best-fit-16.png b/images/C/dialogs/stock-zoom-best-fit-16.png
new file mode 100644
index 0000000..9c7ed19
Binary files /dev/null and b/images/C/dialogs/stock-zoom-best-fit-16.png differ
diff --git a/images/C/dialogs/stock-zoom-in-16.png b/images/C/dialogs/stock-zoom-in-16.png
new file mode 100644
index 0000000..cca4c63
Binary files /dev/null and b/images/C/dialogs/stock-zoom-in-16.png differ
diff --git a/images/C/dialogs/stock-zoom-original-16.png b/images/C/dialogs/stock-zoom-original-16.png
new file mode 100644
index 0000000..5239c1e
Binary files /dev/null and b/images/C/dialogs/stock-zoom-original-16.png differ
diff --git a/images/C/dialogs/stock-zoom-out-16.png b/images/C/dialogs/stock-zoom-out-16.png
new file mode 100644
index 0000000..6a56dd4
Binary files /dev/null and b/images/C/dialogs/stock-zoom-out-16.png differ
diff --git a/src/concepts/brushes.xml b/src/concepts/brushes.xml
index 24158e8..04ffaf4 100644
--- a/src/concepts/brushes.xml
+++ b/src/concepts/brushes.xml
@@ -125,9 +125,7 @@
           </para>
         </tip>
         <figure>
-          <title>
-            <phrase>Selection to Brush after Copy or Cut</phrase>
-          </title>
+          <title>Selection to Brush after Copy or Cut</title>
           <mediaobject>
             <imageobject>
               <!-- This image is internationalized -->
diff --git a/src/concepts/fonts-and-text.xml b/src/concepts/fonts-and-text.xml
index a46d407..c01e3a4 100644
--- a/src/concepts/fonts-and-text.xml
+++ b/src/concepts/fonts-and-text.xml
@@ -13,17 +13,13 @@
   2005-11-28 lexa: replaced informalfigures by figures
 -->
 <sect1 id="gimp-concepts-text">
-  <title>
-    <phrase>Text and Fonts</phrase>
-  </title>
+  <title>Text and Fonts</title>
   <indexterm>
     <primary>Fonts and Texts</primary>
     <secondary>Overview</secondary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Example of a text item</phrase>
-    </title>
+    <title>Example of a text item</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/using/text-example.png" format="PNG"/>
@@ -60,12 +56,11 @@
     without losing the results of your work.
   </para>
   <figure>
-    <title>
-      <phrase>GIMP text editor</phrase>
-    </title>
+    <title>GIMP text editor</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/toolbox/tool-dialog-text.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/toolbox/tool-dialog-text.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -88,14 +83,24 @@
     Because this danger is not obvious, the Text tool tries to protect you
     from it. If you operate on a text layer, and then later try to edit the
     text, a message pops up, warning you that your alterations will be undone,
-    and giving you three options: (1) edit the text anyway; (2) cancel; (3)
-    create a new text layer with the same text as the existing layer, leaving
-    the existing layer unchanged.
+    and giving you three options:
+    <itemizedlist>
+      <listitem>
+        <para>edit the text anyway;</para>
+      </listitem>
+      <listitem>
+        <para>cancel;</para>
+      </listitem>
+      <listitem>
+        <para>
+          create a new text layer with the same text as the existing layer,
+          leaving the existing layer unchanged.
+        </para>
+      </listitem>
+    </itemizedlist>
   </para>
   <figure>
-    <title>
-      <phrase>Warning lose modifications</phrase>
-    </title>
+    <title>Warning lose modifications</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/using/text-warning.png" format="PNG"/>
diff --git a/src/concepts/gradients.xml b/src/concepts/gradients.xml
index be980fa..ab42526 100644
--- a/src/concepts/gradients.xml
+++ b/src/concepts/gradients.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-02-19 j.h: revised for v2.6. No change
   2008-04-04 Mr.Dust : reviewed and added 'ko'
@@ -11,17 +12,13 @@
   2005-05-08 added french translation
 -->
 <sect1 id="gimp-concepts-gradients">
-  <title>
-    <phrase>Gradients</phrase>
-  </title>
+  <title>Gradients</title>
   <indexterm>
     <primary>Gradient</primary>
     <secondary>Overview</secondary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Some examples of GIMP gradients.</phrase>
-    </title>
+    <title>Some examples of GIMP gradients. </title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/using/gradient-examples.png" format="PNG"/>
@@ -112,11 +109,7 @@
         </step>
       </procedure>
       <figure>
-        <title>
-          <phrase>
-            How to use rapidly a gradient in a selection
-          </phrase>
-        </title>
+        <title>How to use rapidly a gradient in a selection</title>
         <mediaobject>
           <imageobject>
             <imagedata fileref="images/using/gradient-draw.png" format="PNG"/>
@@ -134,14 +127,11 @@
         of the gradient (to infinity...).
       </para>
       <figure>
-        <title>
-          <phrase>
-            How to use rapidly a gradient with a drawing tool
-          </phrase>
-        </title>
+        <title>How to use rapidly a gradient with a drawing tool</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/using/color-gradient-pencil.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/using/color-gradient-pencil.png"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -149,9 +139,7 @@
     <listitem>
       <para>Different productions with the same gradient:</para>
       <figure>
-        <title>
-          <phrase>Gradient usage</phrase>
-        </title>
+        <title>Gradient usage</title>
         <mediaobject>
           <imageobject>
             <imagedata fileref="images/using/gradient-usage.png" format="PNG"/>
diff --git a/src/concepts/image-types.xml b/src/concepts/image-types.xml
index 528f71d..063bd69 100644
--- a/src/concepts/image-types.xml
+++ b/src/concepts/image-types.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history
   2009-02-19 j.h:revised for v2.6. No change
   2007-03-26 reviewed Korean translation by Dust
@@ -8,9 +9,7 @@
   2005-12-18 reviewed and added rewrote de image explenation by lexa
 -->
 <sect1 id="gimp-concepts-image-types">
-  <title>
-    <phrase>Image Types</phrase>
-  </title>
+  <title>Image Types</title>
   <indexterm>
     <primary>Images</primary>
     <secondary>Types</secondary>
@@ -45,12 +44,11 @@
     values representing different levels of gray.
   </para>
   <figure>
-    <title>
-      <phrase>Components of the RGB and CMY Color Model</phrase>
-    </title>
+    <title>Components of the RGB and CMY Color Model</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/glossary/color-model-additive.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/glossary/color-model-additive.png"/>
       </imageobject>
       <caption>
         <para>
@@ -61,7 +59,8 @@
     </mediaobject>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/glossary/color-model-subtractive.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/glossary/color-model-subtractive.png"/>
       </imageobject>
       <caption>
         <para>
@@ -96,14 +95,10 @@
     layer and color from underneath.
   </para>
   <figure>
-    <title>
-      <phrase>
-        Example of an image in RGB and Grayscale mode
-      </phrase>
-    </title>
+    <title>Example of an image in RGB and Grayscale mode</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/using/wilber-channel-rgb.png" format="PNG"/>
+        <imagedata format="PNG" fileref="images/using/wilber-channel-rgb.png"/>
       </imageobject>
       <caption>
         <para>
@@ -114,7 +109,8 @@
     </mediaobject>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/using/wilber-channel-gray.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/using/wilber-channel-gray.png"/>
       </imageobject>
       <caption>
         <para>
@@ -136,12 +132,11 @@
     with slowly varying color gradients, the difference may be perceptible.
   </para>
   <figure>
-    <title>
-      <phrase>Example of an image with alpha channel</phrase>
-    </title>
+    <title>Example of an image with alpha channel</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/wilber-channels-red.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/wilber-channels-red.png"/>
       </imageobject>
       <caption>
         <para>Red channel</para>
@@ -149,7 +144,8 @@
     </mediaobject>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/wilber-channels-green.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/wilber-channels-green.png"/>
       </imageobject>
       <caption>
         <para>Green channel</para>
@@ -157,7 +153,8 @@
     </mediaobject>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/wilber-channels-blue.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/wilber-channels-blue.png"/>
       </imageobject>
       <caption>
         <para>Blue channel</para>
@@ -165,7 +162,8 @@
     </mediaobject>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/wilber-channels-alpha.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/wilber-channels-alpha.png"/>
       </imageobject>
       <caption>
         <para>
@@ -175,7 +173,8 @@
     </mediaobject>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/wilber-channels-combined.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/wilber-channels-combined.png"/>
       </imageobject>
       <caption>
         <para>
diff --git a/src/concepts/layer-modes.xml b/src/concepts/layer-modes.xml
index 62bfab6..28bc6d7 100644
--- a/src/concepts/layer-modes.xml
+++ b/src/concepts/layer-modes.xml
@@ -82,9 +82,7 @@
   </figure>
 
   <figure>
-    <title>
-      <phrase>Images (backgrounds) for layer mode examples</phrase>
-    </title>
+    <title>Images (backgrounds) for layer mode examples</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/using/keyfob_orig.png" format="PNG"/>
@@ -113,9 +111,7 @@
     The equations are in a shorthand notation. For example, the equation
   </para>
   <equation>
-    <title>
-      <phrase>Example</phrase>
-    </title>
+    <title>Example</title>
     <alt role="latex">$$E = M + I$$</alt>
     <graphic fileref="images/math/layer-mode-example.png" format="PNG"/>
   </equation>
@@ -191,11 +187,7 @@
         </para>
         <para>The equation is:</para>
         <equation>
-          <title>
-            <phrase>
-              Equation for layer mode <quote>Normal</quote>
-            </phrase>
-          </title>
+          <title>Equation for layer mode <quote>Normal</quote></title>
           <alt role="latex">$$E = M$$</alt>
           <graphic fileref="images/math/layer-mode-normal.png" format="PNG"/>
         </equation>
@@ -378,11 +370,7 @@
         </para>
         <para>The equation is:</para>
         <equation>
-          <title>
-            <phrase>
-              Equation for layer mode <quote>Divide</quote>
-            </phrase>
-          </title>
+          <title>Equation for layer mode <quote>Divide</quote></title>
           <alt role="latex">$$E = \frac{256 \times I}{M + 1}$$</alt>
           <graphic fileref="images/math/layer-mode-divide.png" format="JPG"/>
         </equation>
@@ -495,7 +483,7 @@
           <quote>Multiply</quote> mode.
         </para>
         <para>
-          <phrase>The equation is:</phrase>
+          The equation is:
           <footnote id="gimp-layer-mode-bug162395">
             <para>
               The equation is the *theoretical* equation. Due to
diff --git a/src/concepts/layers.xml b/src/concepts/layers.xml
index b44347a..58c4d88 100644
--- a/src/concepts/layers.xml
+++ b/src/concepts/layers.xml
@@ -125,9 +125,7 @@
             </indexterm>
             <para>
               <figure>
-                <title>
-                  <phrase>Alpha channel example: Basic image</phrase>
-                </title>
+                <title>Alpha channel example: Basic image</title>
                 <mediaobject>
                   <imageobject>
                     <imagedata format="PNG"
@@ -270,7 +268,7 @@
               </imageobject>
             </inlinemediaobject>
           </guiicon>
-          <phrase>Visibility</phrase>
+          Visibility
         </term>
         <listitem>
           <indexterm>
@@ -307,7 +305,7 @@
               </imageobject>
             </inlinemediaobject>
           </guiicon>
-          <phrase>Linkage to other layers</phrase>
+          Linkage to other layers
         </term>
         <listitem>
           <indexterm>
diff --git a/src/concepts/palettes.xml b/src/concepts/palettes.xml
index 298fdae..00bed95 100644
--- a/src/concepts/palettes.xml
+++ b/src/concepts/palettes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-04-05 Mr.Dust : reviewed and added 'ko'
   2007-01-09 manuq: added es translation
@@ -12,9 +13,7 @@
   2005-05-09 nn: added french translation
 -->
 <sect1 id="gimp-concepts-palettes">
-  <title>
-    <phrase>Palettes</phrase>
-  </title>
+  <title>Palettes</title>
   <indexterm>
     <primary>Palette</primary>
     <secondary>Introduction</secondary>
@@ -59,9 +58,7 @@
   </para>
 
   <figure>
-    <title>
-      <phrase>The Palettes dialog</phrase>
-    </title>
+    <title>The Palettes dialog</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/dialogs/palettes-dialog.png" format="PNG"/>
@@ -81,9 +78,7 @@
   </para>
 
   <figure>
-    <title>
-      <phrase>The Palette Editor</phrase>
-    </title>
+    <title>The Palette Editor</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/dialogs/palette-editor.png" format="PNG"/>
@@ -135,9 +130,7 @@
   </para>
 
   <sect2>
-    <title>
-      <phrase>Colormap</phrase>
-    </title>
+    <title>Colormap</title>
     <para>
       Confusingly, <acronym>GIMP</acronym> makes use of two types of palettes.
       The more
@@ -153,25 +146,26 @@
       functional significance.)
     </para>
     <figure>
-      <title>
-        <phrase>The Colormap dialog</phrase>
-      </title>
+      <title>The Colormap dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/dialogs/colormap-dialog.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/dialogs/colormap-dialog.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <para>
-      The colormap of an indexed image is shown in the <link linkend="gimp-indexed-palette-dialog"> Indexed Palette dialog </link>,
+      The colormap of an indexed image is shown in the
+      <link linkend="gimp-indexed-palette-dialog">Indexed Palette
+      dialog</link>,
       which should not be confused with the Palettes dialog. The Palettes
       dialog shows a list of all of the palettes available; the Colormap
       dialog shows the colormap of the currently active image, if it is an
-      indexed image - otherwise it shows nothing.
+      indexed image &ndash; otherwise it shows nothing.
     </para>
     <para>
       You can, however, create an ordinary palette from the colors in an
-      indexed image---actually from the colors in any image. To do this,
+      indexed image&mdash;actually from the colors in any image. To do this,
       choose <guimenuitem>Import Palette</guimenuitem>
       from the right-click popup menu in the Palettes dialog: this pops up a
       dialog that gives you several options, including the option to import
@@ -194,9 +188,7 @@
       Palettes dialog.
     </para>
     <figure>
-      <title>
-        <phrase>Colormap dialog (1) and Palette dialog (2)</phrase>
-      </title>
+      <title>Colormap dialog (1) and Palette dialog (2)</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/using/palettes.png" format="PNG"/>
diff --git a/src/concepts/plugins.xml b/src/concepts/plugins.xml
index 91302f3..34bc071 100644
--- a/src/concepts/plugins.xml
+++ b/src/concepts/plugins.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-05-03 lexa: added plugin installation info for OS X
   2007-01-28 added Spanish translation by manuq
@@ -8,17 +9,13 @@
   2008-02-08 jpl: relecture et légères corrections
 -->
 <sect1 id="gimp-concepts-plugins">
-  <title>
-    <phrase>Plugins</phrase>
-  </title>
+  <title>Plugins</title>
   <indexterm>
     <primary>Plugins</primary>
     <secondary>Introduction</secondary>
   </indexterm>
   <sect2>
-    <title>
-      <phrase>Introduction</phrase>
-    </title>
+    <title>Introduction</title>
     <para>
       One of the nicest things about <acronym>GIMP</acronym> is how easily its
       functionality can be extended, by using plugins.
@@ -99,9 +96,7 @@
   </sect2>
 
   <sect2>
-    <title>
-      <phrase>Using Plugins</phrase>
-    </title>
+    <title>Using Plugins</title>
     <para>
       For the most part you can use a plugin like any other
       <acronym>GIMP</acronym> tool, without needing to be aware that it is a
@@ -155,9 +150,7 @@
   </sect2>
 
   <sect2 id="gimp-plugins-install">
-    <title>
-      <phrase>Installing New Plugins</phrase>
-    </title>
+    <title>Installing New Plugins</title>
     <indexterm>
       <primary>Plugins</primary>
       <secondary>Install</secondary>
@@ -171,9 +164,7 @@
       the two are best considered separately.
     </para>
     <sect3>
-      <title>
-        <phrase>Linux</phrase>
-      </title>
+      <title>Linux / Unix-sytem like systems</title>
       <para>
         Most plugins fall into two categories: small ones whose source
         code is distributed as a single .c file, and larger ones whose
@@ -262,9 +253,7 @@
     </sect3>
 
     <sect3>
-      <title>
-        <phrase>Apple Mac OS X</phrase>
-      </title>
+      <title>Apple Mac OS X</title>
       <para>
         How you install plugins on OS X mostly depends on how you installed
         <acronym>GIMP</acronym> itself. If you were one of the brave and
@@ -291,9 +280,7 @@
   </sect2>
 
   <sect2 id="plugins-write">
-    <title>
-      <phrase>Writing Plugins</phrase>
-    </title>
+    <title>Writing Plugins</title>
     <indexterm>
       <primary>Plugins</primary>
       <secondary>Write</secondary>
diff --git a/src/concepts/undo.xml b/src/concepts/undo.xml
index 21555f5..35eb887 100644
--- a/src/concepts/undo.xml
+++ b/src/concepts/undo.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-02-21 j.h: revised for v2.6
   2008-03-23 reviewed 'ko' by Mr.Dust
@@ -8,9 +9,7 @@
   2006-02-25 lexa: added translation for de and made file docbook compliant
 -->
 <sect1 id="gimp-concepts-undo">
-  <title>
-    <phrase>Undoing</phrase>
-  </title>
+  <title>Undoing</title>
   <indexterm>
     <primary>Undo</primary>
   </indexterm>
@@ -100,9 +99,7 @@
     before they drop out of the Undo History.
   </para>
   <sect2>
-    <title>
-      <phrase>Things That Cannot be Undone</phrase>
-    </title>
+    <title>Things That Cannot be Undone</title>
     <para>
       Most actions that alter an image can be undone. Actions that do not
       alter the image generally cannot be undone. Examples include
diff --git a/src/dialogs/brushes-dialog.xml b/src/dialogs/brushes-dialog.xml
index 1312980..a0057a1 100644
--- a/src/dialogs/brushes-dialog.xml
+++ b/src/dialogs/brushes-dialog.xml
@@ -289,6 +289,10 @@
           <term>Edit Brush</term>
           <listitem>
             <para>
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-gtk-edit-16.png"/>
+              </guiicon>
               This activates the
               <link linkend="gimp-brush-editor-dialog">Brush Editor</link>.
               Pressing the button will open the Editor for any brush. It
@@ -303,6 +307,10 @@
           <listitem>
             <anchor id="gimp-brush-new"/>
             <para>
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-document-new-16.png"/>
+              </guiicon>
               This creates a new parametric brush, initializes it with a small
               fuzzy round shape, and opens the Brush Editor so that you can
               modify it. The new brush is automatically saved in your personal
@@ -315,6 +323,10 @@
           <listitem>
             <anchor id="gimp-brush-duplicate"/>
             <para>
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-duplicate-16.png"/>
+              </guiicon>
               This button is only enabled if the currently selected brush is a
               parametric brush. If so, the brush is duplicated, and the Brush
               Editor is opened so that you can modify the copy. The result is
@@ -328,6 +340,10 @@
           <listitem>
             <anchor id="gimp-brush-delete"/>
             <para>
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-delete-16.png"/>
+              </guiicon>
               This removes all traces of the brush, both from the dialog and
               the folder where its file is stored, if you have permission to
               do so. It asks for confirmation before doing anything.
@@ -339,11 +355,15 @@
           <listitem>
             <anchor id="gimp-brush-refresh"/>
             <para>
-              If you add brushes to your personal <filename>brushes</filename>
+              If you add brushes to your personal
+              <filename class="directory">brushes</filename>
               folder or any other folder in your brush search path, by some
-              means other than the Brush Editor, this button causes the list
-              to be reloaded, so that the new entries will be available in the
-              dialog.
+              means other than the Brush Editor,
+              <guiicon>
+                <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+              </guiicon>
+              this button causes the list to be reloaded, so that the new
+              entries will be available in the dialog.
             </para>
           </listitem>
         </varlistentry>
diff --git a/src/dialogs/channel-menu.xml b/src/dialogs/channel-menu.xml
index 22d695e..fc09dc4 100644
--- a/src/dialogs/channel-menu.xml
+++ b/src/dialogs/channel-menu.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect4 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect4 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-24 kost: added norwegian
   2006-04-29 lexa: minor changes to docbook compliance
 -->
 <sect4 id="gimp-channel-menu">
-  <title>
-    <phrase>Channels Context Menu</phrase>
-  </title>
+  <title>Channels Context Menu</title>
   <indexterm>
     <primary>Channels</primary>
     <secondary>Menu</secondary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Channel Context Menu</phrase>
-    </title>
+    <title>Channel Context Menu</title>
     <mediaobject>
       <imageobject>
         <imagedata format="PNG"
diff --git a/src/dialogs/channel-selection-mask.xml b/src/dialogs/channel-selection-mask.xml
index 5c1c64f..fe4ca18 100644
--- a/src/dialogs/channel-selection-mask.xml
+++ b/src/dialogs/channel-selection-mask.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-02-20 added Spanish translation by manuq
   2006-04-29 lexa: made docbook compliant
   2006-02-25 romanofski fixed broken image references
 -->
 <sect3 id="dialogs-selection-masks">
-  <title>
-    <phrase>Selection masks</phrase>
-  </title>
+  <title>Selection masks</title>
   <indexterm>
     <primary>Masks</primary>
     <secondary>Selection mask</secondary>
@@ -31,13 +30,12 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>A selection composed out of channels.</phrase>
-    </title>
+    <title>A selection composed out of channels.</title>
     <mediaobject>
       <!--was dialogs-channel-masks.png-->
       <imageobject>
-        <imagedata fileref="images/dialogs/channel-masks-example.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/channel-masks-example.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -98,9 +96,7 @@
     </varlistentry>
   </variablelist>
   <sect4>
-    <title>
-      <phrase>Using Selection Masks</phrase>
-    </title>
+    <title>Using Selection Masks</title>
     <para>
       Once the channel is initialized, selected (highlighted in blue), visible
       (eye-icon in the dialog), and displayed as you want (color and opacity
diff --git a/src/dialogs/device-status-dialog.xml b/src/dialogs/device-status-dialog.xml
index 3c20bae..b7b34bc 100644
--- a/src/dialogs/device-status-dialog.xml
+++ b/src/dialogs/device-status-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-15 j.h: updated en;fr to v2.6
   2007-05-04 Added Spanish translation by AntI
@@ -7,9 +8,7 @@
   2006-07-05 created en;fr by j.h
 -->
 <sect2 id="gimp-device-status-dialog">
-  <title>
-    <phrase>Device Status Dialog</phrase>
-  </title>
+  <title>Device Status Dialog</title>
   <indexterm>
     <primary>Dialogs</primary>
     <secondary>Device Status</secondary>
@@ -18,9 +17,7 @@
     <primary>Device Status</primary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>The <quote>Device Status</quote> Dialog</phrase>
-    </title>
+    <title>The <quote>Device Status</quote> Dialog</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/dialogs/device-status.png" format="PNG"/>
@@ -37,15 +34,17 @@
     changing.
   </para>
   <para>
-    The <quote>Record device status</quote> button at the bottom of the
+    The <quote>Record device status</quote> button
+    <guiicon>
+      <inlinegraphic fileref="images/dialogs/stock-save-16.png"/>
+    </guiicon>
+    at the bottom of the
     window, seems to have the same action as the <quote>Record device
     status now</quote> option in the Input Devices section in preferences.
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the Dialog</phrase>
-    </title>
+    <title>Activating the Dialog</title>
     <para>
       The device status dialog is a dockable dialog; see the section
       <xref linkend="gimp-concepts-docks"/>
diff --git a/src/dialogs/dialogs-content.xml b/src/dialogs/dialogs-content.xml
index 3c61f0d..d1859c7 100644
--- a/src/dialogs/dialogs-content.xml
+++ b/src/dialogs/dialogs-content.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2006-03-13 lexa: created new structure for dialogs
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-dialogs-content">
-  <title>
-    <phrase>Image-content Related Dialogs</phrase>
-  </title>
+  <title>Image-content Related Dialogs</title>
   <xi:include href="color-dialog.xml"/>
   <xi:include href="brushes-dialog.xml"/>
   <xi:include href="patterns-dialog.xml"/>
diff --git a/src/dialogs/dialogs-management.xml b/src/dialogs/dialogs-management.xml
index f1858f5..43006d2 100644
--- a/src/dialogs/dialogs-management.xml
+++ b/src/dialogs/dialogs-management.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2006-03-13 lexa: created new structure for dialogs
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-dialogs-management">
-  <title>
-    <phrase>Image Management Related Dialogs</phrase>
-  </title>
+  <title>Image Management Related Dialogs</title>
   <xi:include href="buffers-dialog.xml"/>
   <xi:include href="images-dialog.xml"/>
   <xi:include href="document-dialog.xml"/>
diff --git a/src/dialogs/dialogs-misc.xml b/src/dialogs/dialogs-misc.xml
index 13b596d..4d35522 100644
--- a/src/dialogs/dialogs-misc.xml
+++ b/src/dialogs/dialogs-misc.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2006-07-16 added error-console by j.h
   2006-07-07 added device-status by j.h
   2006-03-13 lexa: created new structure for dialogs
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-dialogs-misc">
-  <title>
-    <phrase>Misc. Dialogs</phrase>
-  </title>
+  <title>Misc. Dialogs</title>
   <xi:include href="tools-dialog.xml"/>
   <xi:include href="device-status-dialog.xml"/>
   <xi:include href="error-console.xml"/>
diff --git a/src/dialogs/dialogs-structure.xml b/src/dialogs/dialogs-structure.xml
index ee05b49..acf2666 100644
--- a/src/dialogs/dialogs-structure.xml
+++ b/src/dialogs/dialogs-structure.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2006-03-13 lexa: created new structure for dialogs
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-dialogs-structure">
-  <title>
-    <phrase>Image Structure Related Dialogs</phrase>
-  </title>
+  <title>Image Structure Related Dialogs</title>
   <para>
     The following dialogs let you control and manipulate image structures,
     such as <link linkend="gimp-concepts-layers">layers</link>,
diff --git a/src/dialogs/dialogs_introduction.xml b/src/dialogs/dialogs_introduction.xml
index f67626b..8381893 100644
--- a/src/dialogs/dialogs_introduction.xml
+++ b/src/dialogs/dialogs_introduction.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2006-03-06 lexa: reviewed and made docbook compliant
 -->
 <sect1 id="gimp-dialogs-introduction">
-  <title>
-    <phrase>Dialog Introduction</phrase>
-  </title>
+  <title>Dialog Introduction</title>
   <indexterm>
     <primary>Dialogs</primary>
     <secondary>Introduction</secondary>
   </indexterm>
   <para>
     Dialogs are the most common means of setting options and controls in the
-    GIMP. The most important dialogs are explained in this section.
+    <acronym>GIMP</acronym>. The most important dialogs are explained in
+    this section.
   </para>
 </sect1>
diff --git a/src/dialogs/document-dialog.xml b/src/dialogs/document-dialog.xml
index 9cf62e5..999ab84 100644
--- a/src/dialogs/document-dialog.xml
+++ b/src/dialogs/document-dialog.xml
@@ -103,26 +103,46 @@
       </para>
     </tip>
     <para>
-      The <emphasis>Open the selected entry</emphasis>
-      button allows you to open the image you have selected. With the
+      Use the <emphasis>Open the selected entry</emphasis>
+      <guiicon>
+        <inlinegraphic fileref="images/dialgs/stock-fileopen-16.png"/>
+      </guiicon>
+      button or <guimenuitem>Open Image</guimenuitem> command of the dialog's
+      context menu, to open the image you have selected. With the
       <keycap>Shift</keycap> key pressed, it raises an image hidden behind
-      others. With the <keycap>Ctrl</keycap> key pressed, it opens the Open Image
-      dialog.
+      others. With the <keycap>Ctrl</keycap> key pressed, it opens the Open
+      Image dialog.
     </para>
     <para>
-      The <emphasis>Remove the selected entry</emphasis>
-      button allows you to remove an image from the History dialog. The image
+      Use the <emphasis>Remove the selected entry</emphasis>
+      <guiicon>
+        <inlinegraphic
+          fileref="images/dialgs/stock-remove-16.png"/>
+      </guiicon>
+      button or <guimenuitem>Remove Entry</guimenuitem> command of the dialog's
+      context menu, to remove an image from the History dialog. The image
       is removed from the recently open images list also. But the image itself
       is not deleted.
     </para>
     <para>
-      The <emphasis>Clear the entire file history</emphasis> : all the files
-      will be removed from the history.
+      Use the <emphasis>Clear the entire file history</emphasis>
+      <guiicon>
+        <inlinegraphic
+          fileref="images/dialgs/stock-edit-clear-16.png"/>
+      </guiicon>
+      button or <guimenuitem>Clear History</guimenuitem> command of the
+      dialog's context menu, to remove all the files from the history.
     </para>
     <para>
-      The <emphasis>Recreate Preview</emphasis> button updates preview in
-      case of change. With <keycap>Shift</keycap> key pressed, it acts on
-      all previews. With <keycap>Ctrl</keycap> key pressed, previews that
+      Use the <emphasis>Recreate Preview</emphasis>
+      <guiicon>
+        <inlinegraphic
+          fileref="images/dialgs/stock-reload-16.png"/>
+      </guiicon>
+      button or <guimenuitem>Recreate Preview</guimenuitem> command of the
+      dialog's context menu, to update preview in case of change.
+      With <keycap>Shift</keycap> key pressed, it acts on all previews.
+      With <keycap>Ctrl</keycap> key pressed, previews that
       correspond to files that can't be found out, are deleted.
     </para>
   </sect3>
diff --git a/src/dialogs/error-console.xml b/src/dialogs/error-console.xml
index 82888c8..7193897 100644
--- a/src/dialogs/error-console.xml
+++ b/src/dialogs/error-console.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-16 j.h: updated en;fr to v2.6
   2007-05-04 Added Spanish translation by AntI
@@ -8,9 +9,7 @@
   2006-07-15 created en;fr by j.h
 -->
 <sect2 id="gimp-errors-dialog">
-  <title>
-    <phrase>Error Console</phrase>
-  </title>
+  <title>Error Console</title>
   <indexterm>
     <primary>Error console</primary>
   </indexterm>
@@ -21,9 +20,7 @@
     selected part.
   </para>
   <sect3>
-    <title>
-      <phrase>Activating the Dialog</phrase>
-    </title>
+    <title>Activating the Dialog</title>
     <para>
       The <quote>Error Console</quote> dialog is a dockable dialog; see the
       section <xref linkend="gimp-concepts-docks"/> for help on manipulating
@@ -63,15 +60,9 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>
-        The <quote>Error Console</quote> Dialog
-      </phrase>
-    </title>
+    <title>The <quote>Error Console</quote> Dialog</title>
     <figure>
-      <title>
-        <phrase><quote>Error Console</quote> Dialog window</phrase>
-      </title>
+      <title><quote>Error Console</quote> Dialog window</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/dialogs/error-console.png" format="PNG"/>
@@ -83,6 +74,10 @@
         <term>Clear errors</term>
         <listitem>
           <para>
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-edit-clear-16.png"/>
+            </guiicon>
             This button lets you delete all errors in the log.
           </para>
           <warning>
@@ -96,6 +91,9 @@
         <term>Save all errors</term>
         <listitem>
           <para>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-save-16.png"/>
+            </guiicon>
             This button lets you save
             the whole log. You can also select a part of the log (by
             click-and-dragging the mouse pointer or by using the
@@ -109,12 +107,12 @@
           </para>
           <figure>
             <title>
-              <phrase><quote>Save Error Log to file</quote> Dialog window
-              </phrase>
+              <quote>Save Error Log to file</quote> Dialog window
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/dialogs/error-console-record.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/dialogs/error-console-record.png"/>
               </imageobject>
             </mediaobject>
           </figure>
@@ -125,7 +123,14 @@
       <para>
         You will as well find these button actions in the dialog tab menu by
         clicking on
-        <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/dialogs/stock-menu-left-12.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>,
+        <guiicon>
+          <inlinemediaobject>
+            <imageobject>
+              <imagedata format="PNG"
+                fileref="images/dialogs/stock-menu-left-12.png"/>
+            </imageobject>
+          </inlinemediaobject>
+        </guiicon>,
         or in the context menu you get by right-clicking on the dialog
         window.
       </para>
diff --git a/src/dialogs/fonts-dialog.xml b/src/dialogs/fonts-dialog.xml
index 6ffb114..9c9d2ec 100644
--- a/src/dialogs/fonts-dialog.xml
+++ b/src/dialogs/fonts-dialog.xml
@@ -101,9 +101,7 @@
         <term>Grid/List modes</term>
         <listitem>
           <figure>
-            <title>
-              <phrase>The Fonts dialog</phrase>
-            </title>
+            <title>The Fonts dialog</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
@@ -145,7 +143,11 @@
         <term>Refresh font list</term>
         <listitem>
           <para>
-            Pressing the button at the bottom of the dialog causes the system
+            Pressing
+            <guiicon>
+              <inlinegrephic fileref="images/dialogs/stock-reload-16.png"/>
+            </guiicon>
+            the button at the bottom of the dialog causes the system
             font list to be rescanned. This may be useful if you add new fonts
             while GIMP is running, and want to make them accessible for the
             Text tool. You can also cause the font list to be rescanned by
diff --git a/src/dialogs/gradient-dialog.xml b/src/dialogs/gradient-dialog.xml
index 9355e26..fcec707 100644
--- a/src/dialogs/gradient-dialog.xml
+++ b/src/dialogs/gradient-dialog.xml
@@ -113,7 +113,8 @@
       </listitem>
       <listitem>
         <para>
-          From the image by using the <keycap>Ctrl+G</keycap> shortcut.
+          From the image by using the
+          <keycombo><keycap>Ctrl</keycap><keycap>G</keycap><keycombo> shortcut.
         </para>
       </listitem>
     </itemizedlist>
@@ -187,6 +188,9 @@
         <term>Edit Gradient</term>
         <listitem>
           <para>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-gtk-edit-16.png"/>
+            </guiicon>
             This button activates the
             <link linkend="gimp-gradient-editor-dialog">Gradient Editor</link>.
           </para>
@@ -197,10 +201,14 @@
         <listitem>
           <anchor id="gimp-gradient-new"/>
           <para>
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-document-new-16.png"/>
+            </guiicon>
             This creates a new gradient, initialized as a simple grayscale,
             and activates the Gradient Editor so that you can alter it.
             Gradients that you create are automatically saved in the
-            <filename>gradients</filename>
+            <filename class="directory">gradients</filename>
             folder of your personal GIMP directory, from which they are
             automatically loaded when GIMP starts. (You can change this
             folder, or add new ones, using the Preferences dialog.)
@@ -212,6 +220,9 @@
         <listitem>
           <anchor id="gimp-gradient-duplicate"/>
           <para>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-duplicate-16.png"/>
+            </guiicon>
             This creates a copy of the currently selected gradient. You will
             be able to edit the copy even if you cannot edit the original.
           </para>
@@ -222,6 +233,9 @@
         <listitem>
           <anchor id="gimp-gradient-delete"/>
           <para>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-delete-16.png"/>
+            </guiicon>
             This removes all traces of the gradient, if you have permission to
             do so. It asks for confirmation before doing anything.
           </para>
@@ -233,10 +247,13 @@
           <anchor id="gimp-gradient-refresh"/>
           <para>
             If you add gradients to your personal
-            <filename>gradients</filename>
-            folder by some means other than this dialog, this button causes
-            the list to be reloaded, so that the new entries will be
-            available.
+            <filename class="directory">gradients</filename>
+            folder by some means other than this dialog,
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+            </guiicon>
+            this button causes the list to be reloaded, so that the new
+            entries will be available.
           </para>
         </listitem>
       </varlistentry>
diff --git a/src/dialogs/gradient-editor-dialog.xml b/src/dialogs/gradient-editor-dialog.xml
index 81b6d2a..0c03d14 100644
--- a/src/dialogs/gradient-editor-dialog.xml
+++ b/src/dialogs/gradient-editor-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-04-04 j.h: fixed bug #577170
   2008-03-01 ude: updated 'de' (added translated example)
@@ -60,6 +61,9 @@
       <listitem>
         <para>
           by clicking on the <guibutton>Edit gradient</guibutton>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-gtk-edit-16.png"/>
+          </guiicon>
           button in the Gradient Dialog,
         </para>
       </listitem>
@@ -179,11 +183,15 @@
               <term>Save</term>
               <listitem>
                 <para>
+                  <guiicon>
+                    <inlinegraphic
+                      fileref="images/dialogs/stock-save-16.png"/>
+                  </guiicon>
                   Clicking this button causes the gradient, in its current
                   state, to be saved in your personal
-                  <filename>gradients</filename>
+                  <filename class="directory">gradients</filename>
                   folder, so that it will automatically be loaded the next
-                  time you start GIMP.
+                  time you start <acronym>GIMP</acronym>.
                 </para>
               </listitem>
             </varlistentry>
@@ -191,6 +199,10 @@
               <term>Revert</term>
               <listitem>
                 <para>
+                  <guiicon>
+                    <inlinegraphic
+                      fileref="images/dialogs/stock-revert-16.png"/>
+                  </guiicon>
                   Clicking this button undoes all of your editing. (However,
                   at the time this is being written, this function is not yet
                   implemented.)
@@ -202,6 +214,10 @@
               <listitem>
                 <anchor id="gimp-gradient-editor-zoom-out"/>
                 <para>
+                  <guiicon>
+                    <inlinegraphic
+                      fileref="images/dialogs/stock-zoom-out-16.png"/>
+                  </guiicon>
                   Clicking this button shrinks the gradient display
                   horizontally.
                 </para>
@@ -212,6 +228,10 @@
               <listitem>
                 <anchor id="gimp-gradient-editor-zoom-in"/>
                 <para>
+                  <guiicon>
+                    <inlinegraphic
+                      fileref="images/dialogs/stock-zoom-in-16.png"/>
+                  </guiicon>
                   Clicking this button expands the gradient display
                   horizontally. You can then use the scrollbar to pan the
                   display left or right.
@@ -223,6 +243,10 @@
               <listitem>
                 <anchor id="gimp-gradient-editor-zoom-all"/>
                 <para>
+                  <guiicon>
+                    <inlinegraphic
+                      fileref="images/dialogs/stock-zoom-best-fit-16.png"/>
+                  </guiicon>
                   Clicking this button resizes the display horizontally so
                   that it fits precisely into the window.
                 </para>
@@ -240,7 +264,8 @@
       <title>The Gradient Editor pop-up menu</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/dialogs/gradient-editor-popup-menu.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/dialogs/gradient-editor-popup-menu.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -260,9 +285,7 @@
         <listitem>
           <para>This command opens a submenu:</para>
           <figure>
-            <title>
-              <phrase>The Left/Right color type sub-menu</phrase>
-            </title>
+            <title>The Left/Right color type sub-menu</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
@@ -599,13 +622,16 @@
       <listitem>
         <para>
           Open the Gradient Dialog. Click the
-          <guibutton>New Gradient</guibutton>. The Gradient Editor is opened
+          <guibutton>New Gradient</guibutton>
+          <guiicon>
+            <inlinegraphic
+              fileref="images/dialogs/stock-document-new-16.png"/>
+          </guiicon>.
+          The Gradient Editor is opened
           and shows a gradient from black to white.
         </para>
         <figure>
-          <title>
-            <phrase>New gradient</phrase>
-          </title>
+          <title>New gradient</title>
           <mediaobject>
             <imageobject>
               <imagedata format="PNG"
diff --git a/src/dialogs/histogram-dialog.xml b/src/dialogs/histogram-dialog.xml
index 54c9407..a3acb43 100644
--- a/src/dialogs/histogram-dialog.xml
+++ b/src/dialogs/histogram-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-13 j.h:updated en;fr to v2.6
   2007-12-04 ude: updated 'de'
@@ -188,9 +189,7 @@
               <listitem>
                 <figure>
                   <title>
-                    <phrase>
-                      Combined histograms of R, G, and B channels.
-                    </phrase>
+                    Combined histograms of R, G, and B channels.
                   </title>
                   <mediaobject>
                     <imageobject>
@@ -210,11 +209,23 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Linear/Logarithmic buttons</term>
+        <term>
+          Linear
+          <guiicon>
+            <inlinegraphic
+              fileref="images/dialogs/stock-histogram-linear-16.png"/>
+          </guiicon>
+          / Logarithmic
+          <guiicon>
+            <inlinegraphic
+              fileref="images/dialogs/stock-histogram-logarithmic-16.png"/>
+          </guiicon>
+          buttons 
+        </term>
         <listitem>
           <figure>
             <title>
-                The histogram shown at the top, changed to logarithmic mode.
+              The histogram shown at the top, changed to logarithmic mode.
             </title>
             <mediaobject>
               <imageobject>
@@ -237,9 +248,7 @@
         <term>Range Setting</term>
         <listitem>
           <figure>
-            <title>
-              <phrase>Dialog aspect after range fixing.</phrase>
-            </title>
+            <title>Dialog aspect after range fixing.</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
diff --git a/src/dialogs/indexed-palette-dialog.xml b/src/dialogs/indexed-palette-dialog.xml
index 3e43373..432aaa5 100644
--- a/src/dialogs/indexed-palette-dialog.xml
+++ b/src/dialogs/indexed-palette-dialog.xml
@@ -202,7 +202,11 @@
         <listitem>
           <anchor id="gimp-indexed-palette-add"/>
           <para>
-            This button (in the lower right corner of the dialog) allows you
+            This button
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-gtk-add-16.png"/>
+            </guiicon>
+            (in the lower right corner of the dialog) allows you
             to add new colors to the colormap. If you click on the button, the
             current foreground color, as shown in the Toolbox, will be tacked
             on to the end of the colormap. If instead you hold down
@@ -217,7 +221,8 @@
       <para>
         If you make a mistake, you can undo it by focusing the pointer in
         the image whose colormap you have changed, and then pressing
-        <keycap>Ctrl-Z</keycap> or choosing
+        <keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo> or
+        choosing
         <menuchoice>
           <guimenu>Edit</guimenu>
           <guimenuitem>Undo</guimenuitem>
diff --git a/src/dialogs/layer-mask.xml b/src/dialogs/layer-mask.xml
index e59219f..b26a567 100644
--- a/src/dialogs/layer-mask.xml
+++ b/src/dialogs/layer-mask.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-09-30 j.h : updated en ; fr to v2.4. Channel option added
   2007-07-21 alex falappa: translated improvements below
@@ -7,9 +8,7 @@
   2006-03-09 lexa: reviewed and made docbook compliant
 -->
 <sect3 id="gimp-layer-mask">
-  <title>
-    <phrase>Layer masks</phrase>
-  </title>
+  <title>Layer masks</title>
   <indexterm>
     <primary>Layer mask</primary>
   </indexterm>
@@ -19,9 +18,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase><quote>Add mask</quote> dialog</phrase>
-    </title>
+    <title><quote>Add mask</quote> dialog</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/dialogs/layer-mask-add.png" format="PNG"/>
@@ -129,9 +126,7 @@
       <term>Layer Mask example</term>
       <listitem>
         <figure>
-          <title>
-            <phrase>A layer with layer mask</phrase>
-          </title>
+          <title>A layer with layer mask</title>
           <mediaobject>
             <imageobject>
               <imagedata format="PNG"
@@ -148,9 +143,7 @@
           </mediaobject>
         </figure>
         <figure>
-          <title>
-            <phrase>Painting the layer mask</phrase>
-          </title>
+          <title>Painting the layer mask</title>
           <mediaobject>
             <imageobject>
               <imagedata format="PNG"
diff --git a/src/dialogs/navigation-dialog.xml b/src/dialogs/navigation-dialog.xml
index 4d86f09..659550a 100644
--- a/src/dialogs/navigation-dialog.xml
+++ b/src/dialogs/navigation-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-13 j.h: updated en;fr to v2.6
   2007-12-13 ude: updated 'de'
@@ -8,18 +9,14 @@
   2006-03-11 lexa: made file docbook compliant
 -->
 <sect2 id="gimp-navigation-dialog">
-  <title>
-    <phrase>Navigation Dialog</phrase>
-  </title>
+  <title>Navigation Dialog</title>
   <indexterm>
     <primary>Navigation</primary>
     <secondary>Dialog</secondary>
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>Navigation Dialog</phrase>
-    </title>
+    <title>Navigation Dialog</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/dialogs/navigation.png" format="PNG"/>
@@ -35,9 +32,7 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the dialog</phrase>
-    </title>
+    <title>Activating the dialog</title>
     <para>
       The <quote>Navigation</quote> dialog is a dockable dialog; see the section
       <xref linkend="gimp-concepts-docks"/>
@@ -98,9 +93,7 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Using the Navigation Dialog</phrase>
-    </title>
+    <title>Using the Navigation Dialog</title>
     <variablelist>
       <varlistentry>
         <term>The slider</term>
@@ -114,8 +107,21 @@
       <varlistentry>
         <term>The buttons</term>
         <listitem>
-          <para><emphasis>Zoom Out</emphasis>, <emphasis>Zoom In</emphasis> and
-            <emphasis>Zoom 1:1</emphasis> are self explanatory.
+          <para>
+            <emphasis>Zoom Out</emphasis>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-zoom-out-16.png"/>
+            </guiicon>
+            <emphasis>Zoom In</emphasis>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-zoom-in-16.png"/>
+            </guiicon>
+            and <emphasis>Zoom 1:1</emphasis>
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-zoom-original-16.png"/>
+            </guiicon>
+            are self explanatory.
           </para>
           <variablelist>
             <varlistentry>
diff --git a/src/dialogs/palettes-dialog.xml b/src/dialogs/palettes-dialog.xml
index b5f628a..b215102 100644
--- a/src/dialogs/palettes-dialog.xml
+++ b/src/dialogs/palettes-dialog.xml
@@ -154,6 +154,9 @@
         <term>Edit Palette</term>
         <listitem>
           <para>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-gtk-edit-16.png"/>
+            </guiicon>
             This button brings up the
             <link linkend="gimp-palette-editor-dialog">Palette Editor</link>.
           </para>
@@ -167,7 +170,13 @@
             <secondary>New palette</secondary>
           </indexterm>
           <para>
-            See <link linkend="gimp-palette-new">New Palette</link>.
+            About
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-document-new-16.png"/>
+            </guiicon>
+            this icon button, see
+            <link linkend="gimp-palette-new">New Palette</link>.
           </para>
         </listitem>
       </varlistentry>
@@ -179,8 +188,13 @@
             <secondary>Duplicate</secondary>
           </indexterm>
           <para>
-            See <link linkend="gimp-palette-duplicate">Duplicate
-            Palette</link>.
+            About
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-duplicate-16.png"/>
+            </guiicon>
+            this icon button, see
+            <link linkend="gimp-palette-duplicate">Duplicate Palette</link>.
           </para>
         </listitem>
       </varlistentry>
@@ -192,8 +206,12 @@
             <secondary>Delete</secondary>
           </indexterm>
           <para>
-            See <link linkend="gimp-palette-delete">Delete
-            Palette</link>.
+            About
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-delete-16.png"/>
+            </guiicon>
+            this icon button, see
+            <link linkend="gimp-palette-delete">Delete Palette</link>.
           </para>
         </listitem>
       </varlistentry>
@@ -205,7 +223,12 @@
             <secondary>Refresh</secondary>
           </indexterm>
           <para>
-            See <link linkend="gimp-palette-refresh">Refresh Palettes</link>.
+            About
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+            </guiicon>
+            this icon button, see
+            <link linkend="gimp-palette-refresh">Refresh Palettes</link>.
           </para>
         </listitem>
       </varlistentry>
@@ -243,6 +266,9 @@
             <link linkend="gimp-palette-editor-dialog">Palette Editor</link>:
             it can also be activated by double-clicking on a palette in the
             Palettes dialog, or by pressing the <quote>Edit Palette</quote>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-gtk-edit-16.png"/>
+            </guiicon>
             button at the bottom of the dialog.
           </para>
         </listitem>
@@ -607,6 +633,9 @@
       <para>
         The Palette Editor is only accessible from the Palettes dialog: you
         can activate it by double-clicking on a palette, or by pressing the
+        <guiicon>
+          <inlinegraphic fileref="images/dialogs/stock-gtk-edit-16.png"/>
+        </guiicon>
         <quote>Edit Palette</quote> button at the bottom, or by choosing
         <quote>Edit Palette</quote> from the <quote>Palettes</quote> Menu.
       </para>
@@ -658,11 +687,15 @@
           <term>Save</term>
           <listitem>
             <para>
+              <guiicon>
+                <inlinegraphic fileref="images/dialogs/stock-save-16.png"/>
+              </guiicon>
               This button causes the palette to be saved in your personal
-              <filename>palettes</filename> folder.  It would be saved
-              automatically when GIMP exits in any case, but you might want
-              to use this button if you are concerned that GIMP might crash
-              in the meantime.
+              <filename class="directory">palettes</filename> folder.  It
+              would be saved automatically when <acronym>GIMP</acronym> exits
+              in any case, but you might want to use this button if you are
+              concerned that <acronym>GIMP</acronym> might crash in the
+              meantime.
             </para>
           </listitem>
         </varlistentry>
@@ -670,6 +703,9 @@
           <term>Revert</term>
           <listitem>
             <para>
+              <guiicon>
+                <inlinegraphic fileref="images/dialogs/stock-revert-16.png"/>
+              </guiicon>
               This operation has not yet been implemented.
             </para>
           </listitem>
@@ -678,6 +714,10 @@
           <term>Edit Color</term>
           <listitem>
             <para>
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-gtk-edit-16.png"/>
+              </guiicon>
               Pops up a color editor allowing you to alter the color.  If
               the palette is one you aren't allowed to alter, this button
               will be insensitive. See
@@ -689,7 +729,13 @@
           <term>New Color from FG</term>
           <listitem>
             <para>
-              See <link linkend="gimp-palette-editor-new">below</link>
+              About
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-document-new-16.png"/>
+              </guiicon>
+              this icon button, see
+              <link linkend="gimp-palette-editor-new">below</link>.
             </para>
           </listitem>
         </varlistentry>
@@ -697,7 +743,12 @@
           <term>Delete Color</term>
           <listitem>
             <para>
-              See <link linkend="gimp-palette-editor-delete">below</link>
+              About
+              <guiicon>
+                <inlinegraphic fileref="images/dialogs/stock-delete-16.png"/>
+              </guiicon>
+              this icon button, see
+              <link linkend="gimp-palette-editor-delete">below</link>.
             </para>
           </listitem>
         </varlistentry>
@@ -705,7 +756,13 @@
           <term>Zoom Out</term>
           <listitem>
             <para>
-              See <link linkend="gimp-palette-editor-zoom-out">below</link>
+              About
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-zoom-out-16.png"/>
+              </guiicon>
+              this icon button, see
+              <link linkend="gimp-palette-editor-zoom-out">below</link>.
             </para>
           </listitem>
         </varlistentry>
@@ -713,7 +770,13 @@
           <term>Zoom In</term>
           <listitem>
             <para>
-              See <link linkend="gimp-palette-editor-zoom-in">below</link>
+              About
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-zoom-in-16.png"/>
+              </guiicon>
+              this icon button, see
+              <link linkend="gimp-palette-editor-zoom-in">below</link>.
             </para>
           </listitem>
         </varlistentry>
@@ -721,7 +784,13 @@
           <term>Zoom All</term>
           <listitem>
             <para>
-              See <link linkend="gimp-palette-editor-zoom-all">below</link>
+              About
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-zoom-best-fit-16.png"/>
+              </guiicon>
+              this icon button, see
+              <link linkend="gimp-palette-editor-zoom-all">below</link>.
             </para>
           </listitem>
         </varlistentry>
diff --git a/src/dialogs/path-dialog.xml b/src/dialogs/path-dialog.xml
index a6a7cfa..0958eb0 100644
--- a/src/dialogs/path-dialog.xml
+++ b/src/dialogs/path-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-07-01 Liang Tai: removed "Path to Selection" from path tool options that
   no longer exists
@@ -453,8 +454,12 @@
             </listitem>
             <listitem>
               <para>
-                From the <guilabel>Selection to Path</guilabel>
-                button at the bottom of the Paths dialog.
+                From the <guilabel>Selection to Path</guilabel> button
+                <guiicon>
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-selection-to-path-16.png"/>
+                </guiicon>
+                at the bottom of the Paths dialog.
               </para>
             </listitem>
           </itemizedlist>
@@ -469,8 +474,12 @@
             you can alter the way it is done using the
             <guilabel>Advanced Options</guilabel>, which are accessed by
             holding down the <keycap>Shift</keycap> key while pressing
-            the <guilabel>Selection to Path</guilabel> button at the
-            bottom of the Paths dialog.  This brings up the Advanced
+            the <guilabel>Selection to Path</guilabel> button
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-selection-to-path-16.png"/>
+            </guiicon>
+            at the bottom of the Paths dialog.  This brings up the Advanced
             Options dialog, which allows you to set 20 different options
             and variables, all with cryptic names.  The Advanced Options
             are really intended for developers only, and help with them
@@ -506,8 +515,12 @@
             </listitem>
             <listitem>
               <para>
-                From the <guilabel>Stroke Path</guilabel> button at the
-                bottom of the Paths dialog.
+                From the <guilabel>Stroke Path</guilabel> button
+                <guiicon>
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-selection-to-path-16.png"/>
+                </guiicon>
+                at the bottom of the Paths dialog.
               </para>
             </listitem>
             <listitem>
diff --git a/src/dialogs/patterns-dialog.xml b/src/dialogs/patterns-dialog.xml
index 4d256a8..9cf903c 100644
--- a/src/dialogs/patterns-dialog.xml
+++ b/src/dialogs/patterns-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-13 j.h: updated en;fr to v2.6
   2007-10-05 KoSt: updated 'no'
@@ -9,9 +10,7 @@
   2005-11-29 replaced informalfigures by figures by lexa
 -->
 <sect2 id="gimp-pattern-dialog">
-  <title>
-    <phrase>Patterns Dialog</phrase>
-  </title>
+  <title>Patterns Dialog</title>
   <indexterm>
     <primary>Dialogs</primary>
     <secondary>Patterns</secondary>
@@ -22,7 +21,7 @@
   </indexterm>
 
   <para>
-    In GIMP, a <emphasis>pattern</emphasis>
+    In <acronym>GIMP</acronym>, a <emphasis>pattern</emphasis>
     is a small image used to fill areas by placing copies of side by side. See
     the <link linkend="gimp-concepts-patterns">Patterns</link>
     section for basic information on patterns and how they can be created and
@@ -135,9 +134,7 @@
             </para>
           </note>
           <figure>
-            <title>
-              <phrase>The Patterns dialog</phrase>
-            </title>
+            <title>The Patterns dialog</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
@@ -210,7 +207,11 @@
         <listitem>
           <anchor id="gimp-pattern-delete"/>
           <para>
-            Pressing this button removes the pattern from the list and causes
+            Pressing
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-delete-16.png"/>
+            </guiicon>
+            this button removes the pattern from the list and causes
             the file representing it to be deleted from disk. Note that you
             cannot remove any of the patterns that are supplied with GIMP and
             installed in the system <filename>patterns</filename>
@@ -224,7 +225,11 @@
         <listitem>
           <anchor id="gimp-pattern-refresh"/>
           <para>
-            Pressing this button causes GIMP to rescan the folders in your
+            Pressing
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+            </guiicon>
+            this button causes GIMP to rescan the folders in your
             pattern search path, adding any newly discovered patterns to the
             list. This button is useful if you add new patterns to a folder,
             and want to make them available without having to restart GIMP.
@@ -236,7 +241,11 @@
         <listitem>
           <anchor id="gimp-pattern-open-as-image"/>
           <para>
-            If you click on this button, the current pattern is opened in a
+            If you click on
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-fileopen-16.png"/>
+            </guiicon>
+            this button, the current pattern is opened in a
             new image window. So, you can edit it. But if you try to save it
             with the <quote>.pat</quote>, even with a new name, you will bang
             into a <quote>Denied permission </quote> problem because this
diff --git a/src/dialogs/pointer-dialog.xml b/src/dialogs/pointer-dialog.xml
index f8b39be..af325ab 100644
--- a/src/dialogs/pointer-dialog.xml
+++ b/src/dialogs/pointer-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-16 j.h: updated en;fr to v2.6. Standardized xml structure, may be
              with some errors in lt;no,ru languages.
@@ -8,9 +9,7 @@
   2007-11-22 j.h: created
 -->
 <sect2 id="gimp-pointer-info-dialog">
-  <title>
-    <phrase>Pointer Dialog</phrase>
-  </title>
+  <title>Pointer Dialog</title>
   <indexterm>
     <primary>Dialogs</primary>
     <secondary>Pointer</secondary>
@@ -20,9 +19,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>Pointer dialog</phrase>
-    </title>
+    <title>Pointer dialog</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/dialogs/pointer-dialog.png" format="PNG"/>
@@ -37,9 +34,7 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the dialog</phrase>
-    </title>
+    <title>Activating the dialog</title>
     <para>
       The <quote>Pointer</quote> dialog is a dockable dialog; see the section
       <xref linkend="gimp-concepts-docks"/>
@@ -79,17 +74,11 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase><quote>Pointer</quote> dialog options</phrase>
-    </title>
+    <title><quote>Pointer</quote> dialog options</title>
     <variablelist>
-      <title>
-        <phrase>Pointer Information</phrase>
-      </title>
+      <title>Pointer Information</title>
       <varlistentry>
-        <term>
-          <phrase>Pixels</phrase>
-        </term>
+        <term>Pixels</term>
         <listitem>
           <para>
             Shows the position of the pointed pixel, in X (horizontal) and Y
@@ -99,9 +88,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Units</phrase>
-        </term>
+        <term>Units</term>
         <listitem>
           <para>
             Shows the distance from the origin, in inches.
@@ -109,9 +96,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Channel values</phrase>
-        </term>
+        <term>Channel values</term>
         <listitem>
           <variablelist>
             <para>
@@ -126,9 +111,7 @@
               menus are (<guilabel>Pixel</guilabel> is the default):
             </para>
             <varlistentry>
-              <term>
-                <phrase>Pixel</phrase>
-              </term>
+              <term>Pixel</term>
               <listitem>
                 <para>
                   The <link linkend="glossary-rgb">RGB</link> channel values.
@@ -140,9 +123,7 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>
-                <phrase>RGB</phrase>
-              </term>
+              <term>RGB</term>
               <listitem>
                 <para>
                   The <link linkend="glossary-rgb">RGB</link> channel values.
@@ -155,9 +136,7 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>
-                <phrase>HSV</phrase>
-              </term>
+              <term>HSV</term>
               <listitem>
                 <para>
                   The <link linkend="glossary-hsv">HSV</link> components.
@@ -169,9 +148,7 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>
-                <phrase>CMYK</phrase>
-              </term>
+              <term>CMYK</term>
               <listitem>
                 <para>
                   The <link linkend="glossary-cmyk">CMYK</link> channel
@@ -186,9 +163,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Sample Merged</phrase>
-        </term>
+        <term>Sample Merged</term>
         <listitem>
           <para>
             If this option is checked (default), sampling is performed on all
diff --git a/src/dialogs/sample-points.xml b/src/dialogs/sample-points.xml
index e27b724..8019c07 100644
--- a/src/dialogs/sample-points.xml
+++ b/src/dialogs/sample-points.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-16 j.h: updated en;fr to v2.6. Added Hexa data
   2008-01-10 ciampix: updated italian translation
@@ -8,9 +9,7 @@
   2007-11-18 j.h: created
 -->
 <sect2 id="gimp-sample-point-dialog">
-  <title>
-    <phrase>Sample Points Dialog</phrase>
-  </title>
+  <title>Sample Points Dialog</title>
   <indexterm>
     <primary>Dialog</primary>
     <secondary>Sample Points</secondary>
@@ -27,9 +26,7 @@
     as you are working on the image.
   </para>
   <sect3>
-    <title>
-      <phrase>Activating the dialog</phrase>
-    </title>
+    <title>Activating the dialog</title>
     <para>
       The <quote>Sample Points</quote> dialog is a dockable dialog; see the
       section <xref linkend="gimp-concepts-docks"/> for help on manipulating
@@ -68,9 +65,7 @@
     </itemizedlist>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Using sample points</phrase>
-    </title>
+    <title>Using sample points</title>
     <para>
       To create a sample point, Ctrl-click on one of the two measure rules
       of the image window and drag the mouse pointer. Two perpendicular
@@ -101,9 +96,7 @@
       merged</guilabel> option in the tab menu:
     </para>
     <figure>
-      <title>
-        <phrase>The <quote>Sample Point</quote> menu</phrase>
-      </title>
+      <title>The <quote>Sample Point</quote> menu</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
@@ -113,14 +106,9 @@
     </figure>
   </sect3>
   <sect3>
-    <title>
-      <phrase><quote>Sample Points</quote> dialog description
-      </phrase>
-    </title>
+    <title><quote>Sample Points</quote> dialog description</title>
     <figure>
-      <title>
-        <phrase>Sample points dialog</phrase>
-      </title>
+      <title>Sample points dialog</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
@@ -141,9 +129,7 @@
     </para>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Pixel</phrase>
-        </term>
+        <term>Pixel</term>
         <listitem>
           <para>
             This choice displays the <emphasis>Red</emphasis>,
@@ -154,9 +140,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>RGB</phrase>
-        </term>
+        <term>RGB</term>
         <listitem>
           <para>
             This choice displays the <emphasis>Red</emphasis>,
@@ -167,9 +151,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>HSV</phrase>
-        </term>
+        <term>HSV</term>
         <listitem>
           <para>
             This choice displays the <emphasis>Hue</emphasis>, in degrees, as
@@ -180,9 +162,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>CMYK</phrase>
-        </term>
+        <term>CMYK</term>
         <listitem>
           <para>
             This choice displays the <emphasis>Cyan</emphasis>,
diff --git a/src/dialogs/templates-dialog.xml b/src/dialogs/templates-dialog.xml
index 785c2d3..e1d5d63 100644
--- a/src/dialogs/templates-dialog.xml
+++ b/src/dialogs/templates-dialog.xml
@@ -118,7 +118,11 @@
           <term>Create a new image from the selected template</term>
           <listitem>
             <para>
-              Clicking on this button opens the
+              Clicking on
+              <guiicon>
+                <inlinegraphic fileref="images/dialogs/stock-image-16.png"/>
+              </guiicon>
+              this button opens the
               <link linkend="gimp-file-new">Create a new image</link>
               on the model of the selected template.
             </para>
@@ -128,7 +132,11 @@
           <term>Create a new template</term>
           <listitem>
             <para>
-              Clicking on this button opens the
+              Clicking on
+              <guiicon>
+                <inlinegraphic fileref="images/dialogs/dialogs-icon-new.png"/>
+              </guiicon>
+              this button opens the
               <link linkend="edit-template-dialog">New template</link>
               dialog, identical to the Edit Template dialog, that we will see
               below.
@@ -139,7 +147,12 @@
           <term>Duplicate the selected template</term>
           <listitem>
             <para>
-              Clicking on this button opens the Edit Template dialog that we
+              Clicking on
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-duplicate-16.png"/>
+              </guiicon>
+              this button opens the Edit Template dialog that we
               are going to study now.
             </para>
           </listitem>
@@ -148,7 +161,11 @@
           <term>Edit the selected template</term>
           <listitem>
             <para>
-              Clicking on this button opens the
+              Clicking on
+              <guiicon>
+                <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
+              </guiicon>
+              this button opens the
               <link linkend="edit-template-dialog">Edit Template</link>
               dialog.
             </para>
@@ -158,6 +175,17 @@
           <term>Delete the selected template</term>
           <listitem>
             <para>Guess what?</para>
+            <tip>
+              <para>
+                Every templates are stored in a <filename>templaterc</filename>
+                file at your personal <acronym>GIMP</acronym> directory.
+                If you want to restore some deleted templates, you can copy or
+                append template entries to your file from the master
+                <filename>templaterc</filename> file at the
+                <filename class="directory">etc/gimp/2.0</filename> directory
+                of the <acronym>GIMP</acronym>'s system folder.
+              </para>
+            </tip>
           </listitem>
         </varlistentry>
       </variablelist>
diff --git a/src/dialogs/tools-dialog.xml b/src/dialogs/tools-dialog.xml
index 5880d48..497a168 100644
--- a/src/dialogs/tools-dialog.xml
+++ b/src/dialogs/tools-dialog.xml
@@ -115,8 +115,19 @@
     <para>
       You can also change the order of tools in the Toolbox, by clicking on
       an item in the <quote>Tools</quote> dialog, in List mode, and dragging
-      it up or down in the list. If you screw things up, you can always press
-      the <quote>Reset</quote> button at the bottom of the dialog, to restore
+      it up or down in the list. Selected item can be also moved by clicking
+      <guiicon>
+        <inlinegraphic fileref="images/dialogs/dialogs-icon-raise.png"/>
+      </guiicon> or
+      <guiicon>
+        <inlinegraphic fileref="images/dialogs/dialogs-icon-lower.png"/>
+      </guiicon>
+      icon at the bottom of the dialog. If you screw things up, you can
+      always press the <quote>Reset</quote>
+      <guiicon>
+        <inlinegraphic fileref="images/dialogs/stock-reset-16.png"/>
+      </guiicon>
+      button at the bottom of the dialog, to restore
       the defaults for order and visibility.
     </para>
     <para>
diff --git a/src/dialogs/undo-history-dialog.xml b/src/dialogs/undo-history-dialog.xml
index 0aa4da6..0588281 100644
--- a/src/dialogs/undo-history-dialog.xml
+++ b/src/dialogs/undo-history-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-13 j.h: updated en;fr to v2.6
   2007-10-07 j.h : v2.4 no change.
@@ -21,7 +22,8 @@
     <title>The Undo History dialog</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/undo-history-dialog.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/undo-history-dialog.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -91,6 +93,9 @@
         <term>Undo</term>
         <listitem>
           <para>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-undo-16.png"/>
+            </guiicon>
             This button has the same effect as choosing
             <menuchoice>
               <guimenu>Edit</guimenu>
@@ -106,6 +111,9 @@
         <term>Redo</term>
         <listitem>
           <para>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-redo-16.png"/>
+            </guiicon>
             This button has the same effect as choosing
             <menuchoice>
               <guimenu>Edit</guimenu>
@@ -121,6 +129,10 @@
         <term>Clear Undo History</term>
         <listitem>
           <para>
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-edit-clear-16.png"/>
+            </guiicon>
             This button removes all contents from the undo history except the
             current state. If you press it, you are asked to confirm that you
             really want to do this. The only reason for doing it would be if
diff --git a/src/filters/alpha-to-logo/alien-glow.xml b/src/filters/alpha-to-logo/alien-glow.xml
index b353ea9..585d958 100644
--- a/src/filters/alpha-to-logo/alien-glow.xml
+++ b/src/filters/alpha-to-logo/alien-glow.xml
@@ -97,9 +97,7 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
       <menuchoice>
diff --git a/src/filters/alpha-to-logo/alien-neon.xml b/src/filters/alpha-to-logo/alien-neon.xml
index 2aae37b..18417e0 100644
--- a/src/filters/alpha-to-logo/alien-neon.xml
+++ b/src/filters/alpha-to-logo/alien-neon.xml
@@ -39,9 +39,7 @@
     </caution>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
       <menuchoice>
diff --git a/src/filters/alpha-to-logo/chrome.xml b/src/filters/alpha-to-logo/chrome.xml
index 136ed15..d8b0dbd 100644
--- a/src/filters/alpha-to-logo/chrome.xml
+++ b/src/filters/alpha-to-logo/chrome.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-08-25 kost: added 'no'
   2008-08-24 ude: created ('en','de')
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="script-fu-chrome-logo-alpha">
-  <title>
-    <phrase>Chrome</phrase>
-  </title>
+  <title>Chrome</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -17,18 +16,13 @@
     <primary>Chrome</primary>
   </indexterm>
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Chrome</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Chrome</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/chrome.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/alpha-to-logo/chrome.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Chrome</quote> filter applied</para>
@@ -36,7 +30,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/file/create/logos/chrome.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/menus/file/create/logos/chrome.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Chrome</quote> logo</para>
@@ -64,45 +59,41 @@
     <xi:include href="about-resizing-image.xml"/>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Chrome</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Chrome</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Chrome</quote> options</phrase>
-      </title>
+      <title><quote>Chrome</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/chrome-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/alpha-to-logo/chrome-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry id="script-fu-chrome-logo-alpha-offset">
-        <term>
-          <phrase>Offset (pixels * 2)</phrase>
-        </term>
+        <term>Offset (pixels * 2)</term>
         <listitem>
           <para>
             This option is used when creating the chrome effect and for
             placing the drop shadow:
           </para>
           <figure>
-            <title>
-              <phrase><quote>Offset</quote> examples</phrase>
-            </title>
+            <title><quote>Offset</quote> examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/alpha-to-logo/chrome-offs25.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/alpha-to-logo/chrome-offs25.jpg"/>
               </imageobject>
               <caption>
                 <para>Offset 25</para>
@@ -110,7 +101,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/alpha-to-logo/chrome-offs50.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/alpha-to-logo/chrome-offs50.jpg"/>
               </imageobject>
               <caption>
                 <para>Offset 50</para>
@@ -118,7 +110,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/alpha-to-logo/chrome-offs100.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/alpha-to-logo/chrome-offs100.jpg"/>
               </imageobject>
               <caption>
                 <para>Offset 100</para>
@@ -142,9 +135,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background Color</phrase>
-        </term>
+        <term>Background Color</term>
         <listitem>
           <para>
             This color is used to fill the background layer created by the
diff --git a/src/filters/alpha-to-logo/frosty.xml b/src/filters/alpha-to-logo/frosty.xml
index 4ad774e..0200c83 100644
--- a/src/filters/alpha-to-logo/frosty.xml
+++ b/src/filters/alpha-to-logo/frosty.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-10-29 ude: continued ('en','de')
   2088-08-19 kost: added 'no'
   2008-08-17 ude: created stub ('en','de')
 -->
 <sect2 id="script-fu-frosty-logo-alpha">
-  <title>
-    <phrase>Frosty</phrase>
-  </title>
+  <title>Frosty</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Alpha to Logo</secondary>
@@ -18,18 +17,13 @@
     <primary>Frosty</primary>
   </indexterm>
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Frosty</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Frosty</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/frosty.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/alpha-to-logo/frosty.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Frosty</quote> filter applied</para>
@@ -37,7 +31,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/file/create/logos/frosty.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/menus/file/create/logos/frosty.jpg"/>
         </imageobject>
         <caption>
           <para>The <quote>Frosty</quote> logo</para>
@@ -64,41 +59,37 @@
     </note>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Alpha to Logo</guisubmenu><guimenuitem>Frosty</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Alpha to Logo</guisubmenu>
+        <guimenuitem>Frosty</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Frosty</quote> options</phrase>
-      </title>
+      <title><quote>Frosty</quote> options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/alpha-to-logo/frosty-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/alpha-to-logo/frosty-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Effect size (pixels)</phrase>
-        </term>
+        <term>Effect size (pixels)</term>
         <listitem>
           <figure>
-            <title>
-              <phrase><quote>Effect size</quote> examples</phrase>
-            </title>
+            <title><quote>Effect size</quote> examples</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/alpha-to-logo/frosty-10.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/alpha-to-logo/frosty-10.jpg"/>
               </imageobject>
               <caption>
                 <para>Effect size 10</para>
@@ -106,7 +97,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/alpha-to-logo/frosty-200.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/alpha-to-logo/frosty-200.jpg"/>
               </imageobject>
               <caption>
                 <para>Effect size 200</para>
@@ -114,7 +106,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/alpha-to-logo/frosty-400.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/filters/alpha-to-logo/frosty-400.jpg"/>
               </imageobject>
               <caption>
                 <para>Effect size 400</para>
@@ -124,9 +117,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Background color</phrase>
-        </term>
+        <term>Background color</term>
         <listitem>
           <para>
             This color is used to fill the background layer created by the
diff --git a/src/filters/artistic.xml b/src/filters/artistic.xml
index 27bf0d3..fbc0207 100644
--- a/src/filters/artistic.xml
+++ b/src/filters/artistic.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-08-08 ude: moved Van Gogh (LIC) from map filters
   2007-04-28 KoSt: added 'no'
   050903 de added by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-artistic">
-  <title>
-    <phrase>Artistic Filters</phrase>
-  </title>
+  <title>Artistic Filters</title>
   <xi:include href="artistic/introduction.xml"/>
   <xi:include href="artistic/cartoon.xml"/>
   <xi:include href="artistic/photocopy.xml"/>
diff --git a/src/filters/artistic/introduction.xml b/src/filters/artistic/introduction.xml
index a25809c..672eeb1 100644
--- a/src/filters/artistic/introduction.xml
+++ b/src/filters/artistic/introduction.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-28 Added Spanish translation by AntI
   2007-04-28 KoSt: added 'no'
   2005-09-12 de added by axel.wernicke
 -->
 <sect2 id="filters-artistic-introduction">
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Artistic</secondary>
diff --git a/src/filters/artistic/oilify.xml b/src/filters/artistic/oilify.xml
index 6ae7afd..b79c279 100644
--- a/src/filters/artistic/oilify.xml
+++ b/src/filters/artistic/oilify.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-25 Added Spanish translation by AntI
   2007-05-15 ude: removed filters-artistic-oilify.png
@@ -8,9 +9,7 @@
   050916 de added by axel.wernicke
 -->
 <sect2 id="plug-in-oilify">
-  <title>
-    <phrase>Oilify</phrase>
-  </title>
+  <title>Oilify</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Artistic</secondary>
@@ -20,18 +19,13 @@
     <primary>Oilify</primary>
   </indexterm>
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Oilify</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Oilify</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -39,7 +33,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/artistic-taj-oilify.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/artistic-taj-oilify.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Oilify</quote> applied</para>
@@ -60,26 +55,24 @@
     </tip>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image menu through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Artistic</guisubmenu><guimenuitem>Oilify...</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Artistic</guisubmenu>
+        <guimenuitem>Oilify...</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Oilify</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Oilify</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-artistic-oilify.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-artistic-oilify.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/artistic/photocopy.xml b/src/filters/artistic/photocopy.xml
index 3793b70..48f3fde 100644
--- a/src/filters/artistic/photocopy.xml
+++ b/src/filters/artistic/photocopy.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-25 Added Spanish translation by AntI
   2007-05-03 KoSt: added 'no'
@@ -8,9 +9,7 @@
   051022 en;fr by julien hardelin
 -->
 <sect2 id="plug-in-photocopy">
-  <title>
-    <phrase>Photocopy</phrase>
-  </title>
+  <title>Photocopy</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Artistic</secondary>
@@ -20,18 +19,13 @@
     <primary>Photocopy</primary>
   </indexterm>
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Photocopy</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Photocopy</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -39,7 +33,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/artistic-taj-photocopy.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/artistic-taj-photocopy.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Photocopy</quote> applied</para>
@@ -63,27 +58,27 @@
       </para>
     </tip>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Starting filter</phrase>
-    </title>
+    <title>Starting filter</title>
     <para>
       You can find this filter from the image menu through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Artistic</guisubmenu><guimenuitem>Photocopy</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Artistic</guisubmenu>
+        <guimenuitem>Photocopy</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Photocopy</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Photocopy</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-artistic-photocopy.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-artistic-photocopy.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/filters/artistic/vangogh-lic.xml b/src/filters/artistic/vangogh-lic.xml
index 069c0f1..96fccea 100644
--- a/src/filters/artistic/vangogh-lic.xml
+++ b/src/filters/artistic/vangogh-lic.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-02-09 kost: rewritten 'no'
   2007-12-16 Tiger-222: updated 'fr'
@@ -11,9 +12,7 @@
   2005-11-15: created by julien hardelin
 -->
 <sect2 id="plug-in-lic">
-  <title>
-    <phrase>Van Gogh (LIC)</phrase>
-  </title>
+  <title>Van Gogh (LIC)</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Artistic</secondary>
@@ -23,18 +22,15 @@
     <primary>Van Gogh (LIC)</primary>
   </indexterm>
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
       <title>
-        <phrase>
-          From left to right: original image, map, resulting image
-        </phrase>
+        From left to right: original image, map, resulting image
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/map-lic-s.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/map-lic-s.png"/>
         </imageobject>
         <caption>
           <para>
@@ -61,27 +57,27 @@
       solid areas of the map are ignored.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Artistic</guisubmenu><guimenuitem>Van Gogh (LIC)</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Artistic</guisubmenu>
+        <guimenuitem>Van Gogh (LIC)</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Van Gogh (LIC)</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Van Gogh (LIC)</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-artistic-vangogh.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-artistic-vangogh.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -104,9 +100,7 @@
     </tip>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Convolution</phrase>
-        </term>
+        <term>Convolution</term>
         <listitem>
           <para>
             You can use two types of convolution. That's the first parameter
@@ -129,9 +123,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Effect Image</phrase>
-        </term>
+        <term>Effect Image</term>
         <listitem>
           <para>
             That's the map for blur or pattern direction. This map must have
@@ -140,12 +132,11 @@
             filter so that you can choose it in the drop-list.
           </para>
           <figure>
-            <title>
-              <phrase>Blurring with vertical gradient map</phrase>
-            </title>
+            <title>Blurring with vertical gradient map</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-vert-blur.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-vert-blur.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -155,12 +146,11 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>Blurring with a square gradient map</phrase>
-            </title>
+            <title>Blurring with a square gradient map</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-sq-blur.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-sq-blur.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -173,12 +163,11 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>Texture example</phrase>
-            </title>
+            <title>Texture example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-vert-pat.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-vert-pat.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -193,9 +182,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Effect Channel</phrase>
-        </term>
+        <term>Effect Channel</term>
         <listitem>
           <para>
             By selecting <guilabel>Hue</guilabel>, <guilabel>Saturation
@@ -205,21 +192,18 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Effect Operator</phrase>
-        </term>
+        <term>Effect Operator</term>
         <listitem>
           <para>
             The <quote>Derivative</quote> option reverses <quote>Gradient
             </quote> direction:
           </para>
           <figure>
-            <title>
-              <phrase>Derivative option example</phrase>
-            </title>
+            <title>Derivative option example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-deriv.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-deriv.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -234,9 +218,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Filter Length</phrase>
-        </term>
+        <term>Filter Length</term>
         <listitem>
           <para>
             When applying blur, this option controls how important blur is.
@@ -244,14 +226,11 @@
             values result in smooth surface; high values in rough surface.
           </para>
           <figure>
-            <title>
-              <phrase>
-                Action example of Filter Length on blur
-              </phrase>
-            </title>
+            <title>Action example of Filter Length on blur</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-blur-lg.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-blur-lg.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -264,12 +243,11 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>Filter Length example on texture</phrase>
-            </title>
+            <title>Filter Length example on texture</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-text-lg.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-text-lg.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -282,9 +260,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Noise Magnitude</phrase>
-        </term>
+        <term>Noise Magnitude</term>
         <listitem>
           <para>
             This options controls the amount and size of White Noise. Low
@@ -292,14 +268,11 @@
             coarse-grained textures.
           </para>
           <figure>
-            <title>
-              <phrase>
-                Action example of Noise Magnitude on texture
-              </phrase>
-            </title>
+            <title>Action example of Noise Magnitude on texture</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-vp-nm4.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-vp-nm4.png"/>
               </imageobject>
               <caption>
                 <para>Noise magnitude = 4</para>
@@ -309,22 +282,17 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Integration Steps</phrase>
-        </term>
+        <term>Integration Steps</term>
         <listitem>
           <para>
             This options controls the influence of gradient map on texture.
           </para>
           <figure>
-            <title>
-              <phrase>
-                Action example of Integration Steps on texture
-              </phrase>
-            </title>
+            <title>Action example of Integration Steps on texture</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-is.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-is.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -337,9 +305,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Minimum/Maximum values</phrase>
-        </term>
+        <term>Minimum/Maximum values</term>
         <listitem>
           <para>
             Both values determine a range controlling texture contrast:
@@ -347,14 +313,11 @@
             in low contrast.
           </para>
           <figure>
-            <title>
-              <phrase>
-                Action example of Min/max values on texture
-              </phrase>
-            </title>
+            <title>Action example of Min/max values on texture</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/map-lic-mm.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/map-lic-mm.png"/>
               </imageobject>
               <caption>
                 <para>
diff --git a/src/filters/combine.xml b/src/filters/combine.xml
index 532e356..4a216c9 100644
--- a/src/filters/combine.xml
+++ b/src/filters/combine.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-07-12 Added Spanish translation by AntI
   2007-05-27 KoSt: added 'no'
   050904 de added by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-combine">
-  <title>
-    <phrase>Combine Filters</phrase>
-  </title>
+  <title>Combine Filters</title>
   <xi:include href="combine/introduction.xml"/>
   <xi:include href="combine/depthmerge.xml"/>
   <xi:include href="combine/film.xml"/>
diff --git a/src/filters/decor.xml b/src/filters/decor.xml
index 3d83f43..77e18ba 100644
--- a/src/filters/decor.xml
+++ b/src/filters/decor.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-09-25 KoSt: added 'no'
   2007-09-17 ude: added carve-it.xml
@@ -15,9 +16,7 @@
   2007-08-13 ude: created (as skeleton)
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-decor">
-  <title>
-    <phrase>Decor Filters</phrase>
-  </title>
+  <title>Decor Filters</title>
   <xi:include href="decor/introduction.xml"/>
   <xi:include href="decor/add-bevel.xml"/>
   <xi:include href="decor/addborder.xml"/>
diff --git a/src/filters/decor/fuzzyborder.xml b/src/filters/decor/fuzzyborder.xml
index 0756e0f..9443be2 100644
--- a/src/filters/decor/fuzzyborder.xml
+++ b/src/filters/decor/fuzzyborder.xml
@@ -64,9 +64,7 @@
   <sect3>
     <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Fuzzy Border</quote> options</phrase>
-      </title>
+      <title><quote>Fuzzy Border</quote> options</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
@@ -101,9 +99,7 @@
             the effect of blurring:
           </para>
           <figure>
-            <title>
-              <phrase><quote>Blur border</quote> example</phrase>
-            </title>
+            <title><quote>Blur border</quote> example</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
diff --git a/src/filters/enhance/destripe.xml b/src/filters/enhance/destripe.xml
index 392f976..f59e7e4 100644
--- a/src/filters/enhance/destripe.xml
+++ b/src/filters/enhance/destripe.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-08-19 AntI: added 'es'
   2007-04-14 KoSt: added 'no'
@@ -51,10 +52,7 @@
   <sect3>
     <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Destripe</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Destripe</quote> filter options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/filters/options-enhance-destripe.png"
diff --git a/src/filters/light_effects/flarefx.xml b/src/filters/light_effects/flarefx.xml
index db6d139..a319f12 100644
--- a/src/filters/light_effects/flarefx.xml
+++ b/src/filters/light_effects/flarefx.xml
@@ -66,25 +66,19 @@
     </para>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Lens Flare</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Lens Flare</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-light-flarefx.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-light-flarefx.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Preview</phrase>
-        </term>
+        <term>Preview</term>
         <listitem>
           <para>
             Parameter setting results are interactively displayed in preview.
diff --git a/src/filters/light_effects/gflare.xml b/src/filters/light_effects/gflare.xml
index 8b51fc4..c83ffc0 100644
--- a/src/filters/light_effects/gflare.xml
+++ b/src/filters/light_effects/gflare.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-15 j.h: no change for v2.6
   2007-01-03 MikaS: updated 'fr'
@@ -29,7 +30,8 @@
       <title>Example for the Gradient Flare filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -37,7 +39,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/light-taj-gflare.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/light-taj-gflare.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Gradient Flare</quote> applied</para>
@@ -52,10 +55,9 @@
       <emphasis>Rays</emphasis> and <emphasis>Second Flares</emphasis>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activating the filter</phrase>
-    </title>
+    <title>Activating the filter</title>
     <para>
       This filter is found in the image window menu under
       <menuchoice>
@@ -95,7 +97,8 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/gflare-options-1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/gflare-options-1.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -160,7 +163,8 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/gflare-options-2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/gflare-options-2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -214,12 +218,12 @@
         <listitem>
           <figure>
             <title>
-              <phrase><quote>Gradient Flare Editor</quote> options (General)
-              </phrase>
+              <quote>Gradient Flare Editor</quote> options (General)
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/gflare-editor-1.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/gflare-editor-1.png"/>
               </imageobject>
             </mediaobject>
           </figure>
@@ -301,7 +305,8 @@
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/gflare-editor-2.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/gflare-editor-2.png"/>
               </imageobject>
             </mediaobject>
           </figure>
@@ -377,7 +382,8 @@
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/gflare-editor-3.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/gflare-editor-3.png"/>
               </imageobject>
             </mediaobject>
           </figure>
@@ -423,7 +429,8 @@
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/gflare-editor-4.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/gflare-editor-4.png"/>
               </imageobject>
             </mediaobject>
           </figure>
diff --git a/src/filters/light_effects/lighting.xml b/src/filters/light_effects/lighting.xml
index 04d6fa8..a5eaf69 100644
--- a/src/filters/light_effects/lighting.xml
+++ b/src/filters/light_effects/lighting.xml
@@ -240,10 +240,7 @@
         <term>Material</term>
         <listitem>
           <figure>
-            <title>
-              <phrase><quote>Material</quote> tab of the Lighting filter
-              </phrase>
-            </title>
+            <title><quote>Material</quote> tab of the Lighting filter</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
@@ -312,8 +309,7 @@
         <listitem>
           <figure>
             <title>
-              <phrase><quote>Bumpmap</quote> options of the Lighting filter
-              </phrase>
+              <quote>Bumpmap</quote> options of the Lighting filter
             </title>
             <mediaobject>
               <imageobject>
@@ -375,10 +371,7 @@
         <term>Environment Map</term>
         <listitem>
           <figure>
-            <title>
-              <phrase><quote>Environment map</quote> options
-              </phrase>
-            </title>
+            <title><quote>Environment map</quote> options</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
diff --git a/src/filters/light_effects/perspective-shadow.xml b/src/filters/light_effects/perspective-shadow.xml
index cd884c7..9ebd607 100644
--- a/src/filters/light_effects/perspective-shadow.xml
+++ b/src/filters/light_effects/perspective-shadow.xml
@@ -278,9 +278,7 @@
             resizing to make the shadow visible.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Allow resizing</quote> example</phrase>
-            </title>
+            <title><quote>Allow resizing</quote> example</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
diff --git a/src/filters/map.xml b/src/filters/map.xml
index 0f76d14..bc22678 100644
--- a/src/filters/map.xml
+++ b/src/filters/map.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-09-07 AntI: added 'es'
   2007-08-08 ude: moved Van Gogh (LIC) to artistic filters
@@ -8,9 +9,7 @@
   2005-10-05 created by julien hardelin
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-map">
-  <title>
-    <phrase>Map Filters</phrase>
-  </title>
+  <title>Map Filters</title>
   <xi:include href="map/introduction.xml"/>
   <xi:include href="map/bumpmap.xml"/>
   <xi:include href="map/displace.xml"/>
diff --git a/src/filters/map/illusion.xml b/src/filters/map/illusion.xml
index d19b631..3beea7d 100644
--- a/src/filters/map/illusion.xml
+++ b/src/filters/map/illusion.xml
@@ -52,9 +52,7 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
       <menuchoice>
diff --git a/src/filters/map/introduction.xml b/src/filters/map/introduction.xml
index 22a9841..e92d30c 100644
--- a/src/filters/map/introduction.xml
+++ b/src/filters/map/introduction.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
      2007-05-06 KoSt: added 'no'
      2006-12-12 lexa: added german translation
      2005-09-30: created by julien hardelin
      -->
 <sect2 id="filters-map-introduction">
-  <title>
-    <phrase>Introduction</phrase>
-  </title>
+  <title>Introduction</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Map</secondary>
@@ -17,9 +16,10 @@
   <para>
     Map filters use an object named <emphasis>map</emphasis> to modify an
     image: you map the image to the object. So, you can create 3D effects
-    by mapping your image to another previously embossed image ("Bumpmap"
-    Filter) or to a sphere ("Map Object" filter). You can also map a part
-    of the image elsewhere into the same image ("Illusion" and "Make
-    Seamless" filters), bend a text along a curve ("Displace" filter)...
+    by mapping your image to another previously embossed image
+    (<quote>Bumpmap</quote> Filter) or to a sphere (<quote>Map Object</quote>
+    filter). You can also map a part of the image elsewhere into the same
+    image (<quote>Illusion</quote> and <quote>Make Seamless</quote> filters),
+    bend a text along a curve (<quote>Displace</quote> filter)...
   </para>
 </sect2>
diff --git a/src/filters/map/make-seamless.xml b/src/filters/map/make-seamless.xml
index 61c7e40..8593b8f 100644
--- a/src/filters/map/make-seamless.xml
+++ b/src/filters/map/make-seamless.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
      2007-05-07 KoSt: added 'no'
      2006-12-13 lexa: added german translation
@@ -7,9 +8,7 @@
      2005-11-04 Created, en;fr, by julien hardelin
      -->
 <sect2 id="plug-in-make-seamless">
-  <title>
-    <phrase>Make Seamless</phrase>
-  </title>
+  <title>Make Seamless</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Map</secondary>
@@ -19,16 +18,13 @@
     <primary>Make Seamless</primary>
   </indexterm>
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>An example of Make Seamless.</phrase>
-      </title>
+      <title>An example of Make Seamless.</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original</para>
@@ -36,7 +32,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/map-taj-seamless.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/map-taj-seamless.jpg"/>
         </imageobject>
         <caption>
           <para>Make Seamless applied</para>
@@ -49,13 +46,16 @@
       no option, and result may need correction.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activation</phrase>
-    </title>
+    <title>Activation</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Map</guisubmenu><guimenuitem>Make Seamless</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Map</guisubmenu>
+        <guimenuitem>Make Seamless</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
 </sect2>
diff --git a/src/filters/map/tile.xml b/src/filters/map/tile.xml
index 159d37f..6f8670d 100644
--- a/src/filters/map/tile.xml
+++ b/src/filters/map/tile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-09-04 AntI: added 'es'
   2007-05-08 KoSt: added 'no'
@@ -7,9 +8,7 @@
   2005-10-24 created en;fr by julien hardelin
 -->
 <sect2 id="plug-in-tile">
-  <title>
-    <phrase>Tile</phrase>
-  </title>
+  <title>Tile</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Map</secondary>
@@ -19,18 +18,13 @@
     <primary>Tile</primary>
   </indexterm>
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          The same image, before and after applying Tile filter
-        </phrase>
-      </title>
+      <title>The same image, before and after applying Tile filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/2zinnias.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/2zinnias.png"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -38,7 +32,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/map-tile.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/map-tile.png"/>
         </imageobject>
         <caption>
           <para>(We have reduced image size intentionally)</para>
@@ -50,43 +45,46 @@
       reduced size, into a bigger (new) image.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Map</guisubmenu><guimenuitem>Tile</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Map</guisubmenu>
+        <guimenuitem>Tile</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Tile</quote> filter options</phrase>
-      </title>
+      <title><quote>Tile</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-map-tile.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-map-tile.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
-      <title>
-        <phrase>Tile to new size</phrase>
-      </title>
+      <title>Tile to new size</title>
       <varlistentry>
-        <term>
-          <phrase>Width/Height</phrase>
-        </term>
+        <term>Width/Height</term>
         <listitem>
           <para>
             Input boxes and their arrow-heads allow you to enter the
             dimensions for the new image. Both directions are linked by
             default with a chain
-            <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/dialogs/stock-vchain-24.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>.
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject><imagedata format="PNG"
+                    fileref="images/dialogs/stock-vchain-24.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>.
             You can make them independent by breaking
             this chain. You can choose a unit else than pixel by clicking on
             the drop-down list button.
@@ -101,9 +99,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Create New image</phrase>
-        </term>
+        <term>Create New image</term>
         <listitem>
           <para>
             It's in your interest to keep this option checked to avoid
diff --git a/src/filters/map/warp.xml b/src/filters/map/warp.xml
index 86279ef..82753bd 100644
--- a/src/filters/map/warp.xml
+++ b/src/filters/map/warp.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-09 ude: moved "activate filter" paras to separate sect3
   2007-09-05 AntI: added 'es'
@@ -36,7 +37,8 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/example-map-warp1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/example-map-warp1.png"/>
         </imageobject>
         <caption>
           <para>
@@ -52,7 +54,8 @@
       <title>With a non-linear gradient</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/example-map-warp2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/example-map-warp2.png"/>
         </imageobject>
         <caption>
           <para>A non-linear gradient leads to curls.</para>
@@ -60,10 +63,11 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>With a complex gradient: </title>
+      <title>With a complex gradient:</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/example-map-warp3.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/example-map-warp3.png"/>
         </imageobject>
         <caption>
           <para>
@@ -79,10 +83,9 @@
       protect it against filter action.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activating the filter</phrase>
-    </title>
+    <title>Activating the filter</title>
     <para>
       This filter is found in the image window menu under
       <menuchoice>
@@ -93,13 +96,15 @@
       This filter has no Preview.
     </para>
   </sect3>
+
   <sect3>
     <title>Options</title>
     <figure>
       <title>Warp filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-map-warp.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-map-warp.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -191,7 +196,8 @@
             <title>With a 3.00 dither size:</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/example-map-warp4.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/example-map-warp4.png"/>
               </imageobject>
             </mediaobject>
           </figure>
@@ -211,7 +217,8 @@
             <title>With a 10° angle and 6 iterations:</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/example-map-warp5.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/example-map-warp5.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -246,7 +253,8 @@
             <title>Magnitude Map example:</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/example-map-warp6.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/example-map-warp6.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -288,7 +296,8 @@
             <title>Gradient map example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/example-map-warp7.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/example-map-warp7.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -311,7 +320,8 @@
             <title>Vector map example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/filters/examples/example-map-warp8.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/filters/examples/example-map-warp8.png"/>
               </imageobject>
               <caption>
                 <para>
diff --git a/src/filters/noise.xml b/src/filters/noise.xml
index ee319ac..cd753e4 100644
--- a/src/filters/noise.xml
+++ b/src/filters/noise.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-04-07 KoSt: added 'no'
   050826 de added by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-noise">
-  <title>
-    <phrase>Noise Filters</phrase>
-  </title>
+  <title>Noise Filters</title>
   <xi:include href="noise/introduction.xml"/>
   <xi:include href="noise/hurl.xml"/>
   <xi:include href="noise/noisify.xml"/>
diff --git a/src/filters/noise/pick.xml b/src/filters/noise/pick.xml
index 87ae126..9d1542a 100644
--- a/src/filters/noise/pick.xml
+++ b/src/filters/noise/pick.xml
@@ -23,11 +23,7 @@
   <sect3>
     <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example of applying the <quote>Pick</quote> filter
-        </phrase>
-      </title>
+      <title>Example of applying the <quote>Pick</quote> filter</title>
       <mediaobject>
         <imageobject>
           <imagedata format="JPG"
diff --git a/src/filters/render.xml b/src/filters/render.xml
index ccadcf4..95480e1 100644
--- a/src/filters/render.xml
+++ b/src/filters/render.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-15 AntI: Added "es"
   2007-05-10 KoSt: added 'no'
   050904 de added by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="filters-render">
-  <title>
-    <phrase>Rendering Filters</phrase>
-  </title>
+  <title>Rendering Filters</title>
   <xi:include href="render/introduction.xml"/>
   <xi:include href="render/plasma.xml"/>
   <xi:include href="render/solid_noise.xml"/>
diff --git a/src/filters/render/fractalexplorer.xml b/src/filters/render/fractalexplorer.xml
index 5f2bfe9..ad4e6d3 100644
--- a/src/filters/render/fractalexplorer.xml
+++ b/src/filters/render/fractalexplorer.xml
@@ -176,11 +176,7 @@
         <term>Colors tab</term>
         <listitem>
           <figure>
-            <title>
-              <phrase>
-                Color tab options
-              </phrase>
-            </title>
+            <title>Color tab options</title>
             <mediaobject>
               <imageobject>
                 <imagedata  format="PNG"
diff --git a/src/filters/render/maze.xml b/src/filters/render/maze.xml
index eaee461..df63082 100644
--- a/src/filters/render/maze.xml
+++ b/src/filters/render/maze.xml
@@ -57,10 +57,7 @@
   <sect3>
     <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Maze</quote> filter options
-        </phrase>
-      </title>
+      <title><quote>Maze</quote> filter options</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
diff --git a/src/filters/render/spheredesigner.xml b/src/filters/render/spheredesigner.xml
index 7d39d5e..dec21ce 100644
--- a/src/filters/render/spheredesigner.xml
+++ b/src/filters/render/spheredesigner.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-05-18 KoSt: added 'no'
   2007-05-01 <guilabel> deleted in all paragraphs (en,fr,it,ru) as already
@@ -8,9 +9,7 @@
   2005/09/25 created by axel.wernicke
 -->
 <sect2 id="plug-in-spheredesigner">
-  <title>
-    <phrase>Sphere Designer</phrase>
-  </title>
+  <title>Sphere Designer</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Render</secondary>
@@ -20,19 +19,16 @@
     <primary>Sphere Designer</primary>
   </indexterm>
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
       <title>
-        <phrase>
-          The same image, before and after the application of
-          <quote>Sphere Designer</quote> filter.
-        </phrase>
+        The same image, before and after the application of
+         <quote>Sphere Designer</quote> filter.
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -40,7 +36,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/render-taj-spheredesigner.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/render-taj-spheredesigner.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Sphere Designer</quote> applied</para>
@@ -52,27 +49,27 @@
       It replaces the original image.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activating Sphere Designer</phrase>
-    </title>
+    <title>Activating Sphere Designer</title>
     <para>
       You can find this filter through
-      <menuchoice><guimenu>Filters</guimenu><guisubmenu>Render</guisubmenu><guimenuitem>Sphere Designer</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Filters</guimenu>
+        <guisubmenu>Render</guisubmenu>
+        <guimenuitem>Sphere Designer</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Sphere Designer</quote> filter parameters
-        </phrase>
-      </title>
+      <title><quote>Sphere Designer</quote> filter parameters</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-render-spheredesigner.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-render-spheredesigner.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/help-missing.xml b/src/help-missing.xml
index 3850c14..735b06a 100644
--- a/src/help-missing.xml
+++ b/src/help-missing.xml
@@ -5,22 +5,12 @@
   2007-01-07 lexa: made file docbook compliant
 -->
 <appendix id="help-missing">
-  <!--appendixinfo role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-02</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </appendixinfo-->
-  <title>
-    <phrase>Eeek! There is Missing Help</phrase>
-  </title>
+  <title>Eeek! There is Missing Help</title>
   <para>
     Sorry, but a help item is missing for the function you're looking for.
     You may be able to find it in the online version of the help at the
-    <ulink url="http://docs.gimp.org/en";><acronym>GIMP</acronym> docs</ulink> website.
+    <ulink url="http://docs.gimp.org/en";><acronym>GIMP</acronym> docs</ulink>
+    website.
   </para>
   <para>
     Feel free to join us and fill the gap by writing documentation for
diff --git a/src/introduction/whats-new.xml b/src/introduction/whats-new.xml
index d399466..2d25ef5 100644
--- a/src/introduction/whats-new.xml
+++ b/src/introduction/whats-new.xml
@@ -297,13 +297,9 @@
             </para>
           </listitem>
           <listitem>
-            <para>
-              Several displays use Cairo library.
-            </para>
+            <para>Several displays use Cairo library.</para>
             <figure id="gimp-cairo-2-4-vs-2-6">
-              <title>
-                <phrase>Comparing 2.6 display vs 2.4</phrase>
-              </title>
+              <title>Comparing 2.6 display vs 2.4</title>
               <mediaobject>
                 <imageobject>
                   <imagedata format="PNG"
diff --git a/src/menus/colors/auto.xml b/src/menus/colors/auto.xml
index 75bc97f..59890e8 100644
--- a/src/menus/colors/auto.xml
+++ b/src/menus/colors/auto.xml
@@ -115,10 +115,8 @@
     <para>
       <figure>
         <title>
-          <phrase>
-            The <link linkend="gimp-layer-white-balance">White Balance</link>
-            command
-          </phrase>
+          The <link linkend="gimp-layer-white-balance">White Balance</link>
+          command
         </title>
         <mediaobject>
           <imageobject>
diff --git a/src/menus/colors/components/channel-mixer.xml b/src/menus/colors/components/channel-mixer.xml
index f6c0802..df4c142 100644
--- a/src/menus/colors/components/channel-mixer.xml
+++ b/src/menus/colors/components/channel-mixer.xml
@@ -136,10 +136,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Buttons</phrase>
-    </title>
+    <title>Buttons</title>
     <variablelist>
       <varlistentry>
         <term>Open</term>
diff --git a/src/menus/colors/components/decompose.xml b/src/menus/colors/components/decompose.xml
index 8541f94..2079e76 100644
--- a/src/menus/colors/components/decompose.xml
+++ b/src/menus/colors/components/decompose.xml
@@ -15,10 +15,8 @@
   2005-08-25 de added by axel.wernicke
 -->
 <sect2 id="plug-in-decompose-registered">
-  <title>
-    <anchor id="plug-in-decompose"/>
-    <phrase>Decompose</phrase>
-  </title>
+  <anchor id="plug-in-decompose"/>
+  <title>Decompose</title>
 
   <indexterm>
     <primary>CMYK</primary>
diff --git a/src/menus/colors/map/rotate-colormap.xml b/src/menus/colors/map/rotate-colormap.xml
index fdb356d..0909773 100644
--- a/src/menus/colors/map/rotate-colormap.xml
+++ b/src/menus/colors/map/rotate-colormap.xml
@@ -126,8 +126,8 @@
       <title>Base image for Grey Options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/colors-rotation-base.png"
-            format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/colors-rotation-base.png"/>
         </imageobject>
         <caption>
           <para>
@@ -213,9 +213,7 @@
         <term>Gray Threshold</term>
         <listitem>
           <figure>
-            <title>
-              <phrase>Gray Threshold</phrase>
-            </title>
+            <title>Gray Threshold</title>
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
diff --git a/src/menus/colors/vinvert.xml b/src/menus/colors/vinvert.xml
index 9a9f557..7c929ff 100644
--- a/src/menus/colors/vinvert.xml
+++ b/src/menus/colors/vinvert.xml
@@ -63,9 +63,7 @@
       this filter twice in a row and get back the image you started with.
     </para>
     <figure>
-      <title>
-        <phrase>Example of using this filter twice</phrase>
-      </title>
+      <title>Example of using this filter twice</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/filters/examples/cosmos-1.png"
diff --git a/src/menus/edit/introduction.xml b/src/menus/edit/introduction.xml
index 14fa6c4..f0f0d8a 100644
--- a/src/menus/edit/introduction.xml
+++ b/src/menus/edit/introduction.xml
@@ -8,9 +8,7 @@
   <title><quote>Edit</quote> Menu Entries</title>
 
   <figure>
-    <title>
-      <phrase>Contents of the Edit Menu</phrase>
-    </title>
+    <title>Contents of the Edit Menu</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/menus/edit.png" format="PNG"/>
diff --git a/src/menus/filters/reshow.xml b/src/menus/filters/reshow.xml
index be2ba1d..a810d1e 100644
--- a/src/menus/filters/reshow.xml
+++ b/src/menus/filters/reshow.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-20 Added Spanish translation by AntI
   2005/11/20 split off from menus-filter.xml; de created by axel.wernicke
 -->
 <sect2 id="gimp-filter-reshow">
-  <title>
-    <phrase>Re-show Last</phrase>
-  </title>
+  <title>Re-show Last</title>
   <indexterm>
     <primary>Filters</primary>
     <secondary>Common functions</secondary>
@@ -43,13 +42,16 @@
       <guimenuitem>Re-show Last</guimenuitem>:
       <keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo>
       followed by
-      <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>F</keycap></keycombo>.
+      <keycombo>
+        <keycap>Ctrl</keycap>
+        <keycap>Shift</keycap>
+        <keycap>F</keycap>
+      </keycombo>.
     </para>
   </tip>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/help/about.xml b/src/menus/help/about.xml
index 4748c4e..ed06e78 100644
--- a/src/menus/help/about.xml
+++ b/src/menus/help/about.xml
@@ -41,9 +41,7 @@
   <sect3>
     <title>Description of the dialog window</title>
     <figure>
-      <title>
-        <phrase> The <quote>About</quote> dialog window</phrase>
-      </title>
+      <title>The <quote>About</quote> dialog window</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/help/about.png" format="PNG"/>
diff --git a/src/menus/help/gimp-online.xml b/src/menus/help/gimp-online.xml
index 848aea6..d55036b 100644
--- a/src/menus/help/gimp-online.xml
+++ b/src/menus/help/gimp-online.xml
@@ -20,11 +20,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>
-        The <quote>GIMP Online</quote> submenu of the Help menu
-      </phrase>
-    </title>
+    <title>The <quote>GIMP Online</quote> submenu of the Help menu</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/menus/help/gimp-online.png" format="PNG"/>
diff --git a/src/menus/help/plug-in-browser.xml b/src/menus/help/plug-in-browser.xml
index c248a5d..9b2a398 100644
--- a/src/menus/help/plug-in-browser.xml
+++ b/src/menus/help/plug-in-browser.xml
@@ -72,9 +72,7 @@
     </para>
     <figure>
       <title>
-        <phrase>
-          The tree view of the <quote>Plug-In Browser</quote> dialog window
-        </phrase>
+        The tree view of the <quote>Plug-In Browser</quote> dialog window
       </title>
       <mediaobject>
         <imageobject>
diff --git a/src/menus/layer/alpha-selection-add.xml b/src/menus/layer/alpha-selection-add.xml
index 92fbea8..375c892 100644
--- a/src/menus/layer/alpha-selection-add.xml
+++ b/src/menus/layer/alpha-selection-add.xml
@@ -59,9 +59,7 @@
   <sect3>
     <title>Example</title>
     <figure>
-      <title>
-        <phrase>Applying <quote>Add to Selection</quote></phrase>
-      </title>
+      <title>Applying <quote>Add to Selection</quote></title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/layer/BBR.png" format="PNG"/>
diff --git a/src/menus/layer/threshold-alpha.xml b/src/menus/layer/threshold-alpha.xml
index 708e641..f7a8269 100644
--- a/src/menus/layer/threshold-alpha.xml
+++ b/src/menus/layer/threshold-alpha.xml
@@ -49,9 +49,7 @@
     <title>Description of the Dialog Window</title>
     <figure>
       <title>
-        <phrase>
-          The only one option of the <quote>Threshold Alpha</quote>
-          dialog</phrase>
+        The only one option of the <quote>Threshold Alpha</quote> dialog
       </title>
       <mediaobject>
         <imageobject>
diff --git a/src/menus/view/fullscreen.xml b/src/menus/view/fullscreen.xml
index c1ef4e9..d1519f0 100644
--- a/src/menus/view/fullscreen.xml
+++ b/src/menus/view/fullscreen.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-05-26 j.h: added TAB key action
   2009-01-16 j.h: reviewed for v2.6
@@ -7,9 +8,7 @@
   2005/10/17 reviewed; de added by axel.wernicke
 -->
 <sect2 id="gimp-view-fullscreen">
-  <title>
-    <phrase>Full Screen</phrase>
-  </title>
+  <title>Full Screen</title>
   <indexterm>
     <primary>Display</primary>
     <secondary>Full Screen</secondary>
diff --git a/src/menus/view/introduction.xml b/src/menus/view/introduction.xml
index 4d27791..1544dc6 100644
--- a/src/menus/view/introduction.xml
+++ b/src/menus/view/introduction.xml
@@ -14,9 +14,7 @@
     <secondary>Introduction</secondary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Contents of the View menu</phrase>
-    </title>
+    <title>Contents of the View menu</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/menus/view.png" format="PNG"/>
diff --git a/src/toolbox/other-tools.xml b/src/toolbox/other-tools.xml
index 69c0685..7ab16d0 100644
--- a/src/toolbox/other-tools.xml
+++ b/src/toolbox/other-tools.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-06-03 kost: added 'no'
   050817 axel.wernicke relocated blend to paint tools
   050815 axel.wernicke relocated bucket fill to paint tools
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tools-other">
-  <title>
-    <phrase>Other</phrase>
-  </title>
+  <title>Other</title>
   <xi:include href="tool-path.xml"/>
   <xi:include href="tool-color-picker.xml"/>
   <xi:include href="tool-zoom.xml"/>
diff --git a/src/toolbox/tool-blend.xml b/src/toolbox/tool-blend.xml
index 8ea0b74..18ddbe0 100644
--- a/src/toolbox/tool-blend.xml
+++ b/src/toolbox/tool-blend.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
      2009-03-16 j.h: reviewed for v2.6. No change
      2008-04-07 JPL rewied "fr"
@@ -35,7 +36,8 @@
     <title>The Blend tool in Toolbox</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/toolbox/toolbox-gradient.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/toolbox/toolbox-gradient.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -115,11 +117,7 @@
     <title>Key modifiers (Defaults)</title>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>
-            <keycap>Ctrl</keycap>
-          </phrase>
-        </term>
+        <term><keycap>Ctrl</keycap></term>
         <listitem>
           <para><keycap>Ctrl</keycap> is used to create straight lines that are
             constrained to 15 degree absolute angles.
@@ -134,7 +132,8 @@
       <title><quote>Blend</quote> tool options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/blend-tool-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/blend-tool-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -158,6 +157,10 @@
             the direction the user determines by drawing a line in the image.
             For the purposes of drawing the gradient, the
             <guilabel>Reverse</guilabel>
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-flip-horizontal-16.png"/>
+            </guiicon>
             check-box reverse the gradient direction with the effect, for
             instance, of swapping the foreground and background colors.
           </para>
@@ -173,13 +176,11 @@
             Shaped forms are not affected by this option.
           </para>
           <figure>
-            <title>
-              <phrase><quote>Blend</quote> tool: Offset example
-              </phrase>
-            </title>
+            <title><quote>Blend</quote> tool: Offset example</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/toolbox/blend-tool-offset.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/toolbox/blend-tool-offset.png"/>
               </imageobject>
               <caption>
                 <para>Top, Offset = 0 ; Bottom, Offset = 50%</para>
@@ -197,14 +198,11 @@
             Details on each of the shapes are given below.
           </para>
           <figure>
-            <title>
-              <phrase>
-                Examples of gradient shapes
-              </phrase>
-            </title>
+            <title>Examples of gradient shapes</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/tool-options/gradient-linear.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/tool-options/gradient-linear.png"/>
               </imageobject>
               <caption>
                 <para>Linear</para>
@@ -212,7 +210,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/tool-options/gradient-bilinear.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/tool-options/gradient-bilinear.png"/>
               </imageobject>
               <caption>
                 <para>Bi-Linear</para>
@@ -220,7 +219,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/tool-options/gradient-radial.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/tool-options/gradient-radial.png"/>
               </imageobject>
               <caption>
                 <para>Radial</para>
@@ -263,14 +263,11 @@
               <term>Square; Shaped</term>
               <listitem>
                 <figure>
-                  <title>
-                    <phrase>
-                      Square-shaped gradient examples
-                    </phrase>
-                  </title>
+                  <title>Square-shaped gradient examples</title>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/tool-options/gradient-square.png" format="PNG"/>
+                      <imagedata format="PNG"
+                        fileref="images/tool-options/gradient-square.png"/>
                     </imageobject>
                     <caption>
                       <para>Square</para>
@@ -278,7 +275,8 @@
                   </mediaobject>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/tool-options/gradient-ang-shapeburst.png" format="PNG"/>
+                      <imagedata format="PNG"
+                    fileref="images/tool-options/gradient-ang-shapeburst.png"/>
                     </imageobject>
                     <caption>
                       <para>
@@ -288,7 +286,8 @@
                   </mediaobject>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/tool-options/gradient-spher-shapeburst.png" format="PNG"/>
+                      <imagedata format="PNG"
+                  fileref="images/tool-options/gradient-spher-shapeburst.png"/>
                     </imageobject>
                     <caption>
                       <para>
@@ -298,7 +297,8 @@
                   </mediaobject>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/tool-options/gradient-dim-shapeburst.png" format="PNG"/>
+                      <imagedata format="PNG"
+                    fileref="images/tool-options/gradient-dim-shapeburst.png"/>
                     </imageobject>
                     <caption>
                       <para>
@@ -326,14 +326,11 @@
               <term>Conical (symmetric); Conical (asymmetric)</term>
               <listitem>
                 <figure>
-                  <title>
-                    <phrase>
-                      Conical gradient examples
-                    </phrase>
-                  </title>
+                  <title>Conical gradient examples</title>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/tool-options/gradient-sym-conical.png" format="PNG"/>
+                      <imagedata format="PNG"
+                       fileref="images/tool-options/gradient-sym-conical.png"/>
                     </imageobject>
                     <caption>
                       <para>
@@ -343,7 +340,8 @@
                   </mediaobject>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/tool-options/gradient-asym-conical.png" format="PNG"/>
+                      <imagedata format="PNG"
+                      fileref="images/tool-options/gradient-asym-conical.png"/>
                     </imageobject>
                     <caption>
                       <para>
@@ -371,12 +369,11 @@
               (counterclockwise)</term>
               <listitem>
                 <figure>
-                  <title>
-                    <phrase>Spiral gradient examples</phrase>
-                  </title>
+                  <title>Spiral gradient examples</title>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/tool-options/gradient-clock-spiral.png" format="PNG"/>
+                      <imagedata format="PNG"
+                      fileref="images/tool-options/gradient-clock-spiral.png"/>
                     </imageobject>
                     <caption>
                       <para>
@@ -386,7 +383,8 @@
                   </mediaobject>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/tool-options/gradient-anticlock-spiral.png" format="PNG"/>
+                      <imagedata format="PNG"
+                  fileref="images/tool-options/gradient-anticlock-spiral.png"/>
                     </imageobject>
                     <caption>
                       <para>
diff --git a/src/toolbox/tool-brush.xml b/src/toolbox/tool-brush.xml
index 8fa0c7c..5903eb8 100644
--- a/src/toolbox/tool-brush.xml
+++ b/src/toolbox/tool-brush.xml
@@ -519,9 +519,14 @@
               <listitem>
                 <para>
                   Normally a brushstroke starts with colors from the left side
-                  of the gradient, and progresses rightward. If "Reverse" is
-                  checked, the stroke starts with colors from the right side,
-                  and progresses leftward.
+                  of the gradient, and progresses rightward. If
+                  the <quote>Reverse</quote>
+                  <guiicon>
+                    <inlinegraphic
+                      fileref="images/dialogs/stock-flip-horizontal-16.png"/>
+                  </guiicon>
+                  is checked, the stroke starts with colors from the right
+                  side, and progresses leftward.
                 </para>
               </listitem>
             </varlistentry>
@@ -541,10 +546,8 @@
               <listitem>
                 <figure>
                   <title>
-                    <phrase>
-                      Illustration of the effects of the three gradient-repeat
-                      options, for the <quote>Abstract 2</quote> gradient.
-                    </phrase>
+                    Illustration of the effects of the three gradient-repeat
+                    options, for the <quote>Abstract 2</quote> gradient.
                   </title>
                   <mediaobject>
                     <imageobject>
diff --git a/src/toolbox/tool-bucket-fill.xml b/src/toolbox/tool-bucket-fill.xml
index 43339a8..f7a4c7c 100644
--- a/src/toolbox/tool-bucket-fill.xml
+++ b/src/toolbox/tool-bucket-fill.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-03-15 j.h: reviewed for v2.6. No change
   2008-03-31 JPL reviewed de for GIMP 2.4
@@ -93,7 +94,7 @@
   </sect3>
 
   <sect3>
-    <title><phrase>Key modifiers (Defaults)</phrase></title>
+    <title>Key modifiers (Defaults)</title>
     <itemizedlist>
       <listitem>
         <para><keycap>Ctrl</keycap> toggles the use of BG Color Fill or FG
@@ -111,10 +112,11 @@
   <sect3>
     <title>Options</title>
     <figure>
-      <title><phrase><quote>Bucket Fill</quote> tool options</phrase></title>
+      <title>quote>Bucket Fill</quote> tool options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-fill.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-options-fill.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -301,14 +303,11 @@
                   same red channel value (0): they are all painted.
                 </para>
                 <figure>
-                  <title>
-                    <phrase>
-                      Example for <quote>Fill By</quote>
-                    </phrase>
-                  </title>
+                  <title>Example for <quote>Fill By</quote></title>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/toolbox/fill-by-0.png" format="PNG"/>
+                      <imagedata format="PNG"
+                        fileref="images/toolbox/fill-by-0.png"/>
                     </imageobject>
                     <caption>
                       <para>Original image</para>
@@ -316,7 +315,8 @@
                   </mediaobject>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/toolbox/fill-by-1.png" format="PNG"/>
+                      <imagedata format="PNG"
+                        fileref="images/toolbox/fill-by-1.png"/>
                     </imageobject>
                     <caption>
                       <para>Image 1</para>
@@ -324,7 +324,8 @@
                   </mediaobject>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/toolbox/fill-by-2.png" format="PNG"/>
+                      <imagedata format="PNG"
+                        fileref="images/toolbox/fill-by-2.png"/>
                     </imageobject>
                     <caption>
                       <para>Image 2</para>
@@ -332,7 +333,8 @@
                   </mediaobject>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="images/toolbox/fill-by-3.png" format="PNG"/>
+                      <imagedata format="PNG"
+                        fileref="images/toolbox/fill-by-3.png"/>
                     </imageobject>
                     <caption>
                       <para>Image 3</para>
@@ -348,7 +350,7 @@
   </sect3>
 
   <sect3>
-    <title><phrase>Fill a feathered selection</phrase></title>
+    <title>Fill a feathered selection</title>
     <para>
       By clicking repeatedly in a selection with feathered edges, you
       progressively fill the feathered border:
@@ -357,7 +359,8 @@
       <title>Example for <quote>Fill a feathered Selection</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/fill-feathered-1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/fill-feathered-1.png"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -365,7 +368,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/fill-feathered-2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/fill-feathered-2.png"/>
         </imageobject>
         <caption>
           <para>
diff --git a/src/toolbox/tool-convolve.xml b/src/toolbox/tool-convolve.xml
index e74fe00..3ca6e5f 100644
--- a/src/toolbox/tool-convolve.xml
+++ b/src/toolbox/tool-convolve.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-03-18 j.h: updated to v2.6. Name changed to Blur/Sharpen. "id" unchanged.
   2008-04-21 JPL reviewed fr
@@ -22,9 +23,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>Blur/Sharpen tool icon in the Toolbox</phrase>
-    </title>
+    <title>Blur/Sharpen tool icon in the Toolbox</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-blur.png" format="PNG"/>
@@ -99,7 +98,8 @@
       </listitem>
       <listitem>
         <para>
-          By using the keyboard shortcut <keycap>Shift</keycap><keycap>U</keycap>.
+          By using the keyboard shortcut
+          <keycap>Shift</keycap><keycap>U</keycap>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/toolbox/tool-curves.xml b/src/toolbox/tool-curves.xml
index 86bbb79..dfda113 100644
--- a/src/toolbox/tool-curves.xml
+++ b/src/toolbox/tool-curves.xml
@@ -305,8 +305,17 @@
         <term>Histogram Scale</term>
         <listitem>
           <para>
-            These two options have the same action as the logarithmic and
-            Linear buttons in the Curves dialog.
+            These two options have the same action as the Logarithmic
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-histogram-logarithmic-16.png"/>
+            </guiicon>
+            and Linear
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-histogram-linear-16.png"/>
+            </guiicon>
+            buttons in the Curves dialog.
           </para>
         </listitem>
       </varlistentry>
diff --git a/src/toolbox/tool-fuzzy-select.xml b/src/toolbox/tool-fuzzy-select.xml
index 07707c4..72b7815 100644
--- a/src/toolbox/tool-fuzzy-select.xml
+++ b/src/toolbox/tool-fuzzy-select.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-03-21 JPL  reviewed fr & en
   2007-12-20  PP reviewed fr & en ; added section3 for tool manipulation
@@ -11,9 +12,7 @@
   05/05/18 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-fuzzy-select">
-  <title>
-    <phrase>Fuzzy selection (Magic wand)</phrase>
-  </title>
+  <title>Fuzzy selection (Magic wand)</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Fuzzy Selection</secondary>
@@ -30,9 +29,7 @@
   </indexterm>
 
   <figure>
-    <title>
-      <phrase>Magic Wand tool icon in the Toolbox</phrase>
-    </title>
+    <title>Magic Wand tool icon in the Toolbox</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/toolbox/toolbox-wand.png" format="PNG"/>
@@ -72,9 +69,7 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the tool</phrase>
-    </title>
+    <title>Activating the tool</title>
     <para>
       You can access to the Magic Wand Tool in different ways:
     </para>
@@ -108,9 +103,7 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Key modifiers (Defaults)</phrase>
-    </title>
+    <title>Key modifiers (Defaults)</title>
     <para>
       The Fuzzy Select tool does not have any special key modifiers, only the
       ones that affect all selection tools in the same way. See
@@ -119,18 +112,15 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Tool handling</phrase>
-    </title>
+    <title>Tool handling</title>
     <figure>
       <title>
-        <phrase>
-          Using Magic Wand tool: selected pixels are contiguous
-        </phrase>
+        Using Magic Wand tool: selected pixels are contiguous
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/fuzzy-selection.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/fuzzy-selection.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -151,16 +141,13 @@
   </sect3>
 
   <sect3 id="tool-fuzzy-select-options">
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Tool Options for the Magic Wand tool</phrase>
-      </title>
+      <title>Tool Options for the Magic Wand tool</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-wand.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-options-wand.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/tool-hue-saturation.xml b/src/toolbox/tool-hue-saturation.xml
index ea24d0f..d66a89e 100644
--- a/src/toolbox/tool-hue-saturation.xml
+++ b/src/toolbox/tool-hue-saturation.xml
@@ -142,9 +142,7 @@
           </para>
           <figure>
             <title>
-              <phrase>
-                Example for the <quote>Overlap</quote> option
-              </phrase>
+              Example for the <quote>Overlap</quote> option
             </title>
             <mediaobject>
               <imageobject>
diff --git a/src/toolbox/tool-levels.xml b/src/toolbox/tool-levels.xml
index 9da671a..f94437d 100644
--- a/src/toolbox/tool-levels.xml
+++ b/src/toolbox/tool-levels.xml
@@ -226,9 +226,17 @@
                 Two eye-droppers: when you click them, the mouse pointer
                 becomes an eye-dropper. Then clicking on the image determines
                 the black or the white point according to the chosen
-                eye-dropper. Use the left, dark one  to determine the
-                black-point; use the right, white one to determine the white
-                point.
+                eye-dropper. Use the left, dark one
+                <guiicon>
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-color-picker-black-18.png"/>
+                </guiicon>
+                to determine the black-point; use the right, white one
+                <guiicon>
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-color-picker-white-18.png"/>
+                </guiicon>
+                to determine the white point.
               </para>
             </listitem>
             <listitem>
@@ -390,28 +398,37 @@
         <term>All Channels</term>
         <listitem>
           <para>
-            <guilabel>Open</guilabel>: This button allows you to
-            select a file holding level settings.
-          </para>
-          <para>
-            <guilabel>Save</guilabel>: Allows you to save any levels
-            you have set to a file that can be loaded later.
-          </para>
-          <para>
             <guilabel>Auto</guilabel>: Performs an automatic setting
             of the levels.
           </para>
-          <para>
-            <guilabel>Three eyedroppers</guilabel>: These three buttons
-            respectively represent a white, a gray and a black eye-dropper.
-            When you click one of these buttons, the mouse pointer takes the
-            form of the eye-dropper it represents. Then, when clicking the
-            image, the clicked pixel determines the <emphasis>white point
-            </emphasis>, the <emphasis>black point</emphasis> or the
-            <emphasis>mid point</emphasis> according to the eye-dropper you
-            chose. Works on all channels, even if a particular channel is
-            selected.
-          </para>
+          <formalpara>
+            <title>
+              Three eyedroppers
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-color-picker-white-18.png"/>
+              </guiicon>,
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-color-picker-gray-18.png"/>
+              </guiicon>,
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-color-picker-black-18.png"/>
+              </guiicon>.
+            </title>
+            <para>
+              These three buttons
+              respectively represent a white, a gray and a black eye-dropper.
+              When you click one of these buttons, the mouse pointer takes the
+              form of the eye-dropper it represents. Then, when clicking the
+              image, the clicked pixel determines the <emphasis>white point
+              </emphasis>, the <emphasis>black point</emphasis> or the
+              <emphasis>mid point</emphasis> according to the eye-dropper you
+              chose. Works on all channels, even if a particular channel is
+              selected.
+            </para>
+          </formalpara>
           <figure>
             <title>Example for Levels eye-droppers</title>
             <mediaobject>
@@ -514,8 +531,17 @@
         <term>Histogram Scale</term>
         <listitem>
           <para>
-            These two options have the same action as the logarithmic and
-            Linear buttons in the Levels dialog.
+            These two options have the same action as the Logarithmic
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-histogram-logarithmic-16.png"/>
+            </guiicon>
+            and Linear
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-histogram-linear-16.png"/>
+            </guiicon>
+            buttons in the Levels dialog.
           </para>
         </listitem>
       </varlistentry>
diff --git a/src/toolbox/tool-measure.xml b/src/toolbox/tool-measure.xml
index f711f83..6b3cd7b 100644
--- a/src/toolbox/tool-measure.xml
+++ b/src/toolbox/tool-measure.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history
   2088-02-04 kost: changes to 'no'
   2088-01-30 j.h: some changes to 'en;fr"'
@@ -147,12 +148,7 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <phrase>
-            <keycombo>
-              <keycap>Ctrl</keycap>
-              <keycap>Alt</keycap>
-            </keycombo>
-          </phrase>
+          <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap></keycombo>
         </term>
         <listitem>
           <para>
@@ -174,7 +170,8 @@
       <title><quote>Measure</quote> tool options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/measure-tool-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/measure-tool-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/tool-move.xml b/src/toolbox/tool-move.xml
index 188817b..c72d7f6 100644
--- a/src/toolbox/tool-move.xml
+++ b/src/toolbox/tool-move.xml
@@ -38,9 +38,7 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activating the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>
       You can access to the Move Tool in different ways:
     </para>
@@ -125,7 +123,12 @@
       <varlistentry>
         <term>Tool toggle (Shift)</term>
         <listitem>
-          <para>If Move is on <guiicon>Layer</guiicon>:</para>
+          <para>
+            If Move is on <quote>Layer</quote>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-layer-16.png"/>
+            </guiicon>:
+          </para>
           <itemizedlist>
             <listitem>
               <para>
@@ -152,7 +155,12 @@
               </para>
             </listitem>
           </itemizedlist>
-          <para>If Move is on <guiicon>Path</guiicon>:</para>
+          <para>
+            If Move is on <quote>Path</quote>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-path-16.png"/>
+            </guiicon>:
+          </para>
           <itemizedlist>
             <listitem>
               <para>
diff --git a/src/toolbox/tool-path.xml b/src/toolbox/tool-path.xml
index c5fda04..1fc4189 100644
--- a/src/toolbox/tool-path.xml
+++ b/src/toolbox/tool-path.xml
@@ -175,9 +175,14 @@
               To quickly close the curve, press <keycap>Ctrl</keycap>
               key and click on the initial control point. In previous
               versions, clicking inside a closed path converted it into
-              Selection. Now, you can use the <emphasis>Create
-              selection from path</emphasis> button or the <emphasis>
-              Path to Selection</emphasis> button in the Path Dialog.
+              Selection. Now, you can use the <guibutton>Create
+              selection from path</guibutton> button or
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-path-stroke-16.png"/>
+              </guiicon>
+              the <emphasis>Path to Selection</emphasis> button
+              in the Path Dialog.
             </para>
           </tip>
           <tip>
diff --git a/src/toolbox/tool-perspective.xml b/src/toolbox/tool-perspective.xml
index c698609..305d4ca 100644
--- a/src/toolbox/tool-perspective.xml
+++ b/src/toolbox/tool-perspective.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-01-13 j.h: updated 'en;fr' to v2.4
   2007-06-13 kost: added 'no'
@@ -24,7 +25,8 @@
     <title>Perspective tool</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/toolbox/toolbox-perspective.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/toolbox/toolbox-perspective.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -87,7 +89,8 @@
       <title><quote>Perspective</quote> tool options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-perspective.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-options-perspective.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -108,19 +111,16 @@
 
   <sect3>
     <title>
-      <phrase>
-        The Information window for perspective transformation
-      </phrase>
+      The Information window for perspective transformation
     </title>
     <figure>
       <title>
-        <phrase>
-          The dialog window of the <quote>Perspective</quote> tool
-        </phrase>
+        The dialog window of the <quote>Perspective</quote> tool
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-dialog-perspective.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-dialog-perspective.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/tool-posterize.xml b/src/toolbox/tool-posterize.xml
index c7eaa27..cbfc645 100644
--- a/src/toolbox/tool-posterize.xml
+++ b/src/toolbox/tool-posterize.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-01-28 j.h: added example
   2007-06-06 kost: added 'no'
@@ -46,13 +47,15 @@
       icon in ToolBox, if Color Tools have been added to it.
     </para>
   </sect3>
+
   <sect3>
     <title>Options</title>
     <figure>
       <title>Posterize tool options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tools-posterize.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tools-posterize.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -80,16 +83,11 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Example</phrase>
-    </title>
+    <title>Example</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Posterize</quote> tool
-        </phrase>
-      </title>
+      <title>Example for the <quote>Posterize</quote> tool</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/posterize-ex.png" format="PNG"/>
diff --git a/src/toolbox/tool-rect-select.xml b/src/toolbox/tool-rect-select.xml
index 2c04ab5..381d432 100644
--- a/src/toolbox/tool-rect-select.xml
+++ b/src/toolbox/tool-rect-select.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-03-19 JPL rewiewed & modified en
   2007-12-01  PP rewiewed fr  and a new section added in en & fr
@@ -153,16 +154,13 @@
   </sect3>
 
   <sect3 id="tool-rect-select-manip">
-    <title>
-      <phrase>Tool manipulation</phrase>
-    </title>
+    <title>Tool manipulation</title>
     <figure>
-      <title>
-        <phrase>Example of Rectangle Selection.</phrase>
-      </title>
+      <title>Example of Rectangle Selection.</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/rectangle-selection.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/rectangle-selection.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -234,9 +232,7 @@
       </para>
     </tip>
     <figure>
-      <title>
-        <phrase>Sensitive selection areas</phrase>
-      </title>
+      <title>Sensitive selection areas</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/select-area.png" format="PNG"/>
@@ -264,7 +260,8 @@
       <title>Tool Options for the Rectangle Select tool</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-options-rectsel.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-options-rectsel.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/tool-scale.xml b/src/toolbox/tool-scale.xml
index 56a86c9..841438d 100644
--- a/src/toolbox/tool-scale.xml
+++ b/src/toolbox/tool-scale.xml
@@ -111,9 +111,7 @@
 
     <title>Tool Options</title>
     <figure>
-      <title>
-        <phrase>Tool options for the Scale tool</phrase>
-      </title>
+      <title>Tool options for the Scale tool</title>
       <mediaobject>
         <imageobject>
           <imagedata format="PNG"
diff --git a/src/toolbox/tool-shear.xml b/src/toolbox/tool-shear.xml
index 9ec2dd5..d9714c0 100644
--- a/src/toolbox/tool-shear.xml
+++ b/src/toolbox/tool-shear.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-03-15 j.h: reviewed for v2.6. No change
   2008-01-06 j.h: updated to v2.4. Added example
@@ -121,12 +122,11 @@
   <sect3>
     <title>Shearing Information</title>
     <figure>
-      <title>
-        <phrase>Shearing Information window</phrase>
-      </title>
+      <title>Shearing Information window</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolbox/tool-dialog-shear.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/toolbox/tool-dialog-shear.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/toolbox/tool-text.xml b/src/toolbox/tool-text.xml
index 119cc7c..b1b3695 100644
--- a/src/toolbox/tool-text.xml
+++ b/src/toolbox/tool-text.xml
@@ -476,8 +476,12 @@
         <term>Load Text from file</term>
         <listitem>
           <para>
-            Text can be loaded from a text file by clicking the folder icon in
-            the text editor. All the text in the file is loaded.
+            Text can be loaded from a text file by clicking the folder icon
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-fileopne-16.png"/>
+            </guiicon>
+            in the text editor. All the text in the file is loaded.
           </para>
         </listitem>
       </varlistentry>
@@ -485,6 +489,10 @@
         <term>Clear all text</term>
         <listitem>
           <para>
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-edit-clear-16.png"/>
+            </guiicon>
             Clicking this icon clears the editor and the associated text on
             the image.
           </para>
diff --git a/src/toolbox/tools-color.xml b/src/toolbox/tools-color.xml
index 72f7627..9592e4b 100644
--- a/src/toolbox/tools-color.xml
+++ b/src/toolbox/tools-color.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-03-12 j.h: added tool-desaturate
   2007-06-06 kost: added 'no'
@@ -7,9 +8,7 @@
   20050807 de reviewed by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tools-color">
-  <title>
-    <phrase>Color Tools</phrase>
-  </title>
+  <title>Color Tools</title>
   <xi:include href="tool-color-balance.xml"/>
   <xi:include href="tool-hue-saturation.xml"/>
   <xi:include href="tool-colorize.xml"/>
diff --git a/src/toolbox/tools-paint.xml b/src/toolbox/tools-paint.xml
index 80f33b3..0a66483 100644
--- a/src/toolbox/tools-paint.xml
+++ b/src/toolbox/tools-paint.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-03-12 Mr.Dust : added korean contents
   2007-06-15 kost: added norwegian
@@ -7,9 +8,7 @@
   20050815 axel.wernicke relocated bucket fill from other tools
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tools-paint">
-  <title>
-    <phrase>Brush Tools</phrase>
-  </title>
+  <title>Brush Tools</title>
   <xi:include href="tool-brush.xml"/>
   <xi:include href="tools-painting.xml"/>
   <xi:include href="tool-bucket-fill.xml"/>
diff --git a/src/using/animated-brushes.xml b/src/using/animated-brushes.xml
index abac29a..22c8237 100644
--- a/src/using/animated-brushes.xml
+++ b/src/using/animated-brushes.xml
@@ -276,7 +276,12 @@
               class="directory">/usr/share/gimp/gimp/2.0/brushes</filename>
               directory. Then come back into the Toolbox, click in the brush
               icon to open the Brush Dialog then click on
-              <guibutton>Refresh</guibutton>. Your new brush appears in the
+              <guibutton>Refresh</guibutton>
+              <guiicon>
+                <inlinegraphic
+                  fileref="images/dialogs/stock-reload-16.png"/>
+              </guiicon>
+              icon button. Your new brush appears in the
               Brush window. Select it. Select pencil tool for instance and
               click and hold with it on a new image:
               <mediaobject>
@@ -518,10 +523,8 @@
             </para>
             <figure>
               <title>
-                <phrase>
-                  Here is the result by stroking an elliptical selection
-                  with the brush:
-                </phrase>
+                Here is the result by stroking an elliptical selection
+                with the brush:
               </title>
               <mediaobject>
                 <imageobject>
diff --git a/src/using/brushes.xml b/src/using/brushes.xml
index b6bfcdb..7408358 100644
--- a/src/using/brushes.xml
+++ b/src/using/brushes.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-02-17 j.h: reviewed for v2.6
   2008-04-04 Mr.Dust : reviewed and added 'ko'
   2006-12-19 lexa: minor enhancements
 -->
 <sect1 id="gimp-using-brushes">
-  <title>
-    <phrase>Adding New Brushes</phrase>
-  </title>
+  <title>Adding New Brushes</title>
   <indexterm>
     <primary>Brushes</primary>
     <secondary>Add New</secondary>
@@ -53,11 +52,12 @@
         </para>
         <figure>
           <title>
-            <phrase>Save a .gbr brush</phrase>
+            Save a <filename class="extension">.gbr</filename> brush
           </title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/using/file-gbr-save.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/using/file-gbr-save.png"/>
             </imageobject>
           </mediaobject>
         </figure>
diff --git a/src/using/fileformats.xml b/src/using/fileformats.xml
index fd6f3b0..803ec06 100644
--- a/src/using/fileformats.xml
+++ b/src/using/fileformats.xml
@@ -119,9 +119,7 @@
       </indexterm>
 
       <figure>
-        <title>
-          <phrase>The GIF Save dialog</phrase>
-        </title>
+        <title>The GIF Save dialog</title>
         <mediaobject>
           <imageobject>
             <imagedata format="PNG"
@@ -598,7 +596,8 @@
         <title>The <quote>Save as PNG</quote> dialog</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/using/save-png-dialog.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/using/save-png-dialog.png"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -744,9 +743,7 @@
     <sect3 id="file-tiff-save">
       <title>Saving as TIFF</title>
       <figure>
-        <title>
-          <phrase>The TIFF Save dialog</phrase>
-        </title>
+        <title>The TIFF Save dialog</title>
         <indexterm>
           <primary>Save as TIFF</primary>
         </indexterm>
@@ -759,7 +756,8 @@
         </indexterm>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/using/save-tiff-dialog.png" format="PNG"/>
+            <imagedata format="PNG"
+              fileref="images/using/save-tiff-dialog.png"/>
           </imageobject>
         </mediaobject>
       </figure>
diff --git a/src/using/fonts-and-text.xml b/src/using/fonts-and-text.xml
index ecee701..45bd1c7 100644
--- a/src/using/fonts-and-text.xml
+++ b/src/using/fonts-and-text.xml
@@ -148,6 +148,9 @@
         in your font search path. Doing either will cause the font to show up
         the next time you start GIMP. If you want to use it in an already
         running GIMP, press the <emphasis>Refresh</emphasis>
+        <guiicon>
+          <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+        </guiicon>
         button in the <link linkend="gimp-font-dialog">Fonts dialog</link>.
       </para>
     </formalpara>
diff --git a/src/using/layers.xml b/src/using/layers.xml
index 763444a..239083d 100644
--- a/src/using/layers.xml
+++ b/src/using/layers.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
      2009-02-17 j.h: revised for v2.6
 -->
 <sect1 id="gimp-using-layers">
-  <title>
-    <phrase>Creating New Layers</phrase>
-  </title>
+  <title>Creating New Layers</title>
   <indexterm>
     <primary>Layer</primary>
     <secondary>Creating new layers</secondary>
diff --git a/src/using/paths.xml b/src/using/paths.xml
index 8e46faf..c942bc9 100644
--- a/src/using/paths.xml
+++ b/src/using/paths.xml
@@ -10,10 +10,8 @@
   2006-09-10 added norwegian translation by KoSt
 -->
 <sect1 id="gimp-using-paths">
-  <title>
-    <anchor id="gimp-concepts-paths" xreflabel="Paths"/>
-    <phrase>Paths</phrase>
-  </title>
+  <anchor id="gimp-concepts-paths" xreflabel="Paths"/>
+  <title>Paths</title>
 
   <indexterm>
     <primary>Paths</primary>
@@ -141,7 +139,8 @@
       <title>Appearance of a path while it is manipulated</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/using/path-with-anchors.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/using/path-with-anchors.png"/>
         </imageobject>
         <caption>
           <para>
@@ -351,7 +350,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/using/path-text-stroked.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/using/path-text-stroked.png"/>
         </imageobject>
         <caption>
           <para>
diff --git a/src/using/photography.xml b/src/using/photography.xml
index 846d8ee..bb06be6 100644
--- a/src/using/photography.xml
+++ b/src/using/photography.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-04-06 Mr.Dust : reviewed and added 'ko'
   2007-02-25 ude: de translation of "printing your photos"
@@ -7,17 +8,13 @@
   2006-12-10 lexa: added de translation provided by ude
 -->
 <sect1 id="gimp-using-photography">
-  <title>
-    <phrase>Working with Digital Camera Photos</phrase>
-  </title>
+  <title>Working with Digital Camera Photos</title>
   <indexterm>
     <primary>Photography</primary>
   </indexterm>
 
   <sect2 id="gimp-using-photography-introduction">
-    <title>
-      <phrase>Introduction</phrase>
-    </title>
+    <title>Introduction</title>
     <para>
       One of the most common uses of GIMP is to fix digital camera images
       that for some reason are less than perfect. Maybe the image is
@@ -45,14 +42,10 @@
   </sect2>
 
   <sect2 id="gimp-using-photography-improving">
-    <title>
-      <phrase>Improving Composition</phrase>
-    </title>
+    <title>Improving Composition</title>
 
     <sect3 id="gimp-using-photography-rotating">
-      <title>
-        <phrase>Rotating an Image</phrase>
-      </title>
+      <title>Rotating an Image</title>
       <para>
         It is easy, when taking a picture, to hold the camera not quite
         perfectly vertical, resulting in a picture where things are
@@ -112,9 +105,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-cropping">
-      <title>
-        <phrase>Cropping</phrase>
-      </title>
+      <title>Cropping</title>
       <para>
         When you take a picture with a digital camera, you have some control
         over what gets included in the image but often not as much as you
@@ -141,14 +132,10 @@
   </sect2>
 
   <sect2 id="gimp-using-photography-colors">
-    <title>
-      <phrase>Improving Colors</phrase>
-    </title>
+    <title>Improving Colors</title>
 
     <sect3 id="gimp-using-photography-automatic">
-      <title>
-        <phrase>Automated Tools</phrase>
-      </title>
+      <title>Automated Tools</title>
       <para>
         In spite of sophisticated exposure-control systems, pictures taken
         with digital cameras often come out over- or under-exposed, or with
@@ -308,9 +295,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-exposure">
-      <title>
-        <phrase>Exposure Problems</phrase>
-      </title>
+      <title>Exposure Problems</title>
       <para>
         The simplest tool to use is the <link linkend="gimp-tool-brightness-contrast">Brightness/Contrast</link>
         tool.  It is also the least powerful, but in many cases it does
@@ -423,9 +408,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-hue-saturation">
-      <title>
-        <phrase>Adjusting Hue and Saturation</phrase>
-      </title>
+      <title>Adjusting Hue and Saturation</title>
       <para>
         In our experience, if your image has a color cast---too much red, too
         much blue, etc---the easiest way to correct it is to use the Levels
@@ -483,13 +466,9 @@
   </sect2>
 
   <sect2 id="gimp-using-photography-sharpness">
-    <title>
-      <phrase>Adjusting Sharpness</phrase>
-    </title>
+    <title>Adjusting Sharpness</title>
     <sect3 id="gimp-using-photography-unblurring">
-      <title>
-        <phrase>Unblurring</phrase>
-      </title>
+      <title>Unblurring</title>
       <para>
         If the focus on the camera is not set perfectly, or the camera is
         moving when the picture is taken, the result is a blurred image. If
@@ -545,9 +524,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-graininess">
-      <title>
-        <phrase>Reducing Graininess</phrase>
-      </title>
+      <title>Reducing Graininess</title>
       <para>
         When you take pictures in low-light conditions or with a very fast
         exposure time, the camera does not get enough data to make good
@@ -568,9 +545,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-softening">
-      <title>
-        <phrase>Softening</phrase>
-      </title>
+      <title>Softening</title>
       <para>
         Every so often you have the opposite problem: an image is
         <emphasis>too</emphasis>
@@ -586,9 +561,7 @@
   </sect2>
 
   <sect2 id="gimp-using-photography-retouching">
-    <title>
-      <phrase>Removing Unwanted Objects from an Image</phrase>
-    </title>
+    <title>Removing Unwanted Objects from an Image</title>
     <para>
       There are two kinds of objects you might want to remove from an image:
       first, artifacts caused by junk such as dust or hair on the lens;
@@ -597,9 +570,7 @@
       mountain landscape.
     </para>
     <sect3 id="gimp-using-photography-despeckling">
-      <title>
-        <phrase>Despeckling</phrase>
-      </title>
+      <title>Despeckling</title>
       <para>
         A good tool for removing dust and other types of lens grunge is the
         <link linkend="plug-in-despeckle">Despeckle</link>
@@ -625,9 +596,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-garbage">
-      <title>
-        <phrase>Garbage Removal</phrase>
-      </title>
+      <title>Garbage Removal</title>
       <para>
         The most useful method for removing unwanted <quote>clutter</quote>
         from an image is the <link linkend="gimp-tool-clone">Clone</link>
@@ -674,9 +643,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-red-eye">
-      <title>
-        <phrase>Removing Red-eye</phrase>
-      </title>
+      <title>Removing Red-eye</title>
       <indexterm>
         <primary>Red-eyes</primary>
       </indexterm>
@@ -702,13 +669,9 @@
   </sect2>
 
   <sect2 id="gimp-using-photography-saving">
-    <title>
-      <phrase>Saving Your Results</phrase>
-    </title>
+    <title>Saving Your Results</title>
     <sect3 id="gimp-using-photography-files">
-      <title>
-        <phrase>Files</phrase>
-      </title>
+      <title>Files</title>
       <para>
         What file format should you use to save the results of your work, and
         should you resize it? The answers depend on what you intend to use the
@@ -775,9 +738,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-printing">
-      <title>
-        <phrase>Printing Your Photos</phrase>
-      </title>
+      <title>Printing Your Photos</title>
       <indexterm>
         <primary>Printing</primary>
         <secondary>Printing your photos</secondary>
@@ -861,9 +822,7 @@
     </sect3>
 
     <sect3 id="gimp-using-photography-exif">
-      <title>
-        <phrase>EXIF Data</phrase>
-      </title>
+      <title>EXIF Data</title>
       <para>
         Modern digital cameras, when you take a picture, add information to
         the data file about the camera settings and the circumstances under
diff --git a/src/using/preferences/prefs-default-grid.xml b/src/using/preferences/prefs-default-grid.xml
index b7d6fa8..5f8cbe1 100644
--- a/src/using/preferences/prefs-default-grid.xml
+++ b/src/using/preferences/prefs-default-grid.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history
   2008-04-16 Mr.Dust : added 'ko'
   2006-11-01 lexa: made the file docbook compliant
   2008-01-28 jpl: update text & images
 -->
 <sect2 id="gimp-prefs-default-grid">
-  <title>
-    <phrase>Default Image Grid</phrase>
-  </title>
+  <title>Default Image Grid</title>
   <indexterm>
     <primary>Preferences</primary>
     <secondary>Image grid</secondary>
@@ -18,12 +17,11 @@
     <secondary>Default setting</secondary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Default Grid Preferences</phrase>
-    </title>
+    <title>Default Grid Preferences</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/preferences/prefs-default-grid.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/preferences/prefs-default-grid.png"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/src/using/preferences/prefs-environment.xml b/src/using/preferences/prefs-environment.xml
index 7e44112..40b6acc 100644
--- a/src/using/preferences/prefs-environment.xml
+++ b/src/using/preferences/prefs-environment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--  section history:
   2008-04-07 Mr.Dust : added 'ko'
   2007-09-29 AntI: Added 'es'
@@ -22,7 +23,8 @@
     <title>Environment Preferences</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/preferences/prefs-environment.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/preferences/prefs-environment.png"/>
       </imageobject>
       <caption>
         <para>
@@ -100,9 +102,7 @@
       </varlistentry>
     </variablelist>
     <variablelist>
-      <title>
-        <phrase>Image Thumbnails</phrase>
-      </title>
+      <title>Image Thumbnails</title>
       <varlistentry>
         <term>Size of thumbnails</term>
         <listitem>
@@ -128,9 +128,7 @@
       </varlistentry>
     </variablelist>
     <variablelist>
-      <title>
-        <phrase>Saving Images</phrase>
-      </title>
+      <title>Saving Images</title>
       <varlistentry>
         <term>Confirm closing of unsaved images</term>
         <listitem>
@@ -145,9 +143,7 @@
       </varlistentry>
     </variablelist>
     <variablelist>
-      <title>
-        <phrase>Document history</phrase>
-      </title>
+      <title>Document history</title>
       <varlistentry>
         <term>Keep record of used files in the Recent Documents list</term>
         <listitem>
diff --git a/src/using/preferences/prefs-folders-data.xml b/src/using/preferences/prefs-folders-data.xml
index 445e83c..f2be9bf 100644
--- a/src/using/preferences/prefs-folders-data.xml
+++ b/src/using/preferences/prefs-folders-data.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-07-20 Mr.Dust : added 'ko'
   2007-03-25 KoSt: added 'no'
   2006-08-25 lexa: enhanced docbook compliance
 -->
 <sect2 id="gimp-prefs-folders-data">
-  <title>
-    <phrase>Data Folders</phrase>
-  </title>
+  <title>Data Folders</title>
   <anchor id="gimp-prefs-folders-brushes"/>
   <anchor id="gimp-prefs-folders-patterns"/>
   <anchor id="gimp-prefs-folders-palettes"/>
@@ -32,7 +31,8 @@
     <title>Preferences: Brush Folders</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/preferences/prefs-folders-brush.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/preferences/prefs-folders-brush.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -76,7 +76,11 @@
       <listitem>
         <para>
           If you type the name of a folder in the entry space, or navigate to
-          it using the file chooser button on the right, and then click the
+          it using the file chooser button
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-fileopen-16.png"/>
+          </guiicon>
+          on the right, and then click the
           left button, this will replace the selected folder with the one you
           have specified. If nothing in the list is selected, the folder you
           specify will be added to the list. If the light-symbol to the left
diff --git a/src/using/preferences/prefs-folders.xml b/src/using/preferences/prefs-folders.xml
index 5a1569b..c4a209d 100644
--- a/src/using/preferences/prefs-folders.xml
+++ b/src/using/preferences/prefs-folders.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--  section history:
   2008-07-20 Mr.Dust : added 'ko'
   2007-01-29 added Spanish content by manuq
@@ -7,9 +8,7 @@
   2008-02-04 Vérification + compléments par jpl in french
 -->
 <sect2 id="gimp-prefs-folders">
-  <title>
-    <phrase>Folders</phrase>
-  </title>
+  <title>Folders</title>
   <indexterm>
     <primary>Dialogs</primary>
     <secondary>Preferences</secondary>
@@ -19,7 +18,8 @@
     <title>Basic Folder Preferences</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/preferences/prefs-folders.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/preferences/prefs-folders.png"/>
       </imageobject>
     </mediaobject>
   </figure>
diff --git a/src/using/preferences/prefs-image-window-appearance.xml b/src/using/preferences/prefs-image-window-appearance.xml
index 9088ffc..c0a5d27 100644
--- a/src/using/preferences/prefs-image-window-appearance.xml
+++ b/src/using/preferences/prefs-image-window-appearance.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--  section history:
   2008-04-26 Mr.Dust : added 'ko'
   2006-11-01 lexa: made the file docbook compliant
   2008-01-28 jpl: update text & images
 -->
 <sect2 id="gimp-prefs-image-window-appearance">
-  <title>
-    <phrase>Image Window Appearance</phrase>
-  </title>
+  <title>Image Window Appearance</title>
   <indexterm>
     <primary>Dialogs</primary>
     <secondary>Preferences</secondary>
@@ -19,12 +18,11 @@
     <secondary>Preferences</secondary>
   </indexterm>
   <figure>
-    <title>
-      <phrase>Image Window Appearance Defaults</phrase>
-    </title>
+    <title>Image Window Appearance Defaults</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/preferences/prefs-image-window-appearance.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/preferences/prefs-image-window-appearance.png"/>
       </imageobject>
       <caption>
         <para>
diff --git a/src/using/setup.xml b/src/using/setup.xml
index c6e55ac..f5a3bf8 100644
--- a/src/using/setup.xml
+++ b/src/using/setup.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-04-14 Added Spanish translation by AntI
   2007-01-22 modified Korean Translation by Dust
@@ -8,9 +9,7 @@
   2006-07-22 dust: added ko translation
 -->
 <sect1 id="gimp-using-setup-tile-cache">
-  <title>
-    <phrase>How to Set Your Tile Cache</phrase>
-  </title>
+  <title>How to Set Your Tile Cache</title>
   <indexterm>
     <primary>Tile cache</primary>
   </indexterm>
diff --git a/src/using/shortcuts.xml b/src/using/shortcuts.xml
index 6a8c01f..0d5a501 100644
--- a/src/using/shortcuts.xml
+++ b/src/using/shortcuts.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--Version history
   2007-07-15 lexa: removed inappropriate step
   2007-04-12 Added Spanish translation by AntI
@@ -9,9 +10,7 @@
   2005-11-01 Created by julien hardelin
 -->
 <sect1 id="gimp-concepts-shortcuts">
-  <title>
-    <phrase>Creating Shortcuts to Menu Functions</phrase>
-  </title>
+  <title>Creating Shortcuts to Menu Functions</title>
   <indexterm>
     <primary>Shortcuts</primary>
   </indexterm>
@@ -26,9 +25,7 @@
     shortcut. There are two methods for doing this.
   </para>
   <procedure>
-    <title>
-      <phrase>Using dynamic keyboard shortcuts</phrase>
-    </title>
+    <title>Using dynamic keyboard shortcuts</title>
     <step>
       <para>
         First, you have to activate this capability by checking the
@@ -67,19 +64,16 @@
     </step>
   </procedure>
   <figure>
-    <title>
-      <phrase>Configure Keyboard Shortcuts</phrase>
-    </title>
+    <title>Configure Keyboard Shortcuts</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dialogs/dialogs-shortcuts.png" format="PNG"/>
+        <imagedata format="PNG"
+          fileref="images/dialogs/dialogs-shortcuts.png"/>
       </imageobject>
     </mediaobject>
   </figure>
   <procedure>
-    <title>
-      <phrase>Using the Keyboard Shortcut Editor</phrase>
-    </title>
+    <title>Using the Keyboard Shortcut Editor</title>
     <step>
       <para>
         You get to this Editor by clicking on <guibutton>Configure
diff --git a/src/using/variable-size-brush.xml b/src/using/variable-size-brush.xml
index 3280d52..7aad23f 100644
--- a/src/using/variable-size-brush.xml
+++ b/src/using/variable-size-brush.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--Version history
   2009-02-21 j.h: revised for v2.6
   2008-04-04 Mr.Dust : reviewed and added 'ko'
@@ -11,9 +12,7 @@
   2006-04-15 Created by j.h
 -->
 <sect1 id="gimp-using-variable-size-brush">
-  <title>
-    <phrase>Varying brush size</phrase>
-  </title>
+  <title>Varying brush size</title>
   <indexterm>
     <primary>Brushes</primary>
     <secondary>Varying brush size</secondary>
@@ -23,9 +22,7 @@
   </para>
 
   <sect2 id="gimp-using-variable-size-brush-varying">
-    <title>
-      <phrase>How to vary the height of a brush</phrase>
-    </title>
+    <title>How to vary the height of a brush</title>
     <para>
        You can get the brush size varying in three ways:
     </para>
@@ -38,12 +35,11 @@
           have a slider to vary brush size.
         </para>
         <figure>
-          <title>
-            <phrase>The Scale slider</phrase>
-          </title>
+          <title>The Scale slider</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/using/stretch-shrink-cursor.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/using/stretch-shrink-cursor.png"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -190,12 +186,8 @@
   </sect2>
 
   <sect2 id="gimp-using-variable-size-brush-creating">
-    <title>
-      <phrase>Creating a brush quickly</phrase>
-    </title>
-    <para>
-       Two methods to create a new brush easily:
-    </para>
+    <title>Creating a brush quickly</title>
+    <para>Two methods to create a new brush easily:</para>
     <orderedlist>
       <listitem>
         <para>
@@ -208,25 +200,24 @@
           usable.
         </para>
         <figure>
-          <title>
-            <phrase>
-              Selection becomes a brush after  copying
-            </phrase>
-          </title>
+          <title>Selection becomes a brush after copying</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/using/select-to-brush.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/using/select-to-brush.png"/>
             </imageobject>
           </mediaobject>
         </figure>
       </listitem>
       <listitem>
-        <para>
-          The second method is more elaborate.
-        </para>
+        <para>The second method is more elaborate. </para>
         <para>
           Do
-          <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice> with, for example, a width and a length of 35 pixels
+          <menuchoice>
+            <guimenu>File</guimenu>
+            <guimenuitem>New</guimenuitem>
+          </menuchoice>
+          with, for example, a width and a length of 35 pixels
           and in the advanced options a
           <guilabel>Color Space</guilabel> in
           <guilabel>Gray Level</guilabel> and
@@ -241,20 +232,22 @@
           <guilabel>/home/name_of_user/.gimp-2.6/brushes/</guilabel>.
         </para>
         <para>
-          In the brushes window, click on the button
-          <guilabel>Refresh brushes</guilabel>.
+          In the Brushes dialog window, click on the button
+          <guilabel>Refresh brushes</guilabel>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+          </guiicon>.
         </para>
         <para>
           And your marvellous brush appears right in the middle of the other
           brushes. You can use it immediately, without starting GIMP again.
         </para>
         <figure>
-          <title>
-            <phrase>Steps to create a brush</phrase>
-          </title>
+          <title>Steps to create a brush</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/using/create-brush1.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/using/create-brush1.png"/>
             </imageobject>
             <caption>
               <para>Draw image, save as brush</para>
@@ -262,7 +255,8 @@
           </mediaobject>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/using/create-brush2.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/using/create-brush2.png"/>
             </imageobject>
             <caption>
               <para>Refresh brushes</para>
@@ -270,7 +264,8 @@
           </mediaobject>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/using/create-brush3.png" format="PNG"/>
+              <imagedata format="PNG"
+                fileref="images/using/create-brush3.png"/>
             </imageobject>
             <caption>
               <para>Use the brush</para>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]