diff --git a/doc/qtcreator/images/qtcreator-kits.png b/doc/qtcreator/images/qtcreator-kits.png
deleted file mode 100644
index 9cd08c36cc5..00000000000
Binary files a/doc/qtcreator/images/qtcreator-kits.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-kits.webp b/doc/qtcreator/images/qtcreator-preferences-kits.webp
new file mode 100644
index 00000000000..95e7b44990d
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-preferences-kits.webp differ
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index c6a3b657520..7a836baf330 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -32,7 +32,7 @@
     another kit. To specify the debugger and compiler to use for each kit, go to
     \preferences > \uicontrol Kits.
 
-    \image qtcreator-kits.png {Kits preferences}
+    \image qtcreator-preferences-kits.webp {Kits preferences}
 
     You need to set up the debugger only if the automatic setup fails because
     the debugger is missing (for example, you must install the CDB
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
index c730452965e..e3c6ac94e3b 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
@@ -44,7 +44,7 @@
         \li Select \preferences > \uicontrol Kits.
         \li Select \uicontrol Add to start from an empty kit or \uicontrol Clone
             to clone the selected kit and edit its preferences.
-            \image qtcreator-kits.png
+            \image qtcreator-preferences-kits.webp {Kits preferences}
         \li Set \l{Kits}{kit preferences} according to the build system and
             device type.
 
@@ -80,7 +80,7 @@
     \uicontrol Kits. For example, if you use CMake to build all your projects,
     you can hide Qbs and qmake preferences by default.
 
-    \image qtcreator-kits.png
+    \image qtcreator-preferences-kits.webp {Kits preferences}
 
     \section1 Filtering Kit Preferences
 
@@ -147,9 +147,15 @@
             information from \uicontrol {Qt mkspec}, which you can change.
     \row
         \li \uicontrol Environment
-        \li Select \uicontrol Change to modify environment variable values for
-            build environments in the \uicontrol {Edit Environment Changes}
-            dialog. For more information about how to add and remove variable
+        \li Select \uicontrol {Edit Build Environment} to modify
+            environment variable values for build environments in
+            the \uicontrol {Edit Build Environment} dialog.
+
+            Select \uicontrol {Edit Run Environment} to modify
+            environment variable values for run environments in
+            the \uicontrol {Edit Run Environment} dialog.
+
+            For more information about how to add and remove variable
             values, see \l{Edit environment settings}.
     \row
         \li \uicontrol {Force UTF-8 MSVC compiler output}
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
index cd839283baf..981668383b2 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
@@ -22,7 +22,7 @@
     The final environment is specified separately for each kit. With
     project-specific environment settings you can change the environment for
     all kits that you use to build, deploy, and run the project simultaneously,
-    rather than having to change it separately for each kit.
+    rather than having to change it separately for each \l{Kits}{kit}.
 
     The changes are stored in the local project-specific \c{CMakeLists.txt.user}
     or \c{.pro.user} file, depending on the build system you use, such as CMake
@@ -125,7 +125,7 @@
     \title Edit environment settings
 
     You can change the environment variable values for build or run environments
-    either for a particular project or globally:
+    globally or for a particular project or kit:
 
     \list
         \li To change values globally, go to \preferences >
@@ -135,6 +135,10 @@
             \uicontrol {Add} in the \l {Change the environment for a project}
             {project}, \l {Specify the build environment}{build}, or
             \l {Specify the run environment}{run} environment settings.
+        \li To change values for a kit, go to \preferences >
+            \uicontrol Kits > \uicontrol Kits, and select
+            \uicontrol {Edit Build Environment} or
+            \uicontrol {Edit Run Environment} in \uicontrol {Environment}.
     \endlist
 
     \image qtcreator-edit-environment.webp {Edit Environment dialog}
@@ -168,5 +172,5 @@
     characters (##).
 
     \sa {Specify the environment for projects}, {Configure projects for building},
-    {Configure projects for running}, {Use Qt Creator variables}
+    {Configure projects for running}, {Use Qt Creator variables}, {Kits}
 */