diff --git a/doc/images/beautifier_options.png b/doc/images/beautifier_options.png
index a6a7767ba84..23152694ae9 100644
Binary files a/doc/images/beautifier_options.png and b/doc/images/beautifier_options.png differ
diff --git a/doc/images/qt-creator-beautifier-options-general.png b/doc/images/qt-creator-beautifier-options-general.png
new file mode 100644
index 00000000000..3f476be156f
Binary files /dev/null and b/doc/images/qt-creator-beautifier-options-general.png differ
diff --git a/doc/src/editors/creator-beautifier.qdoc b/doc/src/editors/creator-beautifier.qdoc
index 76c3d18d219..1ac074ce246 100644
--- a/doc/src/editors/creator-beautifier.qdoc
+++ b/doc/src/editors/creator-beautifier.qdoc
@@ -76,8 +76,26 @@
 
         \li Restart \QC to be able to use the plugin.
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Beautifier
-            to specify settings for the tool you want to use.
+        \li Select \uicontrol Tools > \uicontrol Options >
+            \uicontrol Beautifier to specify settings for beautifying files.
+
+        \li Select the \uicontrol {Enable auto format on file save} check box to
+            automatically beautify files when you save them using the tool you
+            select in the \uicontrol Tool field.
+
+            \image qt-creator-beautifier-options-general.png
+
+        \li In the \uicontrol {Restrict to MIME types} field, define the MIME
+            types of the files to beautify, separated by semicolons. Leave the
+            field empty to apply the tool on all files.
+
+        \li Select the \uicontrol {Restrict to files contained in the current
+            project} check box to only beautify files that belong to the
+            current project.
+
+        \li Select \uicontrol {Artistic Style}, \uicontrol {Clang Format}, or
+            \uicontrol Uncrustify to specify settings for the tool you want to
+            use.
 
             \image beautifier_options.png
 
@@ -86,10 +104,6 @@
             \uicontrol {Clang Format command}, or
             \uicontrol {Uncrustify command} field.
 
-        \li In the \uicontrol {Restrict to MIME types} field, define the MIME
-            types of the files to beautify, separated by semicolons. Leave the
-            field empty to apply the tool on all files.
-
         \li In the \uicontrol Options group, select the configuration file that
             defines the style to use in the source files. If you select several
             options, they are applied from top down.
@@ -117,8 +131,8 @@
 
             \endlist
 
-        \li Select \uicontrol Tools > \uicontrol Beautifier >
-            \uicontrol {Artistic Style}, \uicontrol ClangFormat, or
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Beautifier
+            > \uicontrol {Artistic Style}, \uicontrol ClangFormat, or
             \uicontrol Uncrustify > \uicontrol {Format Current File} to format
             the currently open file.
 
@@ -133,21 +147,4 @@
     file in this case when using Clang, select the
     \uicontrol {Format entire file if no text was selected} check box in the
     \uicontrol {Clang Format} options.
-
-    To automatically format files when they are saved, select \uicontrol Tools >
-    \uicontrol Beautifier > \uicontrol General:
-
-    \list 1
-
-        \li In the \uicontrol Tool field, select the tool for formatting.
-
-        \li In the \uicontrol {Restrict to MIME types} field, specify a
-            semicolon-separated list of MIME types. One of these types must
-            match the MIME type of the file that is auto formatted.
-            An empty list accepts all files.
-
-        \li Select the \uicontrol {Restrict to files contained in the current
-            project} check box to only auto format files in the current project.
-
-    \endlist
 */