diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index aca94d26b4..6393661079 100644
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -6,213 +6,90 @@
 <section id="visual-display">
   <title>Display</title>
   <para role="gallery">
-    <link linkend="GtkLabel">
-      <inlinegraphic fileref="label.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkSpinner">
-      <inlinegraphic fileref="spinner.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkStatusbar">
-      <inlinegraphic fileref="statusbar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkLevelBar">
-      <inlinegraphic fileref="levelbar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkProgressBar">
-      <inlinegraphic fileref="progressbar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkInfoBar">
-      <inlinegraphic fileref="info-bar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkScrollbar">
-      <inlinegraphic fileref="scrollbar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkImage">
-      <inlinegraphic fileref="image.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkSeparator">
-      <inlinegraphic fileref="separator.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkTextView">
-      <inlinegraphic fileref="multiline-text.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkScale">
-      <inlinegraphic fileref="scales.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkGLArea">
-      <inlinegraphic fileref="glarea.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkPicture">
-      <inlinegraphic fileref="picture.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkVideo">
-      <inlinegraphic fileref="video.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkMediaControls">
-      <inlinegraphic fileref="media-controls.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkWindowControls">
-      <inlinegraphic fileref="windowcontrols.png" format="PNG"></inlinegraphic>
-    </link>
+    <link linkend="GtkLabel"><inlinegraphic fileref="label.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkSpinner"><inlinegraphic fileref="spinner.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkStatusbar"><inlinegraphic fileref="statusbar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkLevelBar"><inlinegraphic fileref="levelbar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkProgressBar"><inlinegraphic fileref="progressbar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkInfoBar"><inlinegraphic fileref="info-bar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkScrollbar"><inlinegraphic fileref="scrollbar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkImage"><inlinegraphic fileref="image.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkSeparator"><inlinegraphic fileref="separator.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkTextView"><inlinegraphic fileref="multiline-text.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkScale"><inlinegraphic fileref="scales.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkGLArea"><inlinegraphic fileref="glarea.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkPicture"><inlinegraphic fileref="picture.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkVideo"><inlinegraphic fileref="video.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkMediaControls"><inlinegraphic fileref="media-controls.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkWindowControls"><inlinegraphic fileref="windowcontrols.png" format="PNG"></inlinegraphic></link>
   </para>
 </section>
 
 <section id="visual-buttons">
   <title>Buttons</title>
   <para role="gallery">
-    <link linkend="GtkButton">
-      <inlinegraphic fileref="button.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkCheckButton">
-      <inlinegraphic fileref="check-button.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkToggleButton">
-      <inlinegraphic fileref="toggle-button.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkLinkButton">
-      <inlinegraphic fileref="link-button.png" format="PNG"></inlinegraphic>
-    </link>
-
-    <link linkend="GtkMenuButton">
-      <inlinegraphic fileref="menu-button.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkLockButton">
-      <inlinegraphic fileref="lockbutton.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkSpinButton">
-      <inlinegraphic fileref="spinbutton.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkColorButton">
-      <inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic>
-    </link>
-
-    <link linkend="GtkSwitch">
-      <inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkComboBox">
-      <inlinegraphic fileref="combo-box.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkComboBoxText">
-      <inlinegraphic fileref="combo-box-text.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkFontButton">
-      <inlinegraphic fileref="font-button.png" format="PNG"></inlinegraphic>
-    </link>
-
-    <link linkend="GtkAppChooserButton">
-      <inlinegraphic fileref="appchooserbutton.png" format="PNG"></inlinegraphic>
-    </link>
-   <link linkend="GtkVolumeButton">
-      <inlinegraphic fileref="volumebutton.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkFileChooserButton">
-      <inlinegraphic fileref="file-button.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkDropDown">
-      <inlinegraphic fileref="drop-down.png" format="PNG"></inlinegraphic>
-    </link>
+    <link linkend="GtkButton"><inlinegraphic fileref="button.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkCheckButton"><inlinegraphic fileref="check-button.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkToggleButton"><inlinegraphic fileref="toggle-button.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkLinkButton"><inlinegraphic fileref="link-button.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkMenuButton"><inlinegraphic fileref="menu-button.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkLockButton"><inlinegraphic fileref="lockbutton.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkSpinButton"><inlinegraphic fileref="spinbutton.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkColorButton"><inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkSwitch"><inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkComboBox"><inlinegraphic fileref="combo-box.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkComboBoxText"><inlinegraphic fileref="combo-box-text.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkFontButton"><inlinegraphic fileref="font-button.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkAppChooserButton"><inlinegraphic fileref="appchooserbutton.png" format="PNG"></inlinegraphic></link>
+   <link linkend="GtkVolumeButton"><inlinegraphic fileref="volumebutton.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkFileChooserButton"><inlinegraphic fileref="file-button.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkDropDown"><inlinegraphic fileref="drop-down.png" format="PNG"></inlinegraphic></link>
   </para>
 </section>
 
 <section id="visual-entries">
   <title>Entries</title>
   <para role="gallery">
-    <link linkend="GtkEntry">
-      <inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkSearchEntry">
-      <inlinegraphic fileref="search-entry.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkPasswordEntry">
-      <inlinegraphic fileref="password-entry.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkEditableLabel">
-      <inlinegraphic fileref="editable-label.png" format="PNG"></inlinegraphic>
-    </link>
+    <link linkend="GtkEntry"><inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkSearchEntry"><inlinegraphic fileref="search-entry.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkPasswordEntry"><inlinegraphic fileref="password-entry.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkEditableLabel"><inlinegraphic fileref="editable-label.png" format="PNG"></inlinegraphic></link>
   </para>
 </section>
 
 <section id="visual-containers">
   <title>Containers</title>
   <para role="gallery">
-    <link linkend="GtkScrolledWindow">
-      <inlinegraphic fileref="scrolledwindow.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkHeaderBar">
-      <inlinegraphic fileref="headerbar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkSearchBar">
-      <inlinegraphic fileref="search-bar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkActionBar">
-      <inlinegraphic fileref="action-bar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkListBox">
-      <inlinegraphic fileref="list-box.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkFlowBox">
-      <inlinegraphic fileref="flow-box.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkStack">
-      <inlinegraphic fileref="stack.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkStackSwitcher">
-      <inlinegraphic fileref="stackswitcher.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkStackSidebar">
-      <inlinegraphic fileref="sidebar.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkTreeView">
-      <inlinegraphic fileref="list-and-tree.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkIconView">
-      <inlinegraphic fileref="icon-view.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkNotebook">
-      <inlinegraphic fileref="notebook.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkFrame">
-      <inlinegraphic fileref="frame.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkPaned">
-      <inlinegraphic fileref="panes.png" format="PNG"></inlinegraphic>
-    </link>
+    <link linkend="GtkScrolledWindow"><inlinegraphic fileref="scrolledwindow.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkHeaderBar"><inlinegraphic fileref="headerbar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkSearchBar"><inlinegraphic fileref="search-bar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkActionBar"><inlinegraphic fileref="action-bar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkListBox"><inlinegraphic fileref="list-box.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkFlowBox"><inlinegraphic fileref="flow-box.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkStack"><inlinegraphic fileref="stack.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkStackSwitcher"><inlinegraphic fileref="stackswitcher.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkStackSidebar"><inlinegraphic fileref="sidebar.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkTreeView"><inlinegraphic fileref="list-and-tree.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkIconView"><inlinegraphic fileref="icon-view.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkNotebook"><inlinegraphic fileref="notebook.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkFrame"><inlinegraphic fileref="frame.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkPaned"><inlinegraphic fileref="panes.png" format="PNG"></inlinegraphic></link>
   </para>
 </section>
 
 <section id="visual-windows">
   <title>Windows</title>
   <para role="gallery">
-    <link linkend="GtkWindow">
-      <inlinegraphic fileref="window.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkMessageDialog">
-      <inlinegraphic fileref="messagedialog.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkAboutDialog">
-      <inlinegraphic fileref="aboutdialog.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkAssistant">
-      <inlinegraphic fileref="assistant.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkColorChooserDialog">
-      <inlinegraphic fileref="colorchooser.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkFileChooserDialog">
-      <inlinegraphic fileref="filechooser.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkFontChooserDialog">
-      <inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkAppChooserDialog">
-      <inlinegraphic fileref="appchooserdialog.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkPageSetupUnixDialog">
-      <inlinegraphic fileref="pagesetupdialog.png" format="PNG"></inlinegraphic>
-    </link>
-    <link linkend="GtkPrintUnixDialog">
-      <inlinegraphic fileref="printdialog.png" format="PNG"></inlinegraphic>
-    </link>
+    <link linkend="GtkWindow"><inlinegraphic fileref="window.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkMessageDialog"><inlinegraphic fileref="messagedialog.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkAboutDialog"><inlinegraphic fileref="aboutdialog.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkAssistant"><inlinegraphic fileref="assistant.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkColorChooserDialog"><inlinegraphic fileref="colorchooser.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkFileChooserDialog"><inlinegraphic fileref="filechooser.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkFontChooserDialog"><inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkAppChooserDialog"><inlinegraphic fileref="appchooserdialog.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkPageSetupUnixDialog"><inlinegraphic fileref="pagesetupdialog.png" format="PNG"></inlinegraphic></link>
+    <link linkend="GtkPrintUnixDialog"><inlinegraphic fileref="printdialog.png" format="PNG"></inlinegraphic></link>
   </para>
 </section>
 </para>