diff --git a/doc/qtcreator/images/qtcreator-clang-format-options.png b/doc/qtcreator/images/qtcreator-clang-format-options.png
index 63855cd1c82..57b151ea78b 100644
Binary files a/doc/qtcreator/images/qtcreator-clang-format-options.png and b/doc/qtcreator/images/qtcreator-clang-format-options.png differ
diff --git a/doc/qtcreator/images/qtcreator-code-style-alignment.png b/doc/qtcreator/images/qtcreator-code-style-alignment.png
index cd1c8c4b669..5548762b1dd 100644
Binary files a/doc/qtcreator/images/qtcreator-code-style-alignment.png and b/doc/qtcreator/images/qtcreator-code-style-alignment.png differ
diff --git a/doc/qtcreator/images/qtcreator-code-style-braces.png b/doc/qtcreator/images/qtcreator-code-style-braces.png
index 58d5908bc13..50db47671fb 100644
Binary files a/doc/qtcreator/images/qtcreator-code-style-braces.png and b/doc/qtcreator/images/qtcreator-code-style-braces.png differ
diff --git a/doc/qtcreator/images/qtcreator-code-style-content.png b/doc/qtcreator/images/qtcreator-code-style-content.png
index 58d3e0b004d..0cdc9ac8bdf 100644
Binary files a/doc/qtcreator/images/qtcreator-code-style-content.png and b/doc/qtcreator/images/qtcreator-code-style-content.png differ
diff --git a/doc/qtcreator/images/qtcreator-code-style-settings-edit-nim.png b/doc/qtcreator/images/qtcreator-code-style-settings-edit-nim.png
index 9f77ebe8387..a1f22e01409 100644
Binary files a/doc/qtcreator/images/qtcreator-code-style-settings-edit-nim.png and b/doc/qtcreator/images/qtcreator-code-style-settings-edit-nim.png differ
diff --git a/doc/qtcreator/images/qtcreator-code-style-switch.png b/doc/qtcreator/images/qtcreator-code-style-switch.png
index c7f52a9caa1..1f2dee53c50 100644
Binary files a/doc/qtcreator/images/qtcreator-code-style-switch.png and b/doc/qtcreator/images/qtcreator-code-style-switch.png differ
diff --git a/doc/qtcreator/images/qtcreator-indentation.png b/doc/qtcreator/images/qtcreator-indentation.png
index 3eaca819daf..ed5df4b5d36 100644
Binary files a/doc/qtcreator/images/qtcreator-indentation.png and b/doc/qtcreator/images/qtcreator-indentation.png differ
diff --git a/doc/qtcreator/images/qtcreator-options-code-style-cpp.png b/doc/qtcreator/images/qtcreator-options-code-style-cpp.png
index 0a0a7c334b6..e3bd18a59c9 100644
Binary files a/doc/qtcreator/images/qtcreator-options-code-style-cpp.png and b/doc/qtcreator/images/qtcreator-options-code-style-cpp.png differ
diff --git a/doc/qtcreator/images/qtcreator-options-code-style-nim.png b/doc/qtcreator/images/qtcreator-options-code-style-nim.png
index 5f4d42ac50b..67427858909 100644
Binary files a/doc/qtcreator/images/qtcreator-options-code-style-nim.png and b/doc/qtcreator/images/qtcreator-options-code-style-nim.png differ
diff --git a/doc/qtcreator/images/qtcreator-options-code-style-qml.png b/doc/qtcreator/images/qtcreator-options-code-style-qml.png
index 7755be55819..93bf1bdfb8b 100644
Binary files a/doc/qtcreator/images/qtcreator-options-code-style-qml.png and b/doc/qtcreator/images/qtcreator-options-code-style-qml.png differ
diff --git a/doc/qtcreator/images/qtcreator-pointers-references.png b/doc/qtcreator/images/qtcreator-pointers-references.png
index 25e0dd23738..f8bd3560a60 100644
Binary files a/doc/qtcreator/images/qtcreator-pointers-references.png and b/doc/qtcreator/images/qtcreator-pointers-references.png differ
diff --git a/doc/qtcreator/src/editors/creator-code-indentation.qdoc b/doc/qtcreator/src/editors/creator-code-indentation.qdoc
index 8607d45ca8d..790395cc41f 100644
--- a/doc/qtcreator/src/editors/creator-code-indentation.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-indentation.qdoc
@@ -104,6 +104,9 @@
 
     \list 1
         \li Select \uicontrol Tools > \uicontrol Options > \uicontrol {C++}.
+            \note The settings displayed here depend on which plugins you have
+            enabled. If the Clang Format plugin is enabled, you'll see the
+            settings described in \l{Automatic Formatting and Indentation}.
         \li In the \uicontrol {Current settings} field, select the settings to
             modify and click \uicontrol Copy.
             \image qtcreator-options-code-style-cpp.png "C++ Code Style options"