diff --git a/doc/images/qtcreator-analyze-menu.png b/doc/images/qtcreator-analyze-menu.png
deleted file mode 100644
index f497fd09ed7..00000000000
Binary files a/doc/images/qtcreator-analyze-menu.png and /dev/null differ
diff --git a/doc/src/analyze/creator-analyze.qdoc b/doc/src/analyze/creator-analyze.qdoc
index ebd8023f4af..3353eb12828 100644
--- a/doc/src/analyze/creator-analyze.qdoc
+++ b/doc/src/analyze/creator-analyze.qdoc
@@ -37,20 +37,18 @@
 
     \title Analyzing Code
 
-    You can use the code analysis tools in the \uicontrol Analyze mode. To
-    switch to \uicontrol Analyze mode, select \uicontrol Analyze in the mode
+    You can use the code analysis tools in the \uicontrol Debug mode. To
+    switch to \uicontrol Debug mode, select \uicontrol Debug in the mode
     selector, or select the \uicontrol {Analyze} menu and then select a tool.
-    When you are in the \uicontrol Analyze mode, you can switch between tools by
+    When you are in the \uicontrol Debug mode, you can switch between tools by
     selecting them in the menu on the toolbar.
 
-    \image qtcreator-analyze-menu.png "Analyze mode menu"
-
-    You can drag and drop the views in the \uicontrol Analyze mode to new
+    You can drag and drop the views in the \uicontrol Debug mode to new
     positions on the screen. The size and position of views are saved for future
     sessions. Select \uicontrol {Window > Views > Reset to Default Layout} to
     reset the views to their original sizes and positions.
 
-    You can use the following code analysis tools in the \uicontrol Analyze
+    You can use the following code analysis tools in the \uicontrol Debug
     mode:
 
     \list
diff --git a/doc/src/analyze/creator-clang-static-analyzer.qdoc b/doc/src/analyze/creator-clang-static-analyzer.qdoc
index eef8bfa8ee6..4f25c447427 100644
--- a/doc/src/analyze/creator-clang-static-analyzer.qdoc
+++ b/doc/src/analyze/creator-clang-static-analyzer.qdoc
@@ -74,8 +74,8 @@
     \uicontrol Analyze > \uicontrol {Clang Static Analyzer} on the menu bar. The
     Clang Static Analyzer starts automatically.
 
-    However, if you select \uicontrol Analyze in the mode selector to open the
-    \uicontrol Analyze mode and then select \uicontrol {Clang Static Analyzer},
+    However, if you select \uicontrol Debug in the mode selector to open the
+    \uicontrol Debug mode and then select \uicontrol {Clang Static Analyzer},
     you must start the Clang Static Analyzer by selecting the
     \inlineimage qtcreator-analyze-start-button.png
     (\uicontrol Start) button.
diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc
index 26199013f9f..a2cd709ee4d 100644
--- a/doc/src/howto/creator-keyboard-shortcuts.qdoc
+++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc
@@ -195,12 +195,9 @@
         \row
             \li  Switch to \uicontrol Projects mode
             \li  Ctrl+5
-        \row
-            \li  Switch to \uicontrol Analyze mode
-            \li  Ctrl+6
         \row
             \li  Switch to \uicontrol Help mode
-            \li  Ctrl+7
+            \li  Ctrl+6
         \row
             \li  Toggle \uicontrol{Issues} pane
             \li  Alt+1 (Cmd+1 on OS X)
diff --git a/doc/src/howto/creator-tips.qdoc b/doc/src/howto/creator-tips.qdoc
index bcb19cfbe47..722fee46322 100644
--- a/doc/src/howto/creator-tips.qdoc
+++ b/doc/src/howto/creator-tips.qdoc
@@ -49,8 +49,7 @@
         \li \uicontrol Design mode \key Ctrl+3
         \li \uicontrol Debug mode \key Ctrl+4
         \li \uicontrol Projects mode \key Ctrl+5
-        \li \uicontrol Analyze mode \key Ctrl+6
-        \li \uicontrol Help mode \key Ctrl+7
+        \li \uicontrol Help mode \key Ctrl+6
 
     \endlist
 
diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc
index b08b688f1a8..97b8c2d1e04 100644
--- a/doc/src/howto/creator-ui.qdoc
+++ b/doc/src/howto/creator-ui.qdoc
@@ -93,15 +93,13 @@
             UI files.
 
         \li \uicontrol{\l{Debugging}{Debug}} mode for inspecting the state of your
-            application while debugging.
+            application while debugging and for using code analysis tools
+            to detect memory leaks and profile C++ or QML code.
 
         \li \uicontrol{\l{Specifying Build Settings}{Projects}} mode for configuring
             project building and execution. This mode is available when a
             project is open.
 
-        \li \uicontrol{\l{Analyzing Code}{Analyze}} mode for using code analysis tools
-            to detect memory leaks and profile C++ or QML code.
-
         \li \uicontrol{\l{Getting Help}{Help}} mode for viewing Qt documentation.
 
     \endlist
@@ -375,9 +373,6 @@
 
     \list
 
-        \li \uicontrol Analyzer - Errors encountered while running the
-            \l{Analyzing Code}{Valgrind code analysis tools}.
-
         \li \uicontrol {Build System} - Errors and warnings encountered during a
             build.
 
@@ -387,6 +382,9 @@
        \li \uicontrol{Debug Information} - Lists debug information packages that might
             be missing.
 
+        \li \uicontrol Debugger - Errors encountered while running the
+            \l{Analyzing Code}{Valgrind code analysis tools}.
+
        \li \uicontrol{Debugger Runtime} - Errors encountered when starting \QC. For
             example, information about missing DLLs.