diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerControlPlugin/DebuggerControlPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerControlPlugin/DebuggerControlPlugin.html
index 6e4c3283c2..10007e094f 100644
--- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerControlPlugin/DebuggerControlPlugin.html
+++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerControlPlugin/DebuggerControlPlugin.html
@@ -83,18 +83,6 @@
     or "stop." If successful, the target enters the "stopped" state. This is available when the
     target is currently running.</P>
 
-    <H3><A name="target_kill"></A><IMG alt="" src="icon.debugger.kill"> Kill</H3>
-
-    <P>Kill the current target. Other debuggers may call this "terminate" or "stop." This may
-    consequently close the current trace. If successful, the target enters the "terminated" state.
-    This is always available for a live target.</P>
-
-    <H3><A name="target_disconnect"></A><IMG alt="" src="icon.debugger.disconnect"> Disconnect</H3>
-
-    <P>Disconnect from the current target's debugger. This usually causes the connected debugger to
-    terminate and likely kill its targets. This may consequently close the current trace (and
-    perhaps others). This is always available for a live target.</P>
-
     <H3><A name="target_step_into"></A><IMG alt="" src="icon.debugger.step.into"> Step Into</H3>
 
     <P>Step the current target to the next instruction. This is available when the target is
@@ -119,6 +107,18 @@
     when the target is currently stopped. If successful the target may briefly enter the "running"
     state.</P>
 
+    <H3><A name="target_kill"></A><IMG alt="" src="icon.debugger.kill"> Kill</H3>
+
+    <P>Kill the current target. Other debuggers may call this "terminate" or "stop." This may
+    consequently close the current trace. If successful, the target enters the "terminated" state.
+    This is always available for a live target.</P>
+
+    <H3><A name="target_disconnect"></A><IMG alt="" src="icon.debugger.disconnect"> Disconnect</H3>
+
+    <P>Disconnect from the current target's debugger. This usually causes the connected debugger to
+    terminate and likely kill its targets. This may consequently close the current trace (and
+    perhaps others). This is always available for a live target.</P>
+
     <H2>Trace Navigation Actions</H2>
 
     <P>These actions are visible when a <B>Control Trace</B> mode is selected. They are available
diff --git a/GhidraDocs/GhidraClass/Debugger/A2-UITour.html b/GhidraDocs/GhidraClass/Debugger/A2-UITour.html
index 5cb1debdfe..abbca8a7e0 100644
--- a/GhidraDocs/GhidraClass/Debugger/A2-UITour.html
+++ b/GhidraDocs/GhidraClass/Debugger/A2-UITour.html
@@ -197,13 +197,6 @@ back-end debugger.</li>
 <strong>Interrupt</strong>: Interrupt, suspend, pause, break, etc. This
 is equivalent to <strong><code>CTRL</code>-<code>C</code></strong> or
 <code>interrupt</code> in GDB.</li>
-<li><img src="images/kill.png" alt="kill button" />
-<strong>Kill</strong>: Kill, terminate, etc. This is equivalent to
-<code>kill</code> in GDB.</li>
-<li><img src="images/disconnect.png" alt="disconnect button" />
-<strong>Disconnect</strong>: Disconnect from the back-end debugger.
-Typically, this will also end the session. It is equivalent to
-<code>quit</code> in GDB.</li>
 <li><img src="images/stepinto.png" alt="step into button" />
 <strong>Step Into</strong>, <img src="images/stepover.png"
 alt="step over button" /> <strong>Step Over</strong>, <img
@@ -214,6 +207,13 @@ order, the equivalent commands in GDB are <code>stepi</code>,
 <code>nexti</code>, and <code>finish</code>. Step [Extended] represents
 additional step commands supported by the back end. GDB provides
 <strong>Advance</strong> and <strong>Return</strong>.</li>
+<li><img src="images/kill.png" alt="kill button" />
+<strong>Kill</strong>: Kill, terminate, etc. This is equivalent to
+<code>kill</code> in GDB.</li>
+<li><img src="images/disconnect.png" alt="disconnect button" />
+<strong>Disconnect</strong>: Disconnect from the back-end debugger.
+Typically, this will also end the session. It is equivalent to
+<code>quit</code> in GDB.</li>
 </ul>
 </section>
 <section id="windows" class="level3">
diff --git a/GhidraDocs/GhidraClass/Debugger/A2-UITour.md b/GhidraDocs/GhidraClass/Debugger/A2-UITour.md
index 6efd4f0871..6c5bb45c80 100644
--- a/GhidraDocs/GhidraClass/Debugger/A2-UITour.md
+++ b/GhidraDocs/GhidraClass/Debugger/A2-UITour.md
@@ -41,6 +41,10 @@ They are:
 * ![interrupt button](images/interrupt.png) **Interrupt**:
   Interrupt, suspend, pause, break, etc.
   This is equivalent to **`CTRL`-`C`** or `interrupt` in GDB.
+* ![step into button](images/stepinto.png) **Step Into**, ![step over button](images/stepover.png) **Step Over**, ![step out button](images/stepout.png) **Step Out**, ![step last button](images/steplast.png) **Step [Extended]**:
+  These buttons step in various ways.
+  In order, the equivalent commands in GDB are `stepi`, `nexti`, and `finish`.
+  Step [Extended] represents additional step commands supported by the back end. GDB provides **Advance** and **Return**.
 * ![kill button](images/kill.png) **Kill**:
   Kill, terminate, etc.
   This is equivalent to `kill` in GDB.
@@ -48,10 +52,6 @@ They are:
   Disconnect from the back-end debugger.
   Typically, this will also end the session.
   It is equivalent to `quit` in GDB.
-* ![step into button](images/stepinto.png) **Step Into**, ![step over button](images/stepover.png) **Step Over**, ![step out button](images/stepout.png) **Step Out**, ![step last button](images/steplast.png) **Step [Extended]**:
-  These buttons step in various ways.
-  In order, the equivalent commands in GDB are `stepi`, `nexti`, and `finish`.
-  Step [Extended] represents additional step commands supported by the back end. GDB provides **Advance** and **Return**.
 
 ### Windows
 
diff --git a/GhidraDocs/GhidraClass/Debugger/images/Breakpoints_SyncedAfterImportLibC.png b/GhidraDocs/GhidraClass/Debugger/images/Breakpoints_SyncedAfterImportLibC.png
index 45a4123f2b..adc879a90a 100644
Binary files a/GhidraDocs/GhidraClass/Debugger/images/Breakpoints_SyncedAfterImportLibC.png and b/GhidraDocs/GhidraClass/Debugger/images/Breakpoints_SyncedAfterImportLibC.png differ
diff --git a/GhidraDocs/GhidraClass/Debugger/images/GettingStarted_DisassemblyAfterLaunch.png b/GhidraDocs/GhidraClass/Debugger/images/GettingStarted_DisassemblyAfterLaunch.png
index 6c75492991..040063f276 100644
Binary files a/GhidraDocs/GhidraClass/Debugger/images/GettingStarted_DisassemblyAfterLaunch.png and b/GhidraDocs/GhidraClass/Debugger/images/GettingStarted_DisassemblyAfterLaunch.png differ
diff --git a/GhidraDocs/GhidraClass/Debugger/images/GettingStarted_ToolWSpecimen.png b/GhidraDocs/GhidraClass/Debugger/images/GettingStarted_ToolWSpecimen.png
index 8f59dccc5f..ee759c57d5 100644
Binary files a/GhidraDocs/GhidraClass/Debugger/images/GettingStarted_ToolWSpecimen.png and b/GhidraDocs/GhidraClass/Debugger/images/GettingStarted_ToolWSpecimen.png differ