diff --git a/lib/doc/Intro.lyx b/lib/doc/Intro.lyx
index c15f98fbdf..933f008204 100644
--- a/lib/doc/Intro.lyx
+++ b/lib/doc/Intro.lyx
@@ -151,16 +151,16 @@ What is LyX?
 LyX is a document preparation system.
  It excels at letting you create complex technical and scientific articles
  with mathematics, cross-references, bibliographies, indices, etc.
- It is very good at documents of any length in which the usual processing
- abilities are required: automatic sectioning and pagination, spell checking,
- and so forth.
+ It is very good for working with documents of any length in which the usual
+ processing abilities are required: automatic sectioning and pagination,
+ spell checking, and so forth.
  It can also be used to write a letter to your mom, though granted, there
  are probably simpler programs available for that.
  It is definitely not the best tool for creating banners, flyers, or advertiseme
 nts (we'll explain why later), though with some effort all these can be
  done, too.
- Some examples of what it is used for: memos, letters, dissertations and
- theses, lecture notes, seminar notebooks, conference proceedings, software
+ Here are some examples of what it is used for: memos, letters, dissertations
+ and theses, lecture notes, seminar notebooks, conference proceedings, software
  documentation, books, articles in refereed scientific journals, scripts
  for plays and movies, business proposals, presentations \SpecialChar \ldots{}
 
@@ -179,7 +179,7 @@ typewriter concept
 
 .
  It is designed for authors who want professional output quickly with a
- minimum of effort without becoming specialists in typesetting.
+ minimum of effort and without becoming specialists in typesetting.
  The job of typesetting is done mostly by the computer, not the author;
  with LyX, the author can concentrate on the contents of his writing.
 \end_layout
@@ -294,7 +294,6 @@ Introduction
  in the document, or if you insert a new section before it, you need to
  change the numbering for this and all following sections, as well as any
  entry in the table of contents.
- 
 \end_layout
 
 \begin_layout Standard
@@ -307,12 +306,11 @@ Section
 \begin_inset Quotes eld
 \end_inset
 
-Introduction\SpecialChar \@.
-
+Introduction
 \begin_inset Quotes erd
 \end_inset
 
-
+.
 \end_layout
 
 \begin_layout Standard
@@ -562,7 +560,7 @@ Additional Features
 
 \end_inset
 
- 
+
 \end_layout
 
 \begin_layout Standard
@@ -679,7 +677,7 @@ TeX isn't only a typesetting engine; it also allows you to define macros.
  This is where Leslie Lamport enters our story.
  He wanted a macro package that was more user- and less typesetter-oriented,
  with a set of commands that consistently typeset things like sections,
- tables or math formulas in an uniform, consistent fashion.
+ tables or math formulas in a uniform, consistent fashion.
  This is how LaTeX was born.
 \end_layout
 
@@ -707,7 +705,8 @@ class
  or an article.
  There are classes for slides, for physics and math journals\SpecialChar \ldots{}
  many universities
- even have a class for their thesis format! A 
+ even have a class for their thesis format.
+ A 
 \emph on
 style
 \emph default
@@ -756,9 +755,9 @@ LyX: Visual, WYSIWYM word-processor that uses LaTeX to do its typesetting.
 This section attempts to account for the difference between LyX and other
  word processors.
  Simply put, LaTeX is the difference.
- By using LaTeX as its backend, LyX helps you think more about 
+ By using LaTeX as its backend, LyX helps you think more about
 \emph on
- what 
+ what
 \emph default
  (as in the 
 \emph on
@@ -781,7 +780,7 @@ To make it easier to answer your questions and describe all of the features
  of LyX, the documentation has been split up into several different files.
  Each one has its own purpose, as described below.
  Before you go ploughing into any of those files, however, you should read
- this chapter thoroughly first, since it contains a lot of useful information
+ this chapter thoroughly, since it contains a lot of useful information
  and commentary that can save you some time.
 \end_layout
 
@@ -824,7 +823,7 @@ type "mailto:"
 \end_inset
 
 .
- If you have questions which are not obviously answered in the documentation,
+ If you have questions that are not obviously answered in the documentation,
  and need help fast, there is an active users' mailing list which you can
  reach at 
 \begin_inset CommandInset href
@@ -843,9 +842,9 @@ The Format of the Manuals
 
 \begin_layout Standard
 Some may have printed out the manuals.
- Others may be reading it within LyX.
+ Others may be reading them within LyX.
  There are some differences between the LyX-file and the printed version.
- First, the title is simply at the top of the document, not formatted on
+ In LyX, the title is simply at the top of the document, not formatted on
  a separate page as in some of the printed versions.
  Nor are any of the footnotes or the Table of Contents fully visible.
  To open a footnote, which looks like this: 
@@ -1938,7 +1937,7 @@ LaTeX
 \begin_inset space ~
 \end_inset
 
-configuration LyX investigates your system upon installation.
+Configuration LyX investigates your system upon installation.
  This file contains info on what LyX learned about your installation.
  Check it to see if you're missing something you might like to have.
 \end_layout
@@ -2089,7 +2088,6 @@ A useful bug report will at a minimum include the version of LyX you are
 config.log
 \family default
 , and mention which compiler you are using.
- 
 \end_layout
 
 \begin_layout Subsubsection
@@ -2184,7 +2182,7 @@ Tutorial
 \emph on
 User's Guide
 \emph default
- is likely to be the most up-to-date of all of the documentation.
+ are likely to be the most up-to-date of all of the documentation.
  You should be able to glean some insights into how we want the manuals
  to read and to look.
 \end_layout
@@ -2206,7 +2204,7 @@ type "mailto:"
 \begin_inset Newline newline
 \end_inset
 
-to discuss your intended changes, and get some feedback on them.
+to discuss your intended changes and to get some feedback on them.
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/LFUNs.lyx b/lib/doc/LFUNs.lyx
index a41ac32a9a..14e9ff4150 100644
--- a/lib/doc/LFUNs.lyx
+++ b/lib/doc/LFUNs.lyx
@@ -75,7 +75,7 @@
 \begin_body
 
 \begin_layout Section*
-LFUNs documentation automatically generated 2011-03-28
+LFUNs documentation automatically generated 2011-12-15
 \end_layout
 
 \begin_layout Standard
@@ -4689,7 +4689,7 @@ Notion WARNING: use at your own risks; this function gives you too many
  A typical example is inset-forall Note note-insert which starts an infinite
  loop.
  This is mitigated by the fact that the number of actions is arbitrarily
- limited to 10000.
+ limited to 100000.
  Note also that inset-forall does not update metrics between iterations,
  which can lead to bugs.
  This has to be eventually fixed.
diff --git a/lib/doc/Tutorial.lyx b/lib/doc/Tutorial.lyx
index 10ffa1c1aa..f6f77acd24 100644
--- a/lib/doc/Tutorial.lyx
+++ b/lib/doc/Tutorial.lyx
@@ -236,9 +236,9 @@ Getting the most out of the Tutorial
 
 \begin_layout Standard
 This tutorial consists of examples and exercises.
- To get the most out of this document, you should read through the document,
- typing all the little things we are telling you to type and trying out
- all of the exercises to see if you get them right.
+ To get the most out of this document, you should read through the it, typing
+ all the little things we are telling you to type and trying out all of
+ the exercises to see if you get them right.
  For convenience, you might want to print out the PDF version of this document.
 \end_layout
 
@@ -486,41 +486,45 @@ As\SpecialChar \@.
 \end_layout
 
 \begin_layout Itemize
-Run LaTeX to create a DVI file, with 
+Create a PDF file, with 
 \family sans
 View\SpecialChar \menuseparator
-DVI
+View
 \family default
  or the toolbar button 
-\begin_inset Graphics
-	filename ../images/buffer-view_dvi.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
 \end_inset
 
+
+\family default
 .
- LyX will open a DVI-viewer program displaying your document as it will
+ LyX will open a PDF-viewer program displaying your document as it will
  look when printed.
 \begin_inset Foot
 status collapsed
 
 \begin_layout Plain Layout
-You can save time by leaving the DVI-viewer running in the background.
+You can save time by leaving the PDF-viewer running in the background.
  Then, you can use 
 \family sans
 View\SpecialChar \menuseparator
-Update\SpecialChar \menuseparator
-DVI
+Update
 \family default
  or the toolbar button 
-\begin_inset Graphics
-	filename ../images/buffer-update_dvi.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
 \end_inset
 
- and just click on the DVI-viewer window (or unminimize it) after LaTeX
- finishes running.
+
+\family default
+ and just click on the PDF-viewer window (or unminimize it) afterwards.
 \end_layout
 
 \end_inset
@@ -549,26 +553,30 @@ Simple Operations
 \end_layout
 
 \begin_layout Standard
-LyX can of course do most of the things you are used to do with a word processor.
+LyX can of course do most of the things you are used to doing with a word
+ processor.
  It will word-wrap and indent paragraphs automatically.
  Here is a quick description of how to do some simple actions.
 \end_layout
 
 \begin_layout Description
 Undo LyX has multiple levels of undo, which means you can undo everything
- you have  done since your current editing session started, by selecting
+ you have done since your current editing session started, by selecting
  
 \family sans
 Edit\SpecialChar \menuseparator
 Undo
 \family default
  (toolbar button 
-\begin_inset Graphics
-	filename ../images/undo.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "undo"
 \end_inset
 
+
+\family default
 ) over and over again.
  If you undo too much, just select 
 \family sans
@@ -576,14 +584,16 @@ Edit\SpecialChar \menuseparator
 Redo
 \family default
  (toolbar button 
-\begin_inset Graphics
-	filename ../images/redo.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "redo"
 \end_inset
 
+
+\family default
 ) to get it back.
- 
 \end_layout
 
 \begin_deeper
@@ -599,30 +609,46 @@ Edit\SpecialChar \menuseparator
 Cut
 \family default
  (toolbar button 
-\begin_inset Graphics
-	filename ../images/cut.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "cut"
 \end_inset
 
+
+\family default
 ), 
 \family sans
 Edit\SpecialChar \menuseparator
 Copy
 \family default
  (toolbar button 
-\begin_inset Graphics
-	filename ../images/copy.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "copy"
 \end_inset
 
+
+\family default
 ), and 
 \family sans
 Edit\SpecialChar \menuseparator
 Paste
 \family default
  (toolbar button 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "paste"
+\end_inset
+
+
+\family default
+
 \begin_inset Graphics
 	filename ../images/paste.png
 	scale 75
@@ -653,12 +679,15 @@ Find
 Replace
 \family default
  (toolbar button 
-\begin_inset Graphics
-	filename ../images/dialog-show_findreplace.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"
 \end_inset
 
+
+\family default
 ) to search.
  In the dialog, search with the 
 \family sans
@@ -672,7 +701,7 @@ Next
 \family sans
 Replace
 \family default
- button to replace a word you have  found.
+ button to replace a word you have found.
 \begin_inset Foot
 status collapsed
 
@@ -680,8 +709,8 @@ status collapsed
 Close the window when you are done or leave it open if you find it more
  convenient.
  Most dialog boxes in LyX can operate like this.
- Just be sure you have the right window focus when you are trying to type
- in the main LyX window or a LyX dialog.
+ Just be sure you have the right window in focus when you are trying to
+ type in the main LyX window or a LyX dialog.
 \end_layout
 
 \end_inset
@@ -719,12 +748,15 @@ Text
 Style
 \family default
  dialog (toolbar button 
-\begin_inset Graphics
-	filename ../images/dialog-show_character.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
 \end_inset
 
+
+\family default
 ).
 \end_layout
 
@@ -1216,7 +1248,6 @@ Subsection
 \end_inset
 
 .
- 
 \end_layout
 
 \begin_layout Standard
@@ -1332,7 +1363,6 @@ A slide presentation might use the
 Itemize
 \family default
  environment's bulleted lists to describe different points.
- 
 \end_layout
 
 \begin_layout Itemize
@@ -1341,7 +1371,6 @@ An outline would use the
 Enumerate
 \family default
  environment's numbered lists (and lettered sublists).
- 
 \end_layout
 
 \begin_layout Itemize
@@ -1350,7 +1379,6 @@ A document describing several software packages could use the
 Description
 \family default
  environment, where each item in the list begins with a bold-faced word.
- 
 \end_layout
 
 \begin_layout Itemize
@@ -1373,7 +1401,7 @@ Let us write a list of reasons why LyX is better than other word processors.
 \begin_layout Standard
 
 \family typewriter
-LyX is better than other word processors because: 
+LyX is better than other word processors because:
 \end_layout
 
 \begin_layout Standard
@@ -1390,7 +1418,17 @@ Itemize
 \family sans
 Environment
 \family default
- box.
+ box (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Itemize"
+\end_inset
+
+
+\family default
+).
  LyX writes a 
 \begin_inset Quotes eld
 \end_inset
@@ -1400,7 +1438,7 @@ bullet
 \end_inset
 
  on the line.
- Type in your reasons: 
+ Type in your reasons:
 \end_layout
 
 \begin_layout LyX-Code
@@ -1485,7 +1523,17 @@ Enumerate
 \family sans
 Environment
 \family default
- box.
+ box (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Enumerate"
+\end_inset
+
+
+\family default
+).
  Pow! As we mentioned, if you add or delete a list item, LyX will fix the
  numbering.
 \end_layout
@@ -1500,14 +1548,35 @@ Description
 \family sans
 List
 \family default
-, in order to see what they look like.
+ (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Description"
+\end_inset
+
+
+\family default
+ and 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout List"
+\end_inset
+
+
+\family default
+), in order to see what they look like.
  For those two environments, each list item is made up of a term, which
  is the item's first word, followed by a definition, which is the rest of
  the paragraph (until you hit 
 \family sans
 Return
 \family default
-.) The term is either typeset in boldface (
+).
+ The term is either typeset in boldface (
 \family sans
 Description
 \family default
@@ -2013,7 +2082,7 @@ My
 
 Address
 \family default
- environment, which do not even exist in most other document classes.
+ environment, that do not exist in most other document classes.
  Others, like 
 \family sans
 Description
@@ -2030,7 +2099,7 @@ Signature
 \end_inset
 
 Signature:
-\begin_inset Quotes eld
+\begin_inset Quotes erd
 \end_inset
 
  in red before the actual text of the signature.
@@ -2101,8 +2170,8 @@ Templates can be a huge time-saver, and we urge you to use them whenever
  document classes.
  Finally, they may be useful for a person who is configuring LyX for a bunch
  of less computer-aware users.
- When they are first learning LyX, it will be much less intimidating if
- they have a letter template customized for their company, for example.
+ When they are first learning LyX, it will be less intimidating if they
+ have a letter template customized for their company, for example.
 \end_layout
 
 \begin_layout Section
@@ -2197,11 +2266,10 @@ Embedded Objects
  using cross-references.
  You can refer either to the section's number, or to the page that the section
  appears on.
- As with section numbering, LyX also takes care about cross-reference numbering
+ As with section numbering, LyX also takes care of cross-reference numbering
  for you.
- Automatic labels and cross-references are among the most significant advantages
- of LyX (and LaTeX) over conventional word processors.
- 
+ Automatic management of labels and cross-references is among the most significa
+nt advantages of LyX (and LaTeX) over conventional word processors.
 \end_layout
 
 \begin_layout Subsection
@@ -2224,13 +2292,15 @@ Insert\SpecialChar \menuseparator
 Label
 \family default
  or the toolbar button 
-\begin_inset Graphics
-	filename ../images/label-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "label-insert"
 \end_inset
 
+
+\family default
 .
  A dialog asks you for a label name, and gives you a suggestion.
  When you click on 
@@ -2288,13 +2358,15 @@ Cross
 Reference
 \family default
  or the toolbar button 
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_ref.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset ref"
 \end_inset
 
+
+\family default
 .
  The Cross-reference dialog pops up.
  It shows a list of the possible labels you can reference.
@@ -2307,7 +2379,15 @@ sec:About-This-Document
 \end_inset
 
 .
- First, select the drop-down menu labeled Format and select 
+ First, select the drop-down menu labeled 
+\begin_inset Quotes eld
+\end_inset
+
+Format
+\begin_inset Quotes erd
+\end_inset
+
+ and select 
 \begin_inset Quotes eld
 \end_inset
 
@@ -2350,12 +2430,12 @@ Section
 \end_inset
 
  and the reference).
- Alternatively to that method, you can right-click on a label and use in
- the appearing context menu 
+ An alternative way to reference a label is to right-click the label and
+ select 
 \family sans
 Copy as Reference
 \family default
-.
+ in the appearing context menu.
  The cross-reference to this label is now in the clipboard and can be copied
  to the actual cursor position via the menu 
 \family sans
@@ -2440,14 +2520,14 @@ More fun with labels
 \end_layout
 
 \begin_layout Standard
-We told you that LyX takes care about numbering cross-references; now you
- can test that.
+We told you that LyX takes careof numbering cross-references; now you can
+ test this claim.
  Add a new section before Section
 \begin_inset space ~
 \end_inset
 
 2.
- Update the DVI view, and — voilà! — the section cross reference changed
+ Update the DVI view, and — voilà! — the section cross-reference changed
  to 
 \begin_inset Quotes eld
 \end_inset
@@ -2491,8 +2571,8 @@ Cross-reference
 \end_layout
 
 \begin_layout Standard
-If you want to make sure that the cross-referencing gets the pages right
- even for larger documents, 
+If you want to confirm that the cross-referencing gets the pages right even
+ for larger documents, 
 \family sans
 Copy
 \family default
@@ -2504,7 +2584,7 @@ User's Guide
 \family sans
 Paste
 \family default
- the stolen text into your document.
+ it into your document.
 \begin_inset Foot
 status collapsed
 
@@ -2546,13 +2626,15 @@ Footnotes and Margin Notes
 
 \begin_layout Standard
 Footnotes can be added using the toolbar button 
-\begin_inset Graphics
-	filename ../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
  or the menu 
 \family sans
 Insert\SpecialChar \menuseparator
@@ -2567,15 +2649,7 @@ LyX
 \begin_inset Quotes erd
 \end_inset
 
- somewhere in your document and click the 
-\begin_inset Graphics
-	filename ../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
-
-\end_inset
-
- button.
+ somewhere in your document and insert a footnote.
  A footnote box appears where you can enter the text of the footnote.
  LyX should place the cursor at the beginning of the footnote box.
  Type
@@ -2642,13 +2716,15 @@ Paste
  it.
  In addition, you can change regular text to a footnote, by selecting it
  and hitting the 
-\begin_inset Graphics
-	filename ../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
  button; change a footnote to regular text by hitting the 
 \family sans
 Backspace
@@ -2658,7 +2734,7 @@ Backspace
 \family sans
 Delete
 \family default
- key when the cursor is in the very last position of the footnote, respectively.
+ key when the cursor is in the very last position of the footnote.
 \end_layout
 
 \begin_layout Standard
@@ -2672,13 +2748,15 @@ Marginal
 Note
 \family default
  or the toolbar button 
-\begin_inset Graphics
-	filename ../images/marginalnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "marginalnote-insert"
 \end_inset
 
+
+\family default
 \SpecialChar \@.
  Margin notes are like footnotes, except that: 
 \end_layout
@@ -2739,7 +2817,7 @@ name "sec:bibliographies"
 \end_layout
 
 \begin_layout Standard
-Bibliographies (at least in the exact sciences) are similar to cross references.
+Bibliographies (at least in the exact sciences) are similar to cross-references.
  The bibliography contains a list of references at the end of the document,
  and they can be referenced from within the document.
  Like section titles, LyX and LaTeX make your job easier by automatically
@@ -2791,7 +2869,7 @@ Label
 Label
 \family default
  is set (default), you will see the number of the bibliography in the output.
- Change now the 
+ Now change the 
 \family sans
 Key
 \family default
@@ -2814,13 +2892,15 @@ Insert\SpecialChar \menuseparator
 Citation
 \family default
  or the toolbar button 
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_citation.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset citation"
 \end_inset
 
+
+\family default
 .
  A 
 \family sans
@@ -2908,7 +2988,7 @@ Table of Contents
 
 \begin_layout Standard
 You may want to put a table of contents at the beginning of your document.
- LyX makes this very easy to do.
+ LyX makes this easy to do.
  Just hit 
 \family sans
 Return
@@ -2968,17 +3048,19 @@ Document\SpecialChar \menuseparator
 Outline
 \family default
  or the toolbar button 
-\begin_inset Graphics
-	filename ../images/dialog-toggle_toc.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-toggle toc"
 \end_inset
 
+
+\family default
 .
  This menu will work even if you do not have a table of contents inset in
  your document.
- This is a very useful tool for moving around your document parts.
+ This is a very useful tool for rearranging your document parts.
  Clicking on a (sub)section title in the 
 \family sans
 Outline
@@ -3067,13 +3149,15 @@ Now, that equation does not look very good in LyX and in the output; there
 \begin_layout Standard
 Instead, we create a formula that will get typeset properly.
  In order to create a formula, just click the toolbar button 
-\begin_inset Graphics
-	filename ../images/math-mode.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-mode"
 \end_inset
 
+
+\family default
  or use the menu 
 \family sans
 Insert\SpecialChar \menuseparator
@@ -3086,7 +3170,7 @@ Formula
 \family default
 .
  LyX will insert a little blue square, which is an empty math formula.
- Now just type 
+ Now type 
 \family typewriter
 E=mc^2
 \family default
@@ -3335,7 +3419,7 @@ Esc
 \end_layout
 
 \begin_layout Standard
-Writing a subscript (index) is just easy; start one by typing the underscore
+Writing a subscript (index) is just as easy; start one by typing the underscore
  key 
 \begin_inset Quotes eld
 \end_inset
@@ -3379,7 +3463,7 @@ Math
 
 toolbar
 \family default
- is a convenient way to enter symbols or to perform complicated formula
+ is a convenient way to enter symbols and/or to perform complicated formula
  operations.
  Many of these operations can be accomplished from the keyboard or the 
 \family sans
@@ -3432,7 +3516,17 @@ Math
 \begin_inset Quotes erd
 \end_inset
 
- the toolbar will be shown permanently at the bottom; this state is visualized
+ (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle math"
+\end_inset
+
+
+\family default
+) the toolbar will be shown permanently at the bottom; this state is visualized
  in the 
 \family sans
 Toolbars
@@ -3495,7 +3589,6 @@ toolbar
  arrows, relationships, delimiters, special characters, sums and integrals.
  Note that subscripting and superscripting allow you to put lower and upper
  limits on sums and integrals.
- 
 \end_layout
 
 \begin_layout Subsection
@@ -3504,13 +3597,15 @@ Square roots, accents, and delimiters
 
 \begin_layout Standard
 To type a square root, just click on the button 
-\begin_inset Graphics
-	filename ../images/math/sqrt.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\sqrt"
 \end_inset
 
+
+\family default
 .
  The square root appears, and the cursor is in a new insertion point inside
  the square root.
@@ -3521,22 +3616,32 @@ To type a square root, just click on the button
 
 \begin_layout Standard
 Accenting a character (
-\begin_inset Formula $\overrightarrow{v}$
+\begin_inset Formula $\overrightarrow{a}$
 \end_inset
 
 ) or group of characters (
 \begin_inset Formula $\overrightarrow{a+b}$
 \end_inset
 
-) is done the same way.
- Decorations are available from the toolbar via the button 
-\begin_inset Graphics
-	filename ../images/math/hat.png
-	scale 75
-	scaleBeforeRotation
-
+) is done similarly, and is an example of inserting a 
+\begin_inset Quotes eld
 \end_inset
 
+frame decoration
+\begin_inset Quotes erd
+\end_inset
+
+.
+ Decorations are available from the toolbar via the button 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\hat"
+\end_inset
+
+
+\family default
 .
  Click on a decoration, and LyX will insert that decoration with an insertion
  point under (or over) it.
@@ -3551,13 +3656,15 @@ Accenting a character (
 Delimiters such as parentheses, brackets, and braces work similarly, but
  are a bit more complicated.
  Hit the delimiter button 
-\begin_inset Graphics
-	filename ../images/dialog-show_mathdelimiter.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathdelimiter"
 \end_inset
 
+
+\family default
  to pop up the 
 \family sans
 Delimiter
@@ -3640,14 +3747,25 @@ Fractions
 
 \begin_layout Standard
 To create a fraction, click on the fraction button 
-\begin_inset Graphics
-	filename ../images/math/frac.png
-	lyxscale 75
-	scale 60
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac"
 \end_inset
 
+
+\family default
+ or 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac-square"
+\end_inset
+
+
+\family default
  in the 
 \family sans
 Math
@@ -3796,13 +3914,15 @@ Math
 Toolbar
 \family default
  button 
-\begin_inset Graphics
-	filename ../images/math/functions.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\functions"
 \end_inset
 
+
+\family default
  and then on 
 \begin_inset Quotes eld
 \end_inset
@@ -3888,13 +4008,15 @@ Matrices
 
 \begin_layout Standard
 Click on the matrix button 
-\begin_inset Graphics
-	filename ../images/dialog-show_mathmatrix.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathmatrix"
 \end_inset
 
+
+\family default
  in the 
 \family sans
 Math
@@ -3953,37 +4075,45 @@ Rows
 Columns
 \family default
  or the math toolbar buttons 
-\begin_inset Graphics
-	filename ../images/tabular-feature_append-row.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-row"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../images/tabular-feature_delete-row.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-row"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../images/tabular-feature_append-column.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-column"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../images/tabular-feature_delete-column.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-column"
 \end_inset
 
+
+\family default
 .
 \end_layout
 
@@ -4019,13 +4149,15 @@ User's Guide
 
 \begin_layout Standard
 While being in a formula, click on the display button 
-\begin_inset Graphics
-	filename ../images/math-display.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-display"
 \end_inset
 
+
+\family default
  in the 
 \family sans
 Math
@@ -4148,20 +4280,21 @@ More Math Stuff
 \end_layout
 
 \begin_layout Standard
-LyX's math editor can do a lot more.
- Now you are familiar with the basics, you can refer to the 
+Now you are familiar with the basics.
+ LyX's math editor can do a lot more.
+ You can refer to the 
 \emph on
-User's Guide
+Math
 \emph default
- for tips on how to:
+ manual for tips on how to:
 \end_layout
 
 \begin_layout Itemize
-Label and number expressions
+Label and number expressions.
 \end_layout
 
 \begin_layout Itemize
-Create multi-line equations
+Create multi-line equations.
 \end_layout
 
 \begin_layout Itemize
@@ -4188,7 +4321,7 @@ Write macros.
 \end_layout
 
 \begin_layout Itemize
-Do lots of other things that we have no space for in this Tutorial.
+Almost all you can do with math.
 \end_layout
 
 \begin_layout Chapter
@@ -4226,13 +4359,15 @@ Insert\SpecialChar \menuseparator
 Table
 \family default
  (toolbar button 
-\begin_inset Graphics
-	filename ../images/tabular-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "tabular-insert"
 \end_inset
 
+
+\family default
 ) to get a table.
  Click on the table with the 
 \emph on
@@ -4247,6 +4382,17 @@ Table
 Settings
 \family default
  dialog box which allows extensive table editing.
+ By pressing 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle table"
+\end_inset
+
+
+\family default
+ the table toolbar will appear permanently.
 \end_layout
 
 \begin_layout Itemize
@@ -4257,13 +4403,15 @@ Insert\SpecialChar \menuseparator
 Graphics
 \family default
  (toolbar button 
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
+
+\family default
 ).
  Then browse for the figure file, rotate or scale it, etc.) Tables and figures
  can have captions, and LyX will automatically generate lists of figures
@@ -4416,20 +4564,22 @@ TeX
 Code
 \family default
  (toolbar button 
-\begin_inset Graphics
-	filename ../images/ert-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "ert-insert"
 \end_inset
 
+
+\family default
 ).
  This creates a box where everything within it is passed straight to LaTeX.
 \end_layout
 
 \begin_layout Standard
 In a math formula, TeX mode is handled a bit differently.
- TeX mode is there entered by typing a backslash.
+ TeX mode is entered there by typing a backslash.
  The backslash is not written out, but anything you type afterwards will
  be in red.
  You exit TeX mode by typing 
@@ -4438,7 +4588,7 @@ Space
 \family default
  or some other non-alphabetic character, like a number, underscore, caret,
  or parenthesis.
- Once you exit TeX mode, if LyX knows the TeX command you have  typed in,
+ Once you exit TeX mode, if LyX knows the TeX command you have typed in,
  it will convert it to WYSIWYM\SpecialChar \@.
  So if you type 
 \begin_inset Quotes eld
@@ -4512,7 +4662,7 @@ and
 \emph default
  ending braces will be inserted in red while the cursor is placed between
  the braces.
- This makes it more convenient to type those commands which take an argument.
+ This makes it more convenient to type those commands that take an argument.
 \end_layout
 
 \begin_layout Standard
@@ -4676,7 +4826,6 @@ whatever.tex
 whatever.lyx
 \family default
  file you are editing.
- LyX always creates temporary LaTeX files when viewing or printing files.
 \end_layout
 
 \begin_layout Subsection
@@ -4693,9 +4842,9 @@ The
 Document\SpecialChar \menuseparator
 Settings
 \family default
- dialog takes care of the document-wide options.
- You can change there the document class, default font size and paper size.
- Document class options but also options for LaTeX packages can be entered
+ dialog takes care of the document-wide options, such as changing the document
+ class, default font size and paper size.
+ Document class options and also options for LaTeX packages can be entered
  there in the 
 \family sans
 Class
@@ -4779,7 +4928,7 @@ Style
 
 \begin_layout Standard
 After you have done this, you can use citations from any bibliographies
- you are including with 
+ you have included with 
 \family sans
 Insert\SpecialChar \menuseparator
 Citation
@@ -4796,7 +4945,6 @@ reference "sec:bibliographies"
 \end_inset
 
 ).
- LyX will take care of running BibTeX.
  The box in the 
 \family sans
 Citation
diff --git a/lib/doc/de/Tutorial.lyx b/lib/doc/de/Tutorial.lyx
index b651ae5219..31f6f982f8 100644
--- a/lib/doc/de/Tutorial.lyx
+++ b/lib/doc/de/Tutorial.lyx
@@ -117,6 +117,10 @@ status open
 \begin_layout Plain Layout
 Deutsche Übersetzung 
 \noun on
+Uwe Stöhr
+\noun default
+, 
+\noun on
 Hartmut Haase 
 \noun default
 (
@@ -573,72 +577,54 @@ Speichern
 \begin_inset space \space{}
 \end_inset
 
-unter\SpecialChar \ldots{}
-
+unter
+\family default
+.
 \end_layout
 
 \begin_layout Itemize
-Starten Sie LaTeX, um eine 
-\family typewriter
-DVI
-\family default
--Datei zu erzeugen: 
+Erzeugen Sie eine PDF-Datei mit 
 \family sans
 Ansicht\SpecialChar \menuseparator
-DVI
+Ansicht
 \family default
- (oder klicken Sie auf den Werkzeugleistenknopf 
-\begin_inset Graphics
-	filename ../../images/buffer-view_dvi.png
-	scale 70
-	scaleBeforeRotation
+ (Werkzeugleistenknopf 
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
 \end_inset
 
+
+\family default
 )\SpecialChar \@.
-
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Von jetzt an wird 
-\begin_inset Quotes gld
-\end_inset
-
-oder klicken Sie auf den Werkzeugleistenknopf
-\begin_inset Quotes grd
-\end_inset
-
- weggelassen.
-\end_layout
-
-\end_inset
-
- LyX wird einen DVI-Betrachter starten, der dann ein eigenes Fenster öffnet,
+ LyX wird einen PDF-Betrachter starten, der dann ein eigenes Fenster öffnet,
  in dem Sie den Text so sehen können, wie er später gedruckt aussehen wird.
 \begin_inset Foot
 status collapsed
 
 \begin_layout Plain Layout
-Sie können Zeit sparen, wenn Sie den DVI-Betrachter nicht jedes Mal neu
+Sie können Zeit sparen, wenn Sie den PDF-Betrachter nicht jedes Mal neu
  starten, sondern nur das erste Mal, und das Programm dann im Hintergrund
  weiterlaufen lassen.
  Sie können dann den Menüpunkt 
 \family sans
 Ansicht\SpecialChar \menuseparator
-Aktualisieren\SpecialChar \menuseparator
-DVI
+Aktualisieren
 \family default
  wählen oder auf 
-\begin_inset Graphics
-	filename ../../images/buffer-update_dvi.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
 \end_inset
 
- klicken und, nachdem LaTeX beendet ist, in das DVI-Betrachter-Fenster klicken,
- um die neue Version zu sehen.
+
+\family default
+ klicken und danach in das PDF-Betrachter-Fenster klicken, um die neue Version
+ zu sehen.
 \end_layout
 
 \end_inset
@@ -650,8 +636,7 @@ DVI
 Drucken Sie den Text aus: 
 \family sans
 Datei\SpecialChar \menuseparator
-Drucken\SpecialChar \ldots{}
-
+Drucken
 \family default
  und dann auf 
 \family sans
@@ -712,12 +697,15 @@ Bearbeiten\SpecialChar \menuseparator
 Rückgängig
 \family default
  oder einen Klick auf 
-\begin_inset Graphics
-	filename ../../images/undo.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "undo"
 \end_inset
 
+
+\family default
  alles, was Sie seit dem Öffnen des Dokumentes verändert haben, zurücknehmen.
  Falls Sie dabei einen oder mehrere Schritte zu viel tun – kein Problem.
  
@@ -726,12 +714,15 @@ Bearbeiten\SpecialChar \menuseparator
 Wiederholen
 \family default
  oder 
-\begin_inset Graphics
-	filename ../../images/redo.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "redo"
 \end_inset
 
+
+\family default
  macht das Rückgängig machen wieder ungeschehen.
 \end_layout
 
@@ -749,17 +740,12 @@ beiten\SpecialChar \menuseparator
 Aus\SpecialChar \-
 schnei\SpecialChar \-
 den (
-\family default
-
-\begin_inset Graphics
-	filename ../../images/cut.png
-	scale 70
-
+\begin_inset Info
+type  "icon"
+arg   "cut"
 \end_inset
 
-
-\family sans
- ),
+),
 \family default
  
 \family sans
@@ -767,25 +753,31 @@ Bearbeiten\SpecialChar \menuseparator
 Kopieren
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/copy.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "copy"
 \end_inset
 
- ) und 
+
+\family default
+) und 
 \family sans
 Bearbeiten\SpecialChar \menuseparator
 Einfügen
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/paste.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "paste"
 \end_inset
 
- ), um markierten Text zu bearbeiten.
+
+\family default
+), um markierten Text zu bearbeiten.
  Zum Einfügen können Sie auch die 
 \emph on
 mittlere
@@ -805,16 +797,18 @@ Suchen
 \begin_inset space ~
 \end_inset
 
-Ersetzen\SpecialChar \ldots{}
-
+Ersetzen
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/dialog-show_findreplace.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"
 \end_inset
 
+
+\family default
 ) gelangen Sie in einen Dialog, in dem Sie Begriffe (wahlweise unter Berücksicht
 igung von Groß/Klein\SpecialChar \-
 schreibung sowie als ganzes Wort) suchen und ersetzen
@@ -832,12 +826,15 @@ Bearbeiten
 Textstil
 \family default
  oder einen Klick auf 
-\begin_inset Graphics
-	filename ../../images/dialog-show_character.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
 \end_inset
 
+
+\family default
  können Sie Text 
 \emph on
 hervorheben
@@ -1655,12 +1652,15 @@ Eingabe
 Auflistung
 \family default
  aus dem Auswahlmenü (
-\begin_inset Graphics
-	filename ../../images/layout_Itemize.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "layout Itemize"
 \end_inset
 
+
+\family default
 ).
  LyX schreibt jetzt einen Aufzählungspunkt an den Anfang der Zeile.
  Zählen Sie nun die Gründe auf:
@@ -1730,12 +1730,15 @@ LyX wird es Ihnen nicht ermöglichen, den Stern vor dem ersten Listenelement
 Aufzählung
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/layout_Enumerate.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "layout Enumerate"
 \end_inset
 
+
+\family default
 ), fertig.
  Wie bereits erwähnt wird LyX auch automatisch die Nummerierung anpassen,
  wenn Sie einzelne Einträge aus der Liste entfernen oder hinzufügen.
@@ -1749,9 +1752,29 @@ Beschreibung
 \family default
  oder 
 \family sans
-Liste
+Liste 
 \family default
-, konvertieren, dann sehen Sie sofort, wie diese aussehen.
+(
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Description"
+\end_inset
+
+
+\family default
+ und 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout List"
+\end_inset
+
+
+\family default
+), konvertieren, dann sehen Sie sofort, wie diese aussehen.
  Bei diesen beiden Typen bestehen die Listen aus einem Begriff (dem ersten
  Wort im Absatz) und einer Definition, die den Rest des Absatzes (bis zum
  nächsten 
@@ -2273,7 +2296,6 @@ letter
 Dokument\SpecialChar \menuseparator
 Einstellungen
 \family default
-\SpecialChar \ldots{}
 \SpecialChar \menuseparator
 
 \family sans
@@ -2327,7 +2349,7 @@ von
 
 Vorlage
 \family default
-\SpecialChar \ldots{}
+.
  Nachdem Sie einen Namen für Ihren Brief eingegeben haben, wählen Sie den
  Eintrag 
 \family typewriter
@@ -2532,19 +2554,12 @@ Was das Tutorium ist\SpecialChar \ldots{}
  Sie dann das Menü 
 \family sans
 Einfügen\SpecialChar \menuseparator
-Marke\SpecialChar \ldots{}
- (
-\family default
-
-\begin_inset Graphics
-	filename ../../images/label-insert.png
-	scale 70
-	scaleBeforeRotation
-
+Marke (
+\begin_inset Info
+type  "icon"
+arg   "label-insert"
 \end_inset
 
-
-\family sans
 ).
 \begin_inset Foot
 status collapsed
@@ -2661,22 +2676,15 @@ vor dem Punkt befinden) den Menüpunkt
 Einfügen\SpecialChar \menuseparator
 Querverweis
 \family default
-\SpecialChar \ldots{}
-
+ 
 \family sans
 (
-\family default
-
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_ref.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset ref"
 \end_inset
 
-
-\family sans
- ).
+).
 
 \family default
  Es öffnet sich ein Auswahlfeld, in dem Sie die im aktuellen Text definierten
@@ -2859,13 +2867,16 @@ Einfügen\SpecialChar \menuseparator
 Fußnote
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
- ) einfügen.
+
+\family default
+) einfügen.
  Setzen Sie beispielsweise den Cursor hinter das Wort 
 \emph on
 LyX
@@ -2987,13 +2998,16 @@ Einfügen\SpecialChar \menuseparator
 Randnotiz
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/marginalnote-insert.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "marginalnote-insert"
 \end_inset
 
- ) eingefügt.
+
+\family default
+) eingefügt.
  Eine Randnotiz ist fast wie eine Fußnote, mit den folgenden Unterschieden:
 \end_layout
 
@@ -3102,14 +3116,16 @@ Einfügen\SpecialChar \menuseparator
 Literaturverweis
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_citation.png
-	scale 70
-	scaleBeforeRotation
-
+\family sans
+ 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset citation"
 \end_inset
 
- ).
+
+\family default
+).
  Das Dialogfenster 
 \family sans
 Literaturverweis
@@ -3267,15 +3283,17 @@ führt.
 
 \begin_layout Standard
 Innerhalb von LyX selber wird das Inhaltsverzeichnis in einem Unterfenster
-  angezeigt, wenn Sie auf (
-\begin_inset Graphics
-	filename ../../images/dialog-toggle_toc.png
-	scale 70
-	scaleBeforeRotation
+  angezeigt, wenn Sie auf 
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-toggle toc"
 \end_inset
 
- ) klicken.
+
+\family default
+ klicken.
  Dieses Fenster ist ungemein hilfreich, denn Sie können damit in Ihrem Dokument
  navigieren: Klicken Sie auf ein (Unter)kapitel im Fenster 
 \family sans
@@ -3394,13 +3412,15 @@ Mathematische Ausdrücke werden im Mathematik-Editor geschrieben, auch bekannt
 matik-Modus.
  Um in den Mathematik-Modus zu kommen, müssen Sie nur den blau beschrifteten
  Knopf 
-\begin_inset Graphics
-	filename ../../images/math-mode.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-mode"
 \end_inset
 
+
+\family default
  in der Werkzeugleiste anklicken.
  LyX öffnet dann ein kleines blaues Rechteck, welches an den Ecken purpurrot
  umrahmt wird.
@@ -3548,13 +3568,15 @@ Bearbeiten\SpecialChar \menuseparator
 Rückgängig
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/undo.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "undo"
 \end_inset
 
+
+\family default
  ) funktioniert auch im Mathematik-Modus, ebenso wie 
 \family sans
 Ausschneiden
@@ -3580,12 +3602,15 @@ Bearbeiten\SpecialChar \menuseparator
 Rückgängig
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/undo.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "undo"
 \end_inset
 
+
+\family default
  ) zurückholen.
 \end_layout
 
@@ -3855,13 +3880,15 @@ Werkzeugleisten\SpecialChar \menuseparator
 Mathe
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/toolbar-toggle_math.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle math"
 \end_inset
 
+
+\family default
 ) eingeblendet werden.
  Wenn nun im Menü 
 \family sans
@@ -3875,15 +3902,7 @@ Mathe
 \begin_inset Quotes grd
 \end_inset
 
- (
-\begin_inset Graphics
-	filename ../../images/toolbar-toggle_math.png
-	scale 70
-	scaleBeforeRotation
-
-\end_inset
-
-) geklickt wird, wird die Werkzeugleiste nur angezeigt, wenn sich der Cursor
+ geklickt wird, wird die Werkzeugleiste nur angezeigt, wenn sich der Cursor
  in einer Formel befindet; diese Einstellung wird durch die Umbenennung
  des Menüeintrags von 
 \begin_inset Quotes gld
@@ -3930,13 +3949,15 @@ Quadratwurzeln, Akzente und Klammern
 
 \begin_layout Standard
 Wenn Sie auf den Schalter 
-\begin_inset Graphics
-	filename ../../images/math/sqrt.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\sqrt"
 \end_inset
 
+
+\family default
  klicken, erhalten Sie eine Quadratwurzel.
  Der Cursor wird automatisch unter das Wurzelzeichen gesetzt (zunächst sehen
  Sie dort das blaue Quadrat als Platzhalter), hier können Sie den Radikanden
@@ -3960,13 +3981,15 @@ Eine Variable (
 ) zum Beispiel mit einem Pfeil zu versehen, wird genauso gemacht.
  Wenn der Cursor in einem mathematischen Ausdruck steht, klicken Sie auf
  den Schalknopf 
-\begin_inset Graphics
-	filename ../../images/math/hat.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\hat"
 \end_inset
 
+
+\family default
  und wählen ein Symbol aus.
  Wenn Sie einen Ausdruck nachträglich verzieren wollen, müssen Sie ihn vorher
  markieren.
@@ -3981,13 +4004,15 @@ Gruppensymbole wie Trennungsstriche, Klammern und Pfeile werden ähnlich,
  jedoch etwas komplizierter gehandhabt.
  Hierzu ist der Knopf mit dem blauen Rechteck, umgeben von rechteckigen
  Klammern (
-\begin_inset Graphics
-	filename ../../images/dialog-show_mathdelimiter.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathdelimiter"
 \end_inset
 
+
+\family default
 ), anzuklicken.
  In dem Dialogfenster 
 \family sans
@@ -4074,18 +4099,16 @@ Brüche sind mit dem Mathematik-Editor einfach.
 \family sans
 Brüche
 \family default
--Schalter 
-\begin_inset Graphics
-	filename ../../images/math/frac-square.png
-	scale 70
-	scaleBeforeRotation
+-Knopf 
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac-square"
 \end_inset
 
 
-\begin_inset space ~
-\end_inset
-
+\family default
  im Fenster 
 \family sans
 Mathe
@@ -4123,13 +4146,15 @@ Kontrollfläche
  Natürlich können Sie auch beliebige andere Ausdrücke in die zwei Quadrate
  schreiben: Variablen mit Exponenten, Quadratwurzeln, andere Brüche, usw.
  Wenn Sie nur einen Standardbruch benötigen, können Sie auch auf 
-\begin_inset Graphics
-	filename ../../images/math/frac.png
-	scale 50
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac"
 \end_inset
 
+
+\family default
  in der 
 \family sans
 Mathe
@@ -4237,23 +4262,25 @@ x
 \end_layout
 
 \begin_layout Standard
-Wählen Sie dazu im Kasten 
+Klicken Sie dazu auf den Werkzeugleistenknopf 
 \family sans
-Funktionen
-\family default
- im Dialogfeld 
-\family sans
-Mathe
-\begin_inset space ~
+
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\functions"
 \end_inset
 
-Kontrollfläche
+
 \family default
- den Eintrag 
-\emph on
+ und dann auf 
+\begin_inset Quotes gld
+\end_inset
+
 sin
-\emph default
- aus.
+\begin_inset Quotes grd
+\end_inset
+
+.
  Das Wort 
 \emph on
 sin
@@ -4349,14 +4376,16 @@ name "sub:Matrizen"
 \end_layout
 
 \begin_layout Standard
-Um eine Matrix zu erstellen, klicken Sie auf den Schalter 
-\begin_inset Graphics
-	filename ../../images/math-matrix.png
-	scale 70
-	scaleBeforeRotation
+Um eine Matrix zu erstellen, klicken Sie auf den Knopf 
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathmatrix"
 \end_inset
 
+
+\family default
  in der 
 \family sans
 Mathe-Werkzeugleiste
@@ -4372,11 +4401,6 @@ Mathe-Werkzeugleiste
  Wie gewohnt können Sie an diesen Stellen jede Art von mathematischen Ausdrücken
  einfügen, wie etwa Wurzeln, Brüche oder sogar weitere Matrizen.
  Sie können auch einzelne Felder ganz leer lassen.
-\begin_inset Formula $\begin{array}{ccccc}
-\end{array}$
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -4415,37 +4439,45 @@ Zeilen
 Spalten
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/tabular-feature_append-row.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-row"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_delete-row.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-row"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_append-column.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-column"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_delete-column.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-column"
 \end_inset
 
+
+\family default
 ) tun (sie werden unter/rechts von der aktuellen Cursorposition eingefügt);
  ebenso können überzählige entfernt werden.
 \end_layout
@@ -4486,23 +4518,6 @@ inline-Formeln
 abgesetzte Formeln
 \emph default
  schreiben.
- Außerdem können auch nur abgesetzte Ausdrücke benannt und nummeriert werden
- (siehe 
-\emph on
-Benutzerhandbuch
-\emph default
-) oder mehrzeilige Gleichungen enthalten (siehe Kapitel
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand vref
-reference "sec:Gleichungssysteme"
-
-\end_inset
-
-).
 \end_layout
 
 \begin_layout Standard
@@ -4511,12 +4526,15 @@ Klicken Sie auf den
 Anzeige
 \family default
 -Schalter 
-\begin_inset Graphics
-	filename ../../images/math/equation.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-display"
 \end_inset
 
+
+\family default
  in der unteren 
 \family sans
 Mathe
@@ -4625,309 +4643,6 @@ f(x)=\left\{ \begin{array}{cc}
 
 \end_layout
 
-\begin_layout Section
-Mehrzeilige Gleichungen
-\begin_inset CommandInset label
-LatexCommand label
-name "sec:Gleichungssysteme"
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Versuchen Sie doch einmal, zwei zusammengehörende Gleichungen wie die folgenden
- zu schreiben, und sehen Sie sich das Ergebnis in der 
-\family typewriter
-DVI
-\family default
--Vorschau an.
- Sie werden dazu zwei getrennte Formeln im abgesetzten Modus schreiben müssen.
-\end_layout
-
-\begin_layout Standard
-\begin_inset Formula 
-\[
-x=y+y+y+y+y
-\]
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Formula 
-\[
-=5y
-\]
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Das Ergebnis sieht überhaupt nicht gut aus! Wenn man zwei oder mehrere Gleichung
-en erfolgreich setzen möchte, dann sieht es viel besser aus, wenn die Gleichheit
-szeichen untereinander stehen; dies ist besonders wichtig, wenn in der zweiten
- Gleichung keine linke Seite vorhanden ist.
- LyX ermöglicht das Schreiben von mehrzeilige Gleichungen mit einigen Kontrollmö
-glichkeiten hinsichtlich der Ausrichtung: 
-\begin_inset Formula 
-\begin{eqnarray*}
-x & = & y+y+y+y+y\\
- & = & 5y
-\end{eqnarray*}
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Dies sieht doch 
-\emph on
-viel
-\emph default
- besser aus! Die Gleichheitszeichen stehen untereinander, und es ist viel
- weniger Platz zwischen den Gleichungen.
-\end_layout
-
-\begin_layout Standard
-Um mehrzeilige Gleichungen zu schreiben, müssen Sie eine abgesetzten Formel
- öffnen und 
-\family sans
-Strg+Eingabe
-\family default
- drücken oder den Menüpunkt 
-\family sans
-Einfügen\SpecialChar \menuseparator
-Mathe\SpecialChar \menuseparator
-Eqnarray
-\begin_inset space ~
-\end_inset
-
-Umgebung
-\family default
- wählen.
- LyX zeigt dann zwei Zeilen mit jeweils drei leeren Einfügepunkten an.
- Dies ist eine mehrzeilige Formel mit zwei Zeilen.
- Enttäuscht? Drücken Sie erneut 
-\family sans
-Strg+Eingabe
-\family default
- oder verwenden Sie 
-\family sans
-Bearbeiten\SpecialChar \menuseparator
-Zeilen
-\begin_inset space ~
-\end_inset
-
-&
-\begin_inset space ~
-\end_inset
-
-Spalten\SpecialChar \menuseparator
-Zeile
-\begin_inset space ~
-\end_inset
-
-anfügen,
-\family default
- um eine weitere derartige Zeile zu erzeugen.
- Mit diesem Wissen sollten Sie die obigen, mehrzeiligen Gleichungen reproduziere
-n können.
- Zu beachten ist auch, dass es durchaus erlaubt ist, einen oder mehrere
- Einfügepunkte leer zu lassen.
- Dies kann sowohl bei dem obigen Beispiel als auch bei einer aufgeteilten,
- sehr langen Gleichung sinnvoll sein:
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Wenn Sie sich das Ergebnis ansehen, werden Sie feststellen, dass der Abstand
- nach dem ersten Pluszeichen in der zweiten Zeile zu gering ist.
- Dies ist einer der seltenen Fälle, in denen LaTeX versagt und Sie die Abstände
- von Hand anpassen müssen.
- Mehr dazu im 
-\emph on
-Benutzerhandbuch
-\emph default
-.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Formula 
-\begin{eqnarray*}
-x & = & a+b+c+d\\
- &  & +e+f+g
-\end{eqnarray*}
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-LyX bringt das zweite (zentrale) Feld jeder Reihe in eine Linie, so dass
- man gewöhnlich das Gleichheits- oder Relationszeichen in dieses Feld setzt;
- man kann natürlich auch andere Zeichen dort einsetzen.
- Doch sollten Sie keine mehrzeilige Gleichungen verwenden, um Felder zu
- drucken; hierfür bieten sich Matrizen an (siehe Abschnitt
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand vref
-reference "sub:Matrizen"
-
-\end_inset
-
-).
-\end_layout
-
-\begin_layout Standard
-Wenn Sie weitere Zeilen in Ihrem Gleichungssystem benötigen, drücken Sie
- einfach ein weiteres Mal 
-\family sans
-Strg+Eingabe
-\family default
-, und eine weitere Reihe mit drei Einfügepunkten erscheint.
- Falls sich der Cursor dabei nicht am Ende einer Zeile befand, wird alles,
- was in dieser Zeile hinter dem Cursor stand, in die nächste Zeile verschoben.
- Wenn Sie bereits eine (normale, einteilige) Gleichung geschrieben haben
- und dann an deren Ende 
-\family sans
-Strg+Eingabe
-\family default
- drücken, wird die gesamte Gleichung in das erste Feld gesetzt.
- Positionieren Sie in diesem Fall den Cursor vor das Gleichheitszeichen
- und drücken Sie 
-\family sans
-Strg+Tab
-\family default
-.
- Dadurch wird alles hinter dem Cursor in das nächste Feld verschoben.
- Wiederholen Sie das mit dem Teil nach dem Gleichheitszeichen, um ihn in
- das rechte Feld zu verschieben.
- Versuchen Sie als Übung, die Gleichung 
-\begin_inset Formula $E=mc^{2}$
-\end_inset
-
- in 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Formula 
-\begin{eqnarray*}
-E & = & mc^{2}\\
- & = & mc\times c
-\end{eqnarray*}
-
-\end_inset
-
-umzuschreiben.
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-KDE-Benutzer können diese Übung leider nicht nachvollziehen, da mit 
-\family sans
-Strg+Tab
-\family default
- zwischen den einzelnen KDE-Bildschirmen umgeschaltet wird, es sei denn,
- man definiert 
-\family sans
-Strg+Tab
-\family default
- in KDE um, zum Beispiel
-\family sans
- in
-\family default
- 
-\family sans
-Windows+Tab
-\family default
-.
- In diesem Falle müsste die erste Gleichungsreihe neu geschrieben werden.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Falls Sie überzählige Zeilen angelegt haben, können Sie diese mit 
-\family sans
-Bearbeiten\SpecialChar \menuseparator
-Zeilen
-\begin_inset space ~
-\end_inset
-
-&
-\begin_inset space ~
-\end_inset
-
-Spalten\SpecialChar \menuseparator
-Zeile
-\begin_inset space ~
-\end_inset
-
-löschen
-\family default
- entfernen.
- Alternativ können Sie auch den Cursor an das Ende der vorangehenden Zeile
- positionieren und 
-\family sans
-Strg+K
-\family default
- drücken.
- Dadurch wird der Inhalt der drei Eingabebereiche der folgenden Zeile zusammen
- an die aktuelle Zeile angefügt; ist die nächste Zeile leer, wird sie also
- einfach gelöscht.
- Befindet sich der Cursor nicht am Zeilenende, wird alles bis zum Zeilenende
- gelöscht.
- Die Tastenkombination 
-\family sans
-Strg+K
-\family default
- ist übrigens nicht spezifisch für den Mathematiksatz – dieses Löschen bis
- zum Zeilenende funktioniert in allen Umgebungen.
-\end_layout
-
-\begin_layout Standard
-Und noch ein letzter Hinweis: Zu mehrzeiligen Gleichungen gäbe es noch viel
- zu sagen.
- Insbesondere haben wir hier die vielen Punkte im Menü 
-\family sans
-Einfügen\SpecialChar \menuseparator
-Mathe
-\family default
-, die mit 
-\family sans
-AMS
-\family default
- beginnen, nicht erläutert.
- Die American Mathematical Society war mit einigen Dingen, wie LaTeX mehrzeilige
- Gleichungen behandelt, nicht zufrieden und hat deswegen eine eigene Sammlung
- von Befehlen erstellt, um das besser zu machen.
- Wollen Sie sie verwenden? Dann ziehen Sie bitte das 
-\emph on
-Benutzerhandbuch
-\emph default
- oder die 
-\emph on
-Handbuchergänzungen
-\emph default
- zu Rate.
-\end_layout
-
 \begin_layout Section
 Weitere mathematische Dinge
 \end_layout
@@ -4937,9 +4652,9 @@ Der Mathematik-Editor hat noch viel weiter reichende Fähigkeiten, bislang
  haben Sie nur die Grundlagen kennengelernt.
  Im 
 \emph on
-Benutzerhandbuch
+Mathe
 \emph default
- finden Sie dann Anleitungen zu den folgenden Themenbereichen:
+ Handbuch finden Sie dann Anleitungen zu den folgenden Themenbereichen:
 \end_layout
 
 \begin_layout Itemize
@@ -4966,11 +4681,7 @@ Schreiben von Makros.
 \end_layout
 
 \begin_layout Itemize
-Viele andere Dinge, für die kein Platz in diesem 
-\emph on
-Tutorium
-\emph default
- ist.
+Fast alles, was man mit Mathe machen kann.
 \end_layout
 
 \begin_layout Chapter
@@ -5000,16 +4711,18 @@ LyX unterstützt WYSIWYG-Tabellen.
 Einfügen\SpecialChar \menuseparator
 Ta\SpecialChar \-
 bel\SpecialChar \-
-le\SpecialChar \ldots{}
-
+le
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/tabular-insert.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "tabular-insert"
 \end_inset
 
+
+\family default
 ) legen Sie eine Tabelle an, indem Sie mit der Maus die Größe festlegen..
  Klicken Sie nun mit dem 
 \emph on
@@ -5026,15 +4739,16 @@ Einstellungen
  zu öffnen.
  Hier können umfangreiche Einstellungen einfach vorgenommen werden.
  Wenn Sie auf 
-\begin_inset Graphics
-	filename ../../images/toolbar-toggle_table.png
-	scale 70
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle table"
 \end_inset
 
- klicken, erscheint am unteren Fensterrand eine Werkzeugleiste mit den wichtigst
-en Tabellenbefehlen.
+
+\family default
+ klicken, erscheint die Tabellen-Werkzeugleiste permanent.
 \end_layout
 
 \begin_layout Itemize
@@ -5045,13 +4759,16 @@ Einfügen\SpecialChar \menuseparator
 Grafik
 \family default
  (
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_graphics.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
- ) öffnet eine Dialogbox, in der Sie die Abbildung einfach definieren, skalieren
+
+\family default
+) öffnet eine Dialogbox, in der Sie die Abbildung einfach definieren, skalieren
  und drehen können usw.
 \end_layout
 
@@ -5072,7 +4789,7 @@ Werkzeuge
 \SpecialChar \menuseparator
 
 \family sans
-Einstellungen\SpecialChar \ldots{}
+Einstellungen.
 
 \family default
  Lesen Sie dazu das Dokument 
@@ -5145,8 +4862,7 @@ reference "sub:tex2lyx"
 Mit der Auswahl 
 \family sans
 Werkzeuge\SpecialChar \menuseparator
-Rechtschreibprüfung\SpecialChar \ldots{}
-
+Rechtschreibprüfung
 \family default
  oder 
 \family sans
@@ -5259,12 +4975,15 @@ status collapsed
 X
 \family default
  oder durch Klicken auf 
-\begin_inset Graphics
-	filename ../../images/ert-insert.png
-	scale 70
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "ert-insert"
 \end_inset
 
+
+\family default
  in der zweiten Werkzeugleiste.
  Dadurch wird eine Textbox geöffnet, und alles darin wird direkt an LaTeX
  weitergegeben.
@@ -5524,13 +5243,7 @@ bla.lyx
 bla.tex
 \family default
  im selben Verzeichnis wie die LyX-Datei abgelegt.
- Temporär legt LyX immer eine LaTeX-Version des gerade editierten Dokumentes
- an, wenn Sie eine Datei drucken oder als 
-\family typewriter
-DVI
-\family default
--Datei betrachten.
- Deshalb ist die LaTeX-Generierung von LyX auch sehr ausgereift.
+ 
 \end_layout
 
 \begin_layout Subsection
@@ -5591,7 +5304,6 @@ Dokument
 \family sans
 Einstellungen
 \family default
-\SpecialChar \ldots{}
  
 \family sans
 \SpecialChar \menuseparator
@@ -5622,7 +5334,7 @@ LyX bietet Unterstützung für BibTeX.
  Verwendung in vielen Dokumenten zu unterhalten.
  Um eine solche 
 \family typewriter
-bib
+.bib
 \family default
 -Datei einzubinden, verwenden Sie den Menüpunkt 
 \family sans
@@ -5653,49 +5365,23 @@ X
 
 Literaturverzeichnis
 \family default
-\SpecialChar \ldots{}
+.
  Es öffnet sich ein Dialogfeld.
- (Wenn Sie später Änderungen vornehmen wollen, klicken Sie auf die graue
- Box 
-\begin_inset Quotes gld
-\end_inset
-
-Von BibTeX erstellte Verweise
-\begin_inset Quotes grd
-\end_inset
-
-.) Im Feld 
+ Im Feld 
 \family sans
 Datenbanken
 \family default
- geben Sie den Namen ein, den Sie in den Klammern des LaTeX-Befehls 
+ geben Sie den Namen der 
 \family typewriter
-
-\backslash
-bibliography{}
+.bib
 \family default
- verwenden würden.
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Wie bei normalem LaTeX können auch mehrere Bibliographien, durch Kommas
- ohne Leerzeichen getrennt, angegeben werden.
-\end_layout
-
-\end_inset
-
- In das Feld 
+-Datei ein.
+ Im Feld 
 \family sans
 Stil
 \family default
- gehört der Eintrag für den Befehl 
-\family typewriter
-
-\backslash
-bibliographystyle{}
-\family default
-.
+ können BibTeX-Stildagteien geladen werden, die festlegen wie das Literaturverze
+ichnis formatiert wird.
 \end_layout
 
 \begin_layout Standard
@@ -5704,9 +5390,8 @@ Nun können Sie über den Menüpunkt
 Einfügen\SpecialChar \menuseparator
 Zitat
 \family default
-\SpecialChar \ldots{}
  die in den Datenbanken definierten Referenzen, die im Dialogfeld angezeigt
- werden, verwenden (siehe auch Abschnitt 
+ werden, verwenden (siehe Abschnitt 
 \begin_inset CommandInset ref
 LatexCommand vref
 reference "sec:Literaturverzeichnisse"
@@ -5714,7 +5399,7 @@ reference "sec:Literaturverzeichnisse"
 \end_inset
 
 ).
- LyX kümmert sich darum, dass BibTeX aufgerufen wird.
+ Dieser Dialog zeigt alle in der Datenbank verfügbaren Einträge an.
 \end_layout
 
 \begin_layout Subsection
@@ -5751,16 +5436,5 @@ de LaTeX-Meldung ausgegeben und der Cursor im LyX-Fenster in etwa an die
  So können Sie die meisten Fehler relativ leicht beheben.
 \end_layout
 
-\begin_layout Bibliography
-\labelwidthstring Literaturverzeichnis
-\begin_inset CommandInset bibitem
-LatexCommand bibitem
-key "lyxtutorium"
-
-\end_inset
-
-Das LyX-Tutorium, vom LyX-Team
-\end_layout
-
 \end_body
 \end_document
diff --git a/lib/doc/es/Tutorial.lyx b/lib/doc/es/Tutorial.lyx
index d2e3e8e092..cbb0d9608b 100644
--- a/lib/doc/es/Tutorial.lyx
+++ b/lib/doc/es/Tutorial.lyx
@@ -511,42 +511,46 @@ como\SpecialChar \@.
 \end_layout
 
 \begin_layout Itemize
-Ejecuta LaTeX para crear un archivo DVI, con 
+Crear un archivo DVI, con 
 \family sans
 Ver\SpecialChar \menuseparator
-DVI
+Ver
 \family default
  o con el botón 
-\begin_inset Graphics
-	filename ../../images/buffer-view_dvi.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
 \end_inset
 
+
+\family default
  de la barra de herramientas.
- LyX lanzará un programa visor de DVI que abrirá una nueva ventana mostrándote
+ LyX lanzará un programa visor de PDF que abrirá una nueva ventana mostrándote
  el aspecto de tu documento cuando esté impreso.
 \begin_inset Foot
 status collapsed
 
 \begin_layout Plain Layout
-Puedes ahorrar tiempo dejando que el visor de DVI se siga ejecutando en
+Puedes ahorrar tiempo dejando que el visor de PDF se siga ejecutando en
  segundo plano.
  De esta forma, puedes usar 
 \family sans
 Ver\SpecialChar \menuseparator
-Actualizar\SpecialChar \menuseparator
-DVI
+Actualizar
 \family default
  o el botón 
-\begin_inset Graphics
-	filename ../../images/buffer-update_dvi.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
 \end_inset
 
- y simplemente pulsar sobre la ventana del visor (o restaurarla) cuando
- LaTeX termine de ejecutarse.
+
+\family default
+ y simplemente pulsar sobre la ventana del visor (o restaurarla) después.
 \end_layout
 
 \end_inset
@@ -596,12 +600,15 @@ Editar\SpecialChar \menuseparator
 Deshacer
 \family default
  (icono 
-\begin_inset Graphics
-	filename ../../images/undo.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "undo"
 \end_inset
 
+
+\family default
 )
 \family sans
 .
@@ -613,12 +620,15 @@ Editar\SpecialChar \menuseparator
 Rehacer
 \family default
  (icono 
-\begin_inset Graphics
-	filename ../../images/redo.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "redo"
 \end_inset
 
+
+\family default
 )
 \family sans
  
@@ -642,36 +652,45 @@ Editar\SpecialChar \menuseparator
 Cortar
 \family default
  (icono 
-\begin_inset Graphics
-	filename ../../images/cut.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "cut"
 \end_inset
 
+
+\family default
 ), 
 \family sans
 Editar\SpecialChar \menuseparator
 Copiar
 \family default
  (icono 
-\begin_inset Graphics
-	filename ../../images/copy.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "copy"
 \end_inset
 
+
+\family default
 ), y 
 \family sans
 Editar\SpecialChar \menuseparator
  Pegar
 \family default
  (icono 
-\begin_inset Graphics
-	filename ../../images/paste.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "paste"
 \end_inset
 
+
+\family default
 ) para cortar, copiar y pegar.
  O pega automáticamente el texto seleccionado (incluyendo selecciones de
  otros programas) con el botón central del ratón.
@@ -692,12 +711,15 @@ y
 Reemplazar
 \family default
  (icono 
-\begin_inset Graphics
-	filename ../../images/dialog-show_findreplace.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"
 \end_inset
 
+
+\family default
 ) para realizar una búsqueda.
  En el menú que se despliega a tal efecto, puedes desplazarte hacia delante
  y hacia atrás en la búsqueda mediante las flechas, y reemplazar aquellas
@@ -765,12 +787,15 @@ del
 texto
 \family default
  (botón 
-\begin_inset Graphics
-	filename ../../images/dialog-show_character.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
 \end_inset
 
+
+\family default
 ).
 \end_layout
 
@@ -1385,7 +1410,17 @@ Enumeración*
 \family sans
 Entorno
 \family default
-s.
+s (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Itemize"
+\end_inset
+
+
+\family default
+).
  LyX pondrá una marca en la línea.
  Escribe tus razones:
 \end_layout
@@ -1466,7 +1501,17 @@ LyX no te dejará seleccionar el primer bolo a menos que selecciones el párrafo
 \family sans
 Enumeración
 \family default
- en el menú.
+ en el menú (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Enumerate"
+\end_inset
+
+
+\family default
+).
  ¡Increíble! Como ya dijimos, si añades o borras un elemento de la lista,
  LyX corrige la numeración.
 \end_layout
@@ -1481,7 +1526,27 @@ Descripción
 \family sans
 List
 \family default
-a, para ver cómo son.
+a (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Description"
+\end_inset
+
+
+\family default
+ y 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout List"
+\end_inset
+
+
+\family default
+), para ver cómo son.
  Para ambos, cada elemento de la lista está compuesto por un término, que
  es la primera palabra del elemento, seguido de una definición, que es el
  resto del párrafo (hasta que pulses 
@@ -2227,13 +2292,15 @@ Insertar\SpecialChar \menuseparator
 Etiqueta
 \family default
  o pulsa el icono 
-\begin_inset Graphics
-	filename ../../images/label-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "label-insert"
 \end_inset
 
+
+\family default
 .
  Se desplegará una ventana de diálogo preguntándote el nombre de la etiqueta,
  y ofreciéndote una sugerencia.
@@ -2295,13 +2362,15 @@ Insertar\SpecialChar \menuseparator
 Referencia cruzada
 \family default
  o pulsa el icono 
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_ref.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset ref"
 \end_inset
 
+
+\family default
 .
  Aparecerá una ventana de diálogo que muestra una lista de etiquetas posibles
  a las que puedes hacer referencia.
@@ -2569,13 +2638,15 @@ Notas a pie de página y notas al margen
 
 \begin_layout Standard
 Las notas a pie de página se pueden añadir usando el botón 
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
  de la barra de herramientas o bien accediendo en el menú a 
 \family sans
 Insertar\SpecialChar \menuseparator
@@ -2599,13 +2670,15 @@ LyX
 \end_inset
 
  en cualquier parte de tu documento y pulsa el botón 
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
 .
  Se mostrará un cuadro con la etiqueta 
 \begin_inset Quotes fld
@@ -2689,13 +2762,15 @@ Pegar
 lo.
  Además, puedes convertir texto normal en una nota, basta que lo selecciones
  y pulses el botón 
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
 ; convierte una nota en texto normal pulsando la tecla 
 \family sans
 Retroceso 
@@ -2710,13 +2785,15 @@ cuando el cursor está en la última posición de la nota al pie, respectivament
 
 \begin_layout Standard
 Las notas al margen se pueden añadir mediante el botón 
-\begin_inset Graphics
-	filename ../../images/marginalnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "marginalnote-insert"
 \end_inset
 
+
+\family default
  o bien el menú 
 \family sans
 Insertar\SpecialChar \menuseparator
@@ -2861,13 +2938,15 @@ Insertar\SpecialChar \menuseparator
 Cita
 \family default
  o con el botón 
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_citation.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset citation"
 \end_inset
 
+
+\family default
 .
  Aparecerá la ventana 
 \family sans
@@ -3132,23 +3211,21 @@ Ahora la ecuación no tiene muy buen aspecto en LyX ni en la salida; no hay
  como un verdadero exponente.
  Esta composición tan mala se debe a que no le hemos dicho a LyX que estamos
  escribiendo una expresión matemática, así que la compone como texto normal.
-\begin_inset Formula $ $
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
 Las expresiones matemáticas se escriben en modo matemático o de ecuaciones.
  Para entrar en dicho modo, sólo tienes que pinchar el botón de la barra
  de herramientas 
-\begin_inset Graphics
-	filename ../../images/math-mode.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-mode"
 \end_inset
 
+
+\family default
  o usar el menú 
 \family sans
 Insertar\SpecialChar \menuseparator
@@ -3581,8 +3658,18 @@ Ecuaciones
 \begin_inset Quotes frd
 \end_inset
 
- la barra de herramientas se mostrará permanentemente en la parte inferior
- de la ventana; este estado se visualiza en el menú con una marca.
+ la barra de herramientas (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle math"
+\end_inset
+
+
+\family default
+) se mostrará permanentemente en la parte inferior de la ventana; este estado
+ se visualiza en el menú con una marca.
  Si en ese estado vuelves a pulsar 
 \begin_inset Quotes fld
 \end_inset
@@ -3692,13 +3779,15 @@ Raíces cuadradas, tildes y delimitadores
 
 \begin_layout Standard
 Para escribir una raíz cuadrada sólo tienes que pulsar el botón 
-\begin_inset Graphics
-	filename ../../images/math/sqrt.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\sqrt"
 \end_inset
 
+
+\family default
 .
  La raíz aparece, y el cursor va a un nuevo punto de inserción dentro de
  ella.
@@ -3719,13 +3808,15 @@ La colocación de tildes en una letra (
 
 ) se realiza de la misma forma.
  Las decoraciones están disponibles en el botón 
-\begin_inset Graphics
-	filename ../../images/math/hat.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\hat"
 \end_inset
 
+
+\family default
  de la barra de herramientas.
  Pincha en una de las decoraciones, y LyX la imprimirá con un punto de inserción
  debajo (o encima).
@@ -3738,13 +3829,15 @@ La colocación de tildes en una letra (
 Los delimitadores (como paréntesis, corchetes y llaves) funcionan de forma
  similar, pero son un poco más complicados.
  Pulsa el botón 
-\begin_inset Graphics
-	filename ../../images/dialog-show_mathdelimiter.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathdelimiter"
 \end_inset
 
+
+\family default
  para abrir la ventana 
 \family sans
 Delimitador
@@ -3835,14 +3928,25 @@ Fracciones
 
 \begin_layout Standard
 Para crear una fracción pica el botón 
-\begin_inset Graphics
-	filename ../../images/math/frac.png
-	lyxscale 75
-	scale 60
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac"
 \end_inset
 
+
+\family default
+ o 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac-square"
+\end_inset
+
+
+\family default
  en la 
 \family sans
 Barra
@@ -3989,13 +4093,15 @@ Espacio
 
 \begin_layout Standard
 Pulsando el botón 
-\begin_inset Graphics
-	filename ../../images/math/functions.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\functions"
 \end_inset
 
+
+\family default
  de la 
 \family sans
 Barra
@@ -4044,14 +4150,10 @@ x
 \end_inset
 
 , que aparecerá en cursiva azul, como es habitual en una ecuación.
- En
-\begin_inset Formula $ $
-\end_inset
-
- la salida, la expresión se imprimirá correctamente.
+ En la salida, la expresión se imprimirá correctamente.
  Inténtalo.
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -4072,12 +4174,15 @@ babel
 \series default
  permite escribir esta función en español.
  Para ello, dentro de la ecuación, pulsa el botón 
-\begin_inset Graphics
-	filename ../../images/ert-insert.png
-	scale 50
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "ert-insert"
 \end_inset
 
+
+\family default
  y escribe 
 \begin_inset Quotes fld
 \end_inset
@@ -4171,13 +4276,15 @@ Matrices
 
 \begin_layout Standard
 Pulsa en el botón 
-\begin_inset Graphics
-	filename ../../images/dialog-show_mathmatrix.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathmatrix"
 \end_inset
 
+
+\family default
  en la 
 \family sans
 Barra
@@ -4253,37 +4360,45 @@ y
 columnas
 \family default
  o los botones de la barra de herramientas de cuadros 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_append-row.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-row"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_delete-row.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-row"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_append-column.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-column"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_delete-column.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-column"
 \end_inset
 
+
+\family default
 .
 \end_layout
 
@@ -4321,13 +4436,15 @@ Guía del usuario
 
 \begin_layout Standard
 Pincha en el botón 
-\begin_inset Graphics
-	filename ../../images/math-display.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-display"
 \end_inset
 
+
+\family default
  de la 
 \family sans
 Barra
@@ -4459,8 +4576,11 @@ Más cosas sobre matemáticas
 El modo matemático puede hacer muchas cosas más.
  Por ahora te has familiarizado con lo básico, así que dirígete a la 
 \emph on
-Guía del usuario
+\lang english
+Math
 \emph default
+ manual
+\lang spanish
  si quieres buscar trucos para:
 \end_layout
 
@@ -4493,12 +4613,9 @@ Escribir macros.
 \end_layout
 
 \begin_layout Itemize
-Hacer un montón de cosas más que no tenemos espacio para contarte en este
- 
-\emph on
-Tutorial
-\emph default
-.
+
+\lang english
+Almost all you can do with math.
 \end_layout
 
 \begin_layout Chapter
@@ -4533,13 +4650,15 @@ Insertar\SpecialChar \menuseparator
 Cuadro/Tabla
 \family default
  (botón 
-\begin_inset Graphics
-	filename ../../images/tabular-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "tabular-insert"
 \end_inset
 
+
+\family default
 ) para crear uno.
  Pincha en el cuadro con el 
 \emph on
@@ -4554,6 +4673,21 @@ Editar
 cuadro
 \family default
 , que te ofrece extensas posibilidades de edición del cuadro.
+ 
+\lang english
+By pressing 
+\family sans
+\lang spanish
+
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle table"
+\end_inset
+
+
+\family default
+\lang english
+ the table toolbar will appear permanently.
 \end_layout
 
 \begin_layout Itemize
@@ -4564,13 +4698,15 @@ Insertar\SpecialChar \menuseparator
 Imagen
 \family default
  (botón 
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_graphics.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
+
+\family default
 )\SpecialChar \@.
  Después pincha en la figura para elegir el archivo que quieres incluir,
  rotarla, escalarla, etc.
@@ -4727,13 +4863,15 @@ Código
 TeX
 \family default
  o pinchando en el botón 
-\begin_inset Graphics
-	filename ../../images/ert-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "ert-insert"
 \end_inset
 
+
+\family default
  de la barra de herramientas.
  Esto genera un cuadro cuyo contenido es pasado directamente a LaTeX.
 \end_layout
@@ -4978,8 +5116,6 @@ cualquiera.tex
 cualquiera.lyx
 \family default
  que estés editando.
- LyX siempre genera archivos temporales LaTeX cuando visualiza o imprime
- los documentos.
 \end_layout
 
 \begin_layout Subsection
@@ -5117,7 +5253,6 @@ reference "sec:Bibliografía"
 \end_inset
 
 ).
- El programa se preocupará de ejecutar BibTeX.
  El diálogo 
 \family sans
 Cita
diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx
index a02cc2ab28..78cd609212 100644
--- a/lib/doc/fr/Tutorial.lyx
+++ b/lib/doc/fr/Tutorial.lyx
@@ -661,26 +661,29 @@ Sous\SpecialChar \ldots{}
 \end_layout
 
 \begin_layout Itemize
-Lancez LaTeX pour générer un fichier DVI, avec 
+Générer un fichier PDF avec 
 \family sans
 Visualiser\SpecialChar \menuseparator
-DVI
+Visualiser
 \family default
  ou avec le bouton 
-\begin_inset Graphics
-	filename ../../images/buffer-view_dvi.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
 \end_inset
 
+
+\family default
  de la barre d'outils\SpecialChar \@.
- LyX lancera une visionneuse DVI qui affichera l'aspect
+ LyX lancera une visionneuse PDF qui affichera l'aspect
  de votre document une fois imprimé.
 \begin_inset Foot
 status collapsed
 
 \begin_layout Plain Layout
-Vous pouvez gagner du temps en laissant tourner la visionneuse DVI en tâche
+Vous pouvez gagner du temps en laissant tourner la visionneuse PDF en tâche
  de fond.
  Vous pourrez alors utiliser 
 \family sans
@@ -693,17 +696,19 @@ Mise
 \begin_inset space ~
 \end_inset
 
-Jour\SpecialChar \menuseparator
-DVI
+Jour
 \family default
  ou le bouton 
-\begin_inset Graphics
-	filename ../../images/buffer-update_dvi.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
 \end_inset
 
- et simplement cliquer sur la fenêtre de la visionneuse DVI (ou la 
+
+\family default
+ et simplement cliquer sur la fenêtre de la visionneuse PDF (ou la 
 \begin_inset Quotes fld
 \end_inset
 
@@ -711,7 +716,7 @@ désiconifier
 \begin_inset Quotes frd
 \end_inset
 
-), pour la rafraîchir une fois que LaTeX aura cessé de travailler .
+) ensuite.
 \end_layout
 
 \end_inset
@@ -771,12 +776,15 @@ annuler
 Annuler
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/undo.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "undo"
 \end_inset
 
+
+\family default
  de la barre d'outils) de façon répétitive.
  Si vous annulez trop de fois, faites juste 
 \family sans
@@ -784,12 +792,15 @@ Annuler
 Refaire
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/redo.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "redo"
 \end_inset
 
+
+\family default
 )pour restituer les modifications annulées.
  
 \end_layout
@@ -808,36 +819,45 @@ Couper/Copier/Coller Vous pouvez utiliser
 Couper
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/cut.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "cut"
 \end_inset
 
+
+\family default
 ), 
 \family sans
 Éditer\SpecialChar \menuseparator
 Copier
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/copy.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "copy"
 \end_inset
 
+
+\family default
 ), et 
 \family sans
 Éditer\SpecialChar \menuseparator
 Coller
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/paste.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "paste"
 \end_inset
 
+
+\family default
 ) pour couper, copier et coller.
  Ou bien avec le 
 \shape italic
@@ -866,12 +886,15 @@ et
 Remplacer
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/dialog-show_findreplace.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"
 \end_inset
 
+
+\family default
 ) pour effectuer une recherche.
  Dans la fenêtre, lancez la recherche avec le bouton 
 \family sans
@@ -923,7 +946,7 @@ caractères gras
 Style Nom propre
 \noun default
  (généralement en petites capitales, utilisées pour les noms de personnes)
- à partir des listes déroulantes du  menu 
+ à partir des listes déroulantes du menu 
 \family sans
 Éditer\SpecialChar \menuseparator
 Style
@@ -937,12 +960,15 @@ de
 texte
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/dialog-show_character.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
 \end_inset
 
+
+\family default
  de la barre d'outils).
 \end_layout
 
@@ -1680,7 +1706,17 @@ ListePuces
 \family sans
 Environnement
 \family default
-.
+ (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Itemize"
+\end_inset
+
+
+\family default
+).
  LyX affiche une 
 \begin_inset Quotes fld
 \end_inset
@@ -1787,7 +1823,17 @@ précédant
 \family sans
 Environnement
 \family default
-.
+ (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Enumerate"
+\end_inset
+
+
+\family default
+).
  Et pan ! Comme nous l'avons déjà dit, si vous ajoutez ou retirez un élément
  dans la liste, LyX corrigera la numérotation.
 \end_layout
@@ -1802,7 +1848,27 @@ Description
 \family sans
 Liste
 \family default
-, pour voir à quoi ils ressemblent.
+ (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Description"
+\end_inset
+
+
+\family default
+ et 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout List"
+\end_inset
+
+
+\family default
+), pour voir à quoi ils ressemblent.
  Pour ces deux derniers, chaque élément de la liste comporte un terme, qui
  est le premier mot de l'élément, et sa définition, le reste du paragraphe
  (jusqu'au retour
@@ -2685,13 +2751,15 @@ Insérer\SpecialChar \menuseparator
 Étiquette
 \family default
  ou cliquez sur le bouton 
-\begin_inset Graphics
-	filename ../../images/label-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "label-insert"
 \end_inset
 
+
+\family default
  de la barre d'outils.
  Une fenêtre vous demande le nom de l'étiquette, et vous en suggère un.
  Quand vous validez en cliquant sur 
@@ -2758,15 +2826,13 @@ Référence
 Croisée 
 \family default
 ou utilisez le bouton 
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_ref.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset ref"
 \end_inset
 
-
-\family sans
  
 \family default
 de la barre d'outils
@@ -3114,15 +3180,13 @@ Notes de marge et de bas de page
 
 \begin_layout Standard
 Les notes de bas de page peuvent être ajoutées grâce au bouton 
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
-
-\family sans
 ,
 \family default
  dans la barre d'outils ou par menu 
@@ -3156,13 +3220,15 @@ LyX
 \end_inset
 
  dans votre document et appuyez sur le bouton 
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
 .
  Une boîte de note apparaît dans laquelle vous pouvez saisir le texte de
  la note.
@@ -3245,13 +3311,15 @@ Coller
 .
  De plus, vous pouvez faire basculer du texte ordinaire en note, en le sélection
 nant, puis en cliquant sur le bouton 
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
  ; ou inversement transformer une note en texte en appuyant sur la touche
  
 \family sans
@@ -3273,13 +3341,15 @@ Suppr.
 
 \begin_layout Standard
 Les notes en marge peuvent quant à elles être ajoutées grâce au bouton 
-\begin_inset Graphics
-	filename ../../images/marginalnote-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "marginalnote-insert"
 \end_inset
 
+
+\family default
  de la barre d'outils, ou par le menu 
 \family sans
 Insérer\SpecialChar \menuseparator
@@ -3434,13 +3504,15 @@ Insérer\SpecialChar \menuseparator
 Citation
 \family default
  ou le bouton 
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_citation.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset citation"
 \end_inset
 
+
+\family default
  de la barre d'outils, vous faites apparaître une fenêtre 
 \family sans
 Citation
@@ -4202,8 +4274,18 @@ d'outils
 \family sans
 Math 
 \family default
-la barre d'outils sera affichée de façon permanente ; cet état est indiqué
- dans le menu 
+la barre d'outils (
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle math"
+\end_inset
+
+
+\family default
+) sera affichée de façon permanente ; cet état est indiqué dans le menu
+ 
 \family sans
 Barres
 \begin_inset space ~
@@ -4273,13 +4355,15 @@ Racines carrées, accents, et délimiteurs
 
 \begin_layout Standard
 Pour saisir une racine carrée, cliquez simplement sur le bouton 
-\begin_inset Graphics
-	filename ../../images/math/sqrt.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\sqrt"
 \end_inset
 
+
+\family default
 .
  La racine carrée apparaît, et le curseur va à un nouveau point d'insertion
  sous la racine carrée.
@@ -4303,13 +4387,15 @@ Accentuer un caractère (
 Décoration
 \family default
  dans la barre d'outils avec le bouton 
-\begin_inset Graphics
-	filename ../../images/math/hat.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\hat"
 \end_inset
 
+
+\family default
 .
  Cliquez sur une décoration, et LyX affichera ce signe sur ou sous le point
  d'insertion.
@@ -4327,13 +4413,15 @@ Les délimiteurs tels que les parenthèses, les crochets, et les accolades
 Délimiteurs
 \family default
  
-\begin_inset Graphics
-	filename ../../images/dialog-show_mathdelimiter.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathdelimiter"
 \end_inset
 
+
+\family default
 , pour ouvrir la fenêtre de dialogue 
 \family sans
 Délimiteurs.
@@ -4414,14 +4502,25 @@ Pour créer une fraction, cliquez sur le bouton
 Fraction
 \family default
  
-\begin_inset Graphics
-	filename ../../images/math/frac.png
-	lyxscale 75
-	scale 60
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac"
 \end_inset
 
+
+\family default
+ ou 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac-square"
+\end_inset
+
+
+\family default
  dans la 
 \family sans
 Barre d'outils Math
@@ -4557,13 +4656,15 @@ espace
 
 \begin_layout Standard
 Cliquez sur le bouton 
-\begin_inset Graphics
-	filename ../../images/math/functions.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\functions"
 \end_inset
 
+
+\family default
  de la 
 \family sans
 barre d'outils math
@@ -4671,13 +4772,15 @@ Cliquez sur le bouton
 Matrice
 \family default
  
-\begin_inset Graphics
-	filename ../../images/dialog-show_mathmatrix.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathmatrix"
 \end_inset
 
+
+\family default
  de la 
 \family sans
 Barre d'outils math
@@ -4747,37 +4850,45 @@ Ajouter
 Colonne
 \family default
  ou utilisez les boutons 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_append-row.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-row"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_delete-row.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-row"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_append-column.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-column"
 \end_inset
 
+
+\family default
 , 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_delete-column.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-column"
 \end_inset
 
+
+\family default
  de la 
 \family sans
 Barre d'outils math
@@ -4861,13 +4972,15 @@ Hors
 Ligne
 \family default
  
-\begin_inset Graphics
-	filename ../../images/math-display.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-display"
 \end_inset
 
+
+\family default
  de la 
 \family sans
 Barre
@@ -5131,13 +5244,15 @@ Insérer\SpecialChar \menuseparator
 Tableau
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/tabular-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "tabular-insert"
 \end_inset
 
+
+\family default
  de la barre d'outils) pour obtenir un tableau.
 \begin_inset Foot
 status collapsed
@@ -5196,24 +5311,41 @@ du
 Tableau
 \family default
 ) qui permet de régler tous ses paramètres.
+ 
+\lang english
+By pressing 
+\family sans
+\lang french
+
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle table"
+\end_inset
+
+
+\family default
+\lang english
+ the table toolbar will appear permanently.
 \end_layout
 
 \begin_layout Itemize
-LyX permet également d'inclure des images dans n'importe quel format  à
- l'intérieur d'un document.
+LyX permet également d'inclure des images dans n'importe quel format à l'intérie
+ur d'un document.
  (Vous l'avez deviné : 
 \family sans
 Insérer\SpecialChar \menuseparator
 Graphique
 \family default
 , ou bouton 
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_graphics.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
+
+\family default
 \SpecialChar \@.
  Choisissez ensuite le nom du fichier, faites tourner la figure, redimensionnez-
 la, etc.
@@ -5414,13 +5546,15 @@ Code
 TeX
 \family default
  (bouton 
-\begin_inset Graphics
-	filename ../../images/ert-insert.png
-	scale 75
-	scaleBeforeRotation
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "ert-insert"
 \end_inset
 
+
+\family default
  de la barre d'outils).
  Ça crée une boîte, et tout ce que vous y écrivez est transmis tel quel
  à LaTeX.
@@ -5686,8 +5820,6 @@ bidule.tex
 bidule.lyx
 \family default
  que vous êtes en train d'éditer.
- LyX crée un fichier LaTeX temporaire à chaque visionnement ou impression.
- 
 \end_layout
 
 \begin_layout Subsection
@@ -5836,7 +5968,6 @@ reference "sec:bibliographies"
 \end_inset
 
 ).
- LyX s'occupe de lancer BibTeX.
  La boîte de la fenêtre 
 \family sans
 Citation
diff --git a/lib/doc/ja/Tutorial.lyx b/lib/doc/ja/Tutorial.lyx
index 1661af804f..76e2182d40 100644
--- a/lib/doc/ja/Tutorial.lyx
+++ b/lib/doc/ja/Tutorial.lyx
@@ -435,39 +435,44 @@ example
 \SpecialChar \menuseparator
 
 \family sans
-DVI
+表示
 \family default
 を選ぶか、ツールバーで
-\begin_inset Graphics
-	filename ../../images/buffer-view_dvi.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
 \end_inset
 
-を押して、LaTeXを実行させ、DVIファイルを作ります。LyXは、DVIビューアを開いて、印刷したときにあなたの文書がどのように見えるかを表示します
+
+\family default
+を押して、LaTeXを実行させ、PDFファイルを作ります。LyXは、PDFビューアを開いて、印刷したときにあなたの文書がどのように見えるかを表示します。
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Plain Layout
-DVIビューアをバックグラウンドで起動したままにしておけば、時間を節約することができます。
+PDFビューアをバックグラウンドで起動したままにしておけば、時間を節約することができます。
 \family sans
 表示\SpecialChar \menuseparator
-更新\SpecialChar \menuseparator
-DVI
+更新
 \family default
 を選ぶか、ツールバーボタン
-\begin_inset Graphics
-	filename ../../images/buffer-update_dvi.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "buffer-update"
 \end_inset
 
-を押して、LaTeXを走らせた後、単にDVIビューアのウインドウをクリックすれば（あるいは最小化を解除すれば）よいのです。
+
+\family default
+を押して、LaTeXを走らせた後、単にPDFビューアのウインドウをクリックすれば（あるいは最小化を解除すれば）よいのです。
 \end_layout
 
 \end_inset
 
-。 
+ 
 \end_layout
 
 \begin_layout Itemize
@@ -511,12 +516,15 @@ DVI
 元に戻す
 \family default
 を繰り返し選ぶ（あるいはツールバーボタン
-\begin_inset Graphics
-	filename ../../images/undo.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "undo"
 \end_inset
 
+
+\family default
 を繰り返し押す）ことで復元することができるのです。元に戻しすぎてしまったときには、
 \family sans
 編集
@@ -527,12 +535,15 @@ DVI
 やり直す
 \family default
 （あるいはツールバーボタン
-\begin_inset Graphics
-	filename ../../images/redo.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "redo"
 \end_inset
 
+
+\family default
 ）を選択して、新しい方に戻ってください。
 \end_layout
 
@@ -553,12 +564,15 @@ DVI
 切り取り
 \family default
 （あるいはツールバーボタン
-\begin_inset Graphics
-	filename ../../images/cut.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "cut"
 \end_inset
 
+
+\family default
 ）、
 \family sans
 編集
@@ -569,12 +583,15 @@ DVI
 コピー
 \family default
 （あるいはツールバーボタン
-\begin_inset Graphics
-	filename ../../images/copy.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "copy"
 \end_inset
 
+
+\family default
 ）、または
 \family sans
 編集
@@ -585,12 +602,15 @@ DVI
 貼り付け
 \family default
 （あるいはツールバーボタン
-\begin_inset Graphics
-	filename ../../images/paste.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "paste"
 \end_inset
 
+
+\family default
 ）を使ってください。また
 \emph on
 マウスの中ボタン
@@ -609,12 +629,15 @@ DVI
 検索／置換
 \family default
 （あるいはツールバー
-\begin_inset Graphics
-	filename ../../images/dialog-show_findreplace.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show findreplace"
 \end_inset
 
+
+\family default
 ）を選択してください。ダイアログボックスで
 \family sans
 次候補
@@ -646,12 +669,15 @@ status collapsed
 任意設定
 \family default
 ダイアログボックス内にある切替ボタン（あるいはツールバーボタン
-\begin_inset Graphics
-	filename ../../images/dialog-show_character.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show character"
 \end_inset
 
+
+\family default
 ）を使えば、テキストを
 \emph on
 強調
@@ -1064,7 +1090,17 @@ Return
 \family sans
 箇条書き（記号）
 \family default
-を選びます。するとLyXは、行頭に小さな「印」（ブリット）を描画します。以下のように理由を入力してください。
+を選びます(
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Itemize"
+\end_inset
+
+
+\family default
+)。するとLyXは、行頭に小さな「印」（ブリット）を描画します。以下のように理由を入力してください。
 \end_layout
 
 \begin_layout LyX-Code
@@ -1137,7 +1173,17 @@ LyXでは、箇条書きの
 \family sans
 箇条書き（連番）
 \family default
-を選択してください。ほら！一瞬です。前述したように、項目を加えたり削除したりすると、LyXは自動的に連番を更新してくれます。
+を選択してください(
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "layout Enumerate"
+\end_inset
+
+
+\family default
+)。ほら！一瞬です。前述したように、項目を加えたり削除したりすると、LyXは自動的に連番を更新してくれます。
 \end_layout
 
 \begin_layout Standard
@@ -1149,8 +1195,35 @@ LyXでは、箇条書きの
 \family sans
 箇条書き（一覧）
 \family default
-の出力がどのようなものになるかを見るために、この箇条書きが選択された状態のまま、これらの環境に変更してみるとよろしいでしょう。これらの2つの環境では、箇条書きの
-各項目は、最初の単語が用語として表示され、段落の残り（
+の出力がどのようなものになるかを見るために、この箇条書きが選択された状態のまま、これらの環境に変更してみるとよろしいでしょう
+\lang english
+(
+\family sans
+\lang japanese
+
+\begin_inset Info
+type  "icon"
+arg   "layout Description"
+\end_inset
+
+
+\family default
+\lang english
+ and 
+\family sans
+\lang japanese
+
+\begin_inset Info
+type  "icon"
+arg   "layout List"
+\end_inset
+
+
+\family default
+\lang english
+)
+\lang japanese
+。これらの2つの環境では、箇条書きの各項目は、最初の単語が用語として表示され、段落の残り（
 \family sans
 Return
 \family default
@@ -1764,12 +1837,15 @@ status collapsed
 ラベル
 \family default
 を選択するかツールバーボタン
-\begin_inset Graphics
-	filename ../../images/label-insert.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "label-insert"
 \end_inset
 
+
+\family default
 を押してください。ダイアログボックスが、入力候補を表示してラベル名の入力を求めます。OKボタンを押すと、そのラベル名が節見出しの横にボックス表示されます。
 \end_layout
 
@@ -1801,12 +1877,15 @@ status collapsed
 相互参照
 \family default
 かツールバーボタン
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_ref.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset ref"
 \end_inset
 
+
+\family default
 を選択してください。
 \family sans
 相互参照
@@ -1923,12 +2002,15 @@ example_raw.lyx
 
 \begin_layout Standard
 脚注は、ツールバーの
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
 ボタンか
 \family sans
 挿入
@@ -1939,12 +2021,15 @@ example_raw.lyx
 脚注
 \family default
 メニューを使えば、加えることができます。現在の文中にあるLyXという単語のどれでもいいですから、その単語の後ろにカーソルを持っていって、ツールバーの
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
 ボタンを押して下さい。すると脚注ボックスが現れて、脚注の文章が入力できるようになります。カーソルが脚注ボックスの先頭に現れますから、次のように入力してください。
 \end_layout
 
@@ -1977,12 +2062,15 @@ status collapsed
 貼り付け
 \family default
 をしてみてください。また通常の本文を脚注へ変えることもできます。脚注にしたい場所を選択して
-\begin_inset Graphics
-	filename ../../images/footnote-insert.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "footnote-insert"
 \end_inset
 
+
+\family default
 ボタンを押してください。脚注を通常の本文に戻すには、カーソルが脚注の先頭にある時にバックスペースキーを押すか、カーソルが脚注の最後にある時に削除キーを押してくだ
 さい。
 \end_layout
@@ -1998,12 +2086,15 @@ status collapsed
 傍注
 \family default
 を選ぶか、ツールバーの
-\begin_inset Graphics
-	filename ../../images/marginalnote-insert.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "marginalnote-insert"
 \end_inset
 
+
+\family default
 ボタンを押せば追加することができます。傍注は脚注とほとんど同じですが、以下の点が違います。
 \end_layout
 
@@ -2083,12 +2174,15 @@ LyXは各文献の前に四角に囲まれた番号を自動的につけます
 文献引用
 \family default
 を選ぶか、ツールバーボタン
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_citation.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset citation"
 \end_inset
 
+
+\family default
 を押してください。すると、
 \family sans
 文献引用
@@ -2243,12 +2337,15 @@ eXを使ったことのない人でも
 
 \begin_layout Standard
 代わりに、正しく組版されるような数式を作りましょう。数式を作るには、ツールバーボタン
-\begin_inset Graphics
-	filename ../../images/math-mode.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-mode"
 \end_inset
 
+
+\family default
 を押すか、
 \family sans
 挿入\SpecialChar \menuseparator
@@ -2424,7 +2521,17 @@ example_raw.lyx
 表示\SpecialChar \menuseparator
 ツールバー
 \family default
-メニューで手動で有効にすることもできます。上記メニューで「数式」 をクリックすると、ツールバーは底面にずっとされるようになります。この状態にあることは、
+メニューで手動で有効にすることもできます(
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle math"
+\end_inset
+
+
+\family default
+)。上記メニューで「数式」 をクリックすると、ツールバーは底面にずっとされるようになります。この状態にあることは、
 \family sans
 ツールバー
 \family default
@@ -2455,12 +2562,15 @@ example_raw.lyx
 
 \begin_layout Standard
 平方根を入れるには、
-\begin_inset Graphics
-	filename ../../images/math/sqrt.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\sqrt"
 \end_inset
 
+
+\family default
 ボタンを押して下さい。平方根があらわれ、カーソルが平方根の中の新しい挿入ポイントへ移動します。そこへ変数でも数字でも、他の平方根でも、分数でも好きなものを入力で
 きます。LyXは平方根の中に書かれたものに応じて自動的に平方根の大きさを変えてくれます。
 \end_layout
@@ -2475,12 +2585,15 @@ example_raw.lyx
 \end_inset
 
 のようなアクセントを付けることも同様にすることができます。装飾は、ツールバーの
-\begin_inset Graphics
-	filename ../../images/math/hat.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\hat"
 \end_inset
 
+
+\family default
 ボタンから選択できます。装飾を選ぶと、その装飾の上か下に挿入ポイントが出てくるので、その中に装飾を付けたい文字を入力して下さい。装飾には、入力した文字に応じて長
 さの変わる可変長のものと、一文字のみを装飾するのに適した固定長のものの二つの種類があります。
 \end_layout
@@ -2491,12 +2604,15 @@ example_raw.lyx
 区切り記号
 \family default
 ボタン
-\begin_inset Graphics
-	filename ../../images/dialog-show_mathdelimiter.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathdelimiter"
 \end_inset
 
+
+\family default
 を押すと
 \family sans
 、区切り記号
@@ -2543,12 +2659,29 @@ example_raw.lyx
 数式ツールバー
 \family default
 の分数ボタン
-\begin_inset Graphics
-	filename ../../images/math/frac.png
-	scale 60
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac"
 \end_inset
 
+
+\family default
+ 
+\lang english
+or
+\lang japanese
+ 
+\family sans
+
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\frac-square"
+\end_inset
+
+
+\family default
 をクリックしてください。LyXは、二つの挿入ポイントをもつ分数を表示します。多分わかるとは思いますが、矢印キーとマウスで分子と分母の間を移動できます。上の四角を
 クリックして「１」を入力して下さい。下向きの矢印キーで分母に移り、「2」を入れて下さい。分数のできあがりです！もちろん二つの四角のそれぞれには、数字以外のもの、
 すなわち上付き文字のついた変数や平方根、別の分数、その他諸々を入力することができます。
@@ -2601,12 +2734,15 @@ example_raw.lyx
 数式ツールバー
 \family default
 ボタン
-\begin_inset Graphics
-	filename ../../images/math/functions.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-insert \\functions"
 \end_inset
 
+
+\family default
 をクリックし、現れる関数一覧でsinをクリックして下さい。LyX中に、斜字でないローマン体の「sin」という単語が黒で表示されるでしょう。この単語全体が一つの記
 号として取り扱われるので、
 \family sans
@@ -2650,12 +2786,15 @@ example_raw.lyx
 数式ツールバー
 \family default
 から行列ボタン
-\begin_inset Graphics
-	filename ../../images/dialog-show_mathmatrix.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show mathmatrix"
 \end_inset
 
+
+\family default
 を押して下さい。現れるダイアログで、行列の行数と列数を選択することができます。行数を2行、列数を3列にして
 \family sans
 OK
@@ -2680,33 +2819,33 @@ OK
 行と列
 \family default
 メニューか
-\begin_inset Graphics
-	filename ../../images/tabular-feature_append-row.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-row"
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_delete-row.png
-	scale 75
-
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-row"
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_append-column.png
-	scale 75
-
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular append-column"
 \end_inset
 
 
-\begin_inset Graphics
-	filename ../../images/tabular-feature_delete-column.png
-	scale 75
-
+\begin_inset Info
+type  "icon"
+arg   "inset-modify tabular delete-column"
 \end_inset
 
+
+\family default
 ボタンを使ってください。
 \end_layout
 
@@ -2741,12 +2880,15 @@ OK
 別行建て
 \family default
 ボタン
-\begin_inset Graphics
-	filename ../../images/math-display.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "math-display"
 \end_inset
 
+
+\family default
 を押して下さい。こうすると、数式が中央揃えになり、上下に空白行が加えられます。何か数式を入力してファイルをコンパイルし、どのように表示されるかご覧になって下さい
 。
 \family sans
@@ -2911,12 +3053,15 @@ LyXは、表のWYSIWYMサポートをしています。表を作るには、
 表
 \family default
 （あるいはツールバー
-\begin_inset Graphics
-	filename ../../images/tabular-insert.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "tabular-insert"
 \end_inset
 
+
+\family default
 ）を使って下さい。表を
 \emph on
 右マウスボタン
@@ -2926,6 +3071,20 @@ LyXは、表のWYSIWYMサポートをしています。表を作るには、
 表設定
 \family default
 ダイアログボックスが現れるので、そこで表の詳しい編集ができます。
+\lang english
+By pressing 
+\family sans
+\lang japanese
+
+\begin_inset Info
+type  "icon"
+arg   "toolbar-toggle table"
+\end_inset
+
+
+\family default
+\lang english
+ the table toolbar will appear permanently.
 \end_layout
 
 \begin_layout Itemize
@@ -2935,12 +3094,15 @@ LyXは、文書中に任意の形式の図を取り込むことができます
 図
 \family default
 （またはツールバーボタン
-\begin_inset Graphics
-	filename ../../images/dialog-show-new-inset_graphics.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
+
+\family default
 ）を選択します。すると、図ファイルを探したり、図を回転させたり、大きさを変えたりできるようになります）。表や図にはキャプションをつけることができ、LyX
  は自動的に図や表の一覧を生成します。
 \end_layout
@@ -3063,12 +3225,15 @@ TeXモードで入力されたものは、すべて直接LaTeXに渡され、画
 TeXコード
 \family default
 （またはツールバーボタン
-\begin_inset Graphics
-	filename ../../images/ert-insert.png
-	scale 75
+\family sans
 
+\begin_inset Info
+type  "icon"
+arg   "ert-insert"
 \end_inset
 
+
+\family default
 ）を選択すると、LyXの中でTeXコマンドを使うことができます。この操作で生成されたボックスの中に書かれたのものすべては、そのまま LaTeX
  に渡されることになります。
 \end_layout
@@ -3218,7 +3383,7 @@ whatever.lyx
 \family typewriter
 whatever.tex
 \family default
-を生成します。LyXは、プレビューをするときや、印刷をする場合にはいつも一時的なLaTeXファイルをつくります。
+を生成します。
 \end_layout
 
 \begin_layout Subsection
@@ -3317,11 +3482,7 @@ reference "sec:参考文献"
 
 \end_inset
 
-節参照）を使って参照することができるようになります。
-\family typewriter
-BibTeX
-\family default
-の実行は、LyXが行います。また、
+節参照）を使って参照することができるようになります。また、
 \family sans
 文献引用
 \family default
diff --git a/lib/examples/Braille.lyx b/lib/examples/Braille.lyx
index b289e116bd..3f74080744 100644
--- a/lib/examples/Braille.lyx
+++ b/lib/examples/Braille.lyx
@@ -414,8 +414,8 @@ This is Braille.
 \begin_inset VSpace bigskip
 \end_inset
 
-Text can be printed mirrored to be later able to for "print" Braille by
- hand with a needle or another suitable method:
+Text can be printed mirrored for embossing the Braille by hand with a needle
+ or another suitable device:
 \end_layout
 
 \begin_layout Standard
@@ -467,11 +467,11 @@ insets
 \family default
 .
  Every number in this box turns on the corresponding Braille dot.
- For example leads the number
+ For example, the number
 \series bold
  6145
 \series default
- to:
+ results in:
 \begin_inset Newline newline
 \end_inset
 
@@ -504,11 +504,11 @@ brailleeightdotstrue
 \series default
 .
  But the two extra dots are only printed when using a Braille box.
- For example leads the number
+ For example, the number 
 \series bold
- 8175
+8175
 \series default
- in a Braille box leads to:
+ in a Braille box results in:
 \begin_inset Newline newline
 \end_inset