diff --git a/doc/qtcreator/images/qtcreator-editor-settings.webp b/doc/qtcreator/images/qtcreator-editor-settings.webp
new file mode 100644
index 00000000000..68672be4d11
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-editor-settings.webp differ
diff --git a/doc/qtcreator/images/qtcreator-indentation.png b/doc/qtcreator/images/qtcreator-indentation.png
deleted file mode 100644
index ed5df4b5d36..00000000000
Binary files a/doc/qtcreator/images/qtcreator-indentation.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-options-text-editor-behavior.png b/doc/qtcreator/images/qtcreator-options-text-editor-behavior.png
deleted file mode 100644
index 239ca6737e0..00000000000
Binary files a/doc/qtcreator/images/qtcreator-options-text-editor-behavior.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-texteditor-behavior.webp b/doc/qtcreator/images/qtcreator-preferences-texteditor-behavior.webp
new file mode 100644
index 00000000000..722d4424e80
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-preferences-texteditor-behavior.webp differ
diff --git a/doc/qtcreator/src/editors/creator-code-indentation.qdoc b/doc/qtcreator/src/editors/creator-code-indentation.qdoc
index 6dcb32a4aa6..377cbce082f 100644
--- a/doc/qtcreator/src/editors/creator-code-indentation.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-indentation.qdoc
@@ -49,7 +49,7 @@
     the \uicontrol {Skip clean whitespace for file types} check box to
     exclude the specified file types.
 
-    \image qtcreator-options-text-editor-behavior.png {Text Editor Behavior preferences}
+    \image qtcreator-preferences-texteditor-behavior.webp {Text Editor Behavior preferences}
 
     \section1 Show whitespace in editor
 
diff --git a/doc/qtcreator/src/editors/creator-editors-options.qdoc b/doc/qtcreator/src/editors/creator-editors-options.qdoc
index 595c79b81c3..c0bc25e56e1 100644
--- a/doc/qtcreator/src/editors/creator-editors-options.qdoc
+++ b/doc/qtcreator/src/editors/creator-editors-options.qdoc
@@ -25,15 +25,6 @@
 
     The settings you specify apply globally to all projects.
 
-    To specify editor behavior for an open project, select \uicontrol Projects >
-    \uicontrol Editor.
-
-    \image qtcreator-editor-settings.png "Editor settings"
-
-    \if defined(qtcreator)
-    For more information, see \l{Specify editor settings}.
-    \endif
-
     You can also specify indentation settings separately for C++ and QML files
     either globally or for the open project. For more information, see
     \l{Indent text or code}.
@@ -74,16 +65,7 @@
     \endlist
 
     \if defined(qtcreator)
-    \section1 Related Topics
-
-    \list
-
-        \li \l{Using FakeVim Mode}
-
-            Run the main editor in a manner similar to the Vim editor in the
-            FakeVim mode.
-
-    \endlist
+    \sa {Specify editor settings}, {Using FakeVim Mode}
     \endif
 
 */
diff --git a/doc/qtcreator/src/editors/creator-preferences-text-editor-behavior.qdoc b/doc/qtcreator/src/editors/creator-preferences-text-editor-behavior.qdoc
index aeaf45def30..f60be5e5c1b 100644
--- a/doc/qtcreator/src/editors/creator-preferences-text-editor-behavior.qdoc
+++ b/doc/qtcreator/src/editors/creator-preferences-text-editor-behavior.qdoc
@@ -20,7 +20,7 @@
     QML code (such as Python code files), select \preferences >
     \uicontrol {Text Editor} > \uicontrol Behavior.
 
-    \image qtcreator-indentation.png {Text Editor Behavior preferences}
+    \image qtcreator-preferences-texteditor-behavior.webp {Text Editor Behavior preferences}
 
     You can specify how to interpret the \key Tab and \key Backspace key
     presses and how to align continuation lines.
@@ -87,6 +87,12 @@
     Your highlight definition file can have definitions for both multi and
     single line comments. To apply the single line comment definition when
     commenting out a selection, select \uicontrol {Prefer single line comments}.
+    In \uicontrol {Preferred comment position}, select \uicontrol Automatic to
+    let the highlight definition for the file determine the position of single
+    line comments. If no highlight definition is available, the comments are
+    placed after leading whitespace. Select \uicontrol {After Whitespace} to
+    always place them there. Select \uicontrol {At Line Start} to place single
+    line comments at the end of the line.
 
     \if defined(qtcreator)
     \sa {Find preferences}, {C++ Code Style}, {Nim}
diff --git a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
index 23dfc01a4f0..6f09194a973 100644
--- a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
+++ b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
@@ -124,5 +124,5 @@
     > \uicontrol {Text Editor} > \uicontrol Behavior >
     \uicontrol {Enable smart selection changing}.
 
-    \image qtcreator-options-text-editor-behavior.png "Text Editor Behavior preferences"
+    \image qtcreator-preferences-texteditor-behavior.webp "Text Editor Behavior preferences"
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
index 684a960ed35..f3b3ef46a42 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
@@ -32,7 +32,7 @@
 
     \endlist
 
-    \image qtcreator-editor-settings.png "Editor view"
+    \image qtcreator-editor-settings.webp {Editor settings for a project}
 
     Click \uicontrol {Restore Global} to revert to the global settings.