diff --git a/doc/qtcreator/images/qtcreator-parse-build-output.png b/doc/qtcreator/images/qtcreator-parse-build-output.png
index 56d9724ea66..abd84fa04f1 100644
Binary files a/doc/qtcreator/images/qtcreator-parse-build-output.png and b/doc/qtcreator/images/qtcreator-parse-build-output.png differ
diff --git a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
index 261c3406136..ff0fef58ddd 100644
--- a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc
@@ -35,13 +35,8 @@
     \image qtcreator-open-documents-view.png "Open Documents view"
 
     You can use the context menu to apply some of the functions also available
-    in the \uicontrol File menu
-    \if defined(qtcreator)
-    .
-    \else
-    and in the \l {File System Context Menu} {File System} view to the file
-    that is selected in the view.
-    \endif
+    in the \uicontrol File menu and in the \l {File System Context Menu}
+    {File System} view to the file that is selected in the view.
 
     In addition, you can:
 
diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc
index e2f31b0c787..bd23b7e1d00 100644
--- a/doc/qtcreator/src/user-interface/creator-ui.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc
@@ -293,6 +293,7 @@
     style.
     \endif
 
+
     You can use \QC in the following modes:
 
     \list
@@ -487,8 +488,8 @@
 
     The pane filters out irrelevant output from the build tools and presents the
     issues in an organized way. To further filter the output by type, select
-    \uicontrol {Filter Tree}
-    and then select a filter.
+    \inlineimage filtericon.png
+    (\uicontrol {Filter Tree}) and then select a filter.
 
     \image qtcreator-issues.png "Issues output pane"
 
@@ -550,9 +551,10 @@
 
     To specify settings for displaying application output, select
     \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
-    \uicontrol {Application Output}, or click the \uicontrol {Open Settings Page}
-    button. You can select whether to open the \uicontrol{Application Output} pane
-    on output when running or debugging applications, to clear old output on a new run,
+    \uicontrol {Application Output}, or click the \inlineimage settings.png
+    (\uicontrol {Open Settings Page}) button. You can select whether to open
+    the \uicontrol{Application Output} pane on output when running or debugging
+    applications, to clear old output on a new run,
     to word-wrap output, and to limit output to the specified number of lines.
 
     \section1 Compile Output
@@ -575,8 +577,8 @@
     In the \uicontrol {Limit output to} field, you can specify the maximum
     amount of build output lines to display in the pane.
 
-    You can also reach the options page by clicking the \uicontrol {Open Settings Page}
-    button.
+    You can also reach the options page by clicking \inlineimage settings.png
+    (\uicontrol {Open Settings Page}).
 
     To copy the output from the pane to the clipboard, select
     \uicontrol {Select All} in the context menu, and then select
diff --git a/doc/qtcreator/src/user-interface/creator-views.qdoc b/doc/qtcreator/src/user-interface/creator-views.qdoc
index 65d41d0bbf1..ec9466d7c4b 100644
--- a/doc/qtcreator/src/user-interface/creator-views.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-views.qdoc
@@ -97,12 +97,14 @@
 
     \list
         \li To see a complete list of all bindings, select
-            \uicontrol {Filter Tree} > \uicontrol {Show All Bindings}.
+            \inlineimage filtericon.png
+            (\uicontrol {Filter Tree}) > \uicontrol {Show All Bindings}.
         \li To sort types or symbols alphabetically, select
             \inlineimage sort_alphabetically.png
             (\uicontrol {Sort Alphabetically}).
         \li To stop the synchronization with the type or symbol selected in the
-            editor, deselect \uicontrol {Synchronize with Editor}.
+            editor, deselect \inlineimage linkicon.png
+            (\uicontrol {Synchronize with Editor}).
     \endlist
 
     \section1 Viewing the Class Hierarchy
@@ -144,5 +146,6 @@
     \image qtcreator-include-hierarchy-view.png "Include Hierarchy view"
 
     To keep the view synchronized with the file currently opened in the editor,
-    select \uicontrol {Synchronize with Editor}.
+    select \inlineimage linkicon.png
+    (\uicontrol {Synchronize with Editor}).
 */