diff --git a/Ghidra/Debug/Debugger/certification.manifest b/Ghidra/Debug/Debugger/certification.manifest
index c71daadd7e..723e3acccf 100644
--- a/Ghidra/Debug/Debugger/certification.manifest
+++ b/Ghidra/Debug/Debugger/certification.manifest
@@ -155,12 +155,12 @@ src/main/resources/images/closedFolder.png||Modified Nuvola Icons - LGPL 2.1||||
 src/main/resources/images/conf.png||GHIDRA||||END|
 src/main/resources/images/connect.png||GHIDRA||||END|
 src/main/resources/images/console.png||GHIDRA||||END|
-src/main/resources/images/continue.png||GHIDRA||||END|
 src/main/resources/images/debugger.png||GHIDRA||||END|
 src/main/resources/images/debugger32.png||GHIDRA||||END|
 src/main/resources/images/delete.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|
 src/main/resources/images/detach.png||GHIDRA||||END|
 src/main/resources/images/disconnect.png||GHIDRA||||END|
+src/main/resources/images/interrupt.png||GHIDRA||||END|
 src/main/resources/images/kill.png||GHIDRA||||END|
 src/main/resources/images/launch.png||GHIDRA||||END|
 src/main/resources/images/modules.png||GHIDRA||||END|
@@ -172,14 +172,16 @@ src/main/resources/images/process.png||GHIDRA||||END|
 src/main/resources/images/record.png||GHIDRA||||END|
 src/main/resources/images/register-marker.png||GHIDRA||||END|
 src/main/resources/images/registers.png||GHIDRA||||END|
+src/main/resources/images/resume.png||GHIDRA||||END|
+src/main/resources/images/seek-present.png||GHIDRA||||END|
 src/main/resources/images/select-registers.png||GHIDRA||||END|
 src/main/resources/images/skipover.png||GHIDRA||||END|
 src/main/resources/images/stack.png||GHIDRA||||END|
 src/main/resources/images/stepback.png||GHIDRA||||END|
 src/main/resources/images/stepinto.png||GHIDRA||||END|
+src/main/resources/images/steplast.png||GHIDRA||||END|
 src/main/resources/images/stepout.png||GHIDRA||||END|
 src/main/resources/images/stepover.png||GHIDRA||||END|
-src/main/resources/images/stop.png||GHIDRA||||END|
 src/main/resources/images/sync_enabled.png||GHIDRA||||END|
 src/main/resources/images/system-switch-user.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
 src/main/resources/images/table.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|
@@ -207,27 +209,32 @@ src/main/svg/breakpoints-enable-all.svg||GHIDRA||||END|
 src/main/svg/breakpoints-make-effective.svg||GHIDRA||||END|
 src/main/svg/connect.svg||GHIDRA||||END|
 src/main/svg/console.svg||GHIDRA||||END|
-src/main/svg/continue.svg||GHIDRA||||END|
 src/main/svg/debugger.svg||GHIDRA||||END|
 src/main/svg/detach.svg||GHIDRA||||END|
 src/main/svg/disconnect.svg||GHIDRA||||END|
+src/main/svg/interrupt.svg||GHIDRA||||END|
 src/main/svg/kill.svg||GHIDRA||||END|
 src/main/svg/launch.svg||GHIDRA||||END|
-src/main/svg/memory.svg||GHIDRA||||END|
+src/main/svg/modules.svg||GHIDRA||||END|
+src/main/svg/object-populated.svg||GHIDRA||||END|
+src/main/svg/object-running.svg||GHIDRA||||END|
 src/main/svg/object-terminated.svg||GHIDRA||||END|
-src/main/svg/pencil.png||GHIDRA||||END|
+src/main/svg/object-unpopulated.svg||GHIDRA||||END|
+src/main/svg/overlay-pencil.svg||GHIDRA||||END|
 src/main/svg/process.svg||GHIDRA||||END|
-src/main/svg/recording.svg||GHIDRA||||END|
+src/main/svg/record.svg||GHIDRA||||END|
 src/main/svg/register-marker.svg||GHIDRA||||END|
 src/main/svg/registers.svg||GHIDRA||||END|
+src/main/svg/resume.svg||GHIDRA||||END|
+src/main/svg/seek-present.svg||GHIDRA||||END|
 src/main/svg/select-registers.svg||GHIDRA||||END|
 src/main/svg/skipover.svg||GHIDRA||||END|
 src/main/svg/stack.svg||GHIDRA||||END|
 src/main/svg/stepback.svg||GHIDRA||||END|
 src/main/svg/stepinto.svg||GHIDRA||||END|
+src/main/svg/steplast.svg||GHIDRA||||END|
 src/main/svg/stepout.svg||GHIDRA||||END|
 src/main/svg/stepover.svg||GHIDRA||||END|
-src/main/svg/stop.svg||GHIDRA||||END|
 src/main/svg/thread.svg||GHIDRA||||END|
 src/main/svg/write-disabled.svg||GHIDRA||||END|
 src/main/svg/write-emulator.svg||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java
index 2df1201df0..5ab2b73766 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java
@@ -80,8 +80,8 @@ public interface DebuggerResources {
 
 	ImageIcon ICON_LAUNCH = ResourceManager.loadImage("images/launch.png");
 	ImageIcon ICON_ATTACH = ResourceManager.loadImage("images/attach.png");
-	ImageIcon ICON_RESUME = ResourceManager.loadImage("images/continue.png");
-	ImageIcon ICON_TERMINATE = ResourceManager.loadImage("images/stop.png");
+	ImageIcon ICON_RESUME = ResourceManager.loadImage("images/resume.png");
+	ImageIcon ICON_INTERRUPT = ResourceManager.loadImage("images/interrupt.png");
 	ImageIcon ICON_KILL = ResourceManager.loadImage("images/kill.png");
 	ImageIcon ICON_DETACH = ResourceManager.loadImage("images/detach.png");
 	ImageIcon ICON_RECORD = ResourceManager.loadImage("images/record.png");
@@ -91,10 +91,11 @@ public interface DebuggerResources {
 	ImageIcon ICON_SKIP_OVER = ResourceManager.loadImage("images/skipover.png");
 	ImageIcon ICON_STEP_FINISH = ResourceManager.loadImage("images/stepout.png");
 	ImageIcon ICON_STEP_BACK = ResourceManager.loadImage("images/stepback.png");
+	ImageIcon ICON_STEP_LAST = ResourceManager.loadImage("images/steplast.png");
 	// TODO: Draw new icons?
 	ImageIcon ICON_SNAP_FORWARD = ResourceManager.loadImage("images/2rightarrow.png");
 	ImageIcon ICON_SNAP_BACKWARD = ResourceManager.loadImage("images/2leftarrow.png");
-	ImageIcon ICON_SEEK_PRESENT = ICON_RESUME;
+	ImageIcon ICON_SEEK_PRESENT = ResourceManager.loadImage("images/seek-present.png");
 
 	ImageIcon ICON_SET_BREAKPOINT = ResourceManager.loadImage("images/breakpoint-enable.png");
 	ImageIcon ICON_CLEAR_BREAKPOINT = ResourceManager.loadImage("images/breakpoint-clear.png");
@@ -692,7 +693,7 @@ public interface DebuggerResources {
 
 	abstract class AbstractStepLastAction extends DockingAction {
 		public static final String NAME = "Step Last";
-		public static final Icon ICON = ICON_STEP_FINISH; // TODO: Draw one
+		public static final Icon ICON = ICON_STEP_LAST;
 		public static final String HELP_ANCHOR = "step_last";
 
 		public static HelpLocation help(Plugin owner) {
@@ -708,7 +709,7 @@ public interface DebuggerResources {
 
 	abstract class AbstractInterruptAction extends DockingAction {
 		public static final String NAME = "Interrupt";
-		public static final Icon ICON = ICON_TERMINATE;
+		public static final Icon ICON = ICON_INTERRUPT;
 		public static final String HELP_ANCHOR = "interrupt";
 
 		public static HelpLocation help(Plugin owner) {
@@ -798,7 +799,7 @@ public interface DebuggerResources {
 	interface InterpreterInterruptAction {
 		String NAME = "Interpreter Interrupt";
 		String DESCRIPTION = "Send an interrupt through this Interpreter";
-		Icon ICON = ICON_TERMINATE;
+		Icon ICON = ICON_INTERRUPT;
 		String HELP_ANCHOR = "interrupt";
 
 		public static ActionBuilder builder(Plugin owner) {
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/attach.png b/Ghidra/Debug/Debugger/src/main/resources/images/attach.png
index cb0196300d..58afa3a319 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/attach.png and b/Ghidra/Debug/Debugger/src/main/resources/images/attach.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/breakpoints-make-effective.png b/Ghidra/Debug/Debugger/src/main/resources/images/breakpoints-make-effective.png
index d220d56af1..b7d77b5fcf 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/breakpoints-make-effective.png and b/Ghidra/Debug/Debugger/src/main/resources/images/breakpoints-make-effective.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/connect.png b/Ghidra/Debug/Debugger/src/main/resources/images/connect.png
index 82da18ee0d..219885a15e 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/connect.png and b/Ghidra/Debug/Debugger/src/main/resources/images/connect.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/console.png b/Ghidra/Debug/Debugger/src/main/resources/images/console.png
index b24b1f5786..b255f53c15 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/console.png and b/Ghidra/Debug/Debugger/src/main/resources/images/console.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/continue.png b/Ghidra/Debug/Debugger/src/main/resources/images/continue.png
deleted file mode 100644
index b79f8b752c..0000000000
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/continue.png and /dev/null differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/debugger.png b/Ghidra/Debug/Debugger/src/main/resources/images/debugger.png
index 1e39f8bbec..cec4164be4 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/debugger.png and b/Ghidra/Debug/Debugger/src/main/resources/images/debugger.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/debugger32.png b/Ghidra/Debug/Debugger/src/main/resources/images/debugger32.png
index 4b730e647f..aa34cb4287 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/debugger32.png and b/Ghidra/Debug/Debugger/src/main/resources/images/debugger32.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/detach.png b/Ghidra/Debug/Debugger/src/main/resources/images/detach.png
index 04e8e975db..f3201c28f1 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/detach.png and b/Ghidra/Debug/Debugger/src/main/resources/images/detach.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/disconnect.png b/Ghidra/Debug/Debugger/src/main/resources/images/disconnect.png
index 7f78c170d9..de33d19e82 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/disconnect.png and b/Ghidra/Debug/Debugger/src/main/resources/images/disconnect.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/interrupt.png b/Ghidra/Debug/Debugger/src/main/resources/images/interrupt.png
new file mode 100644
index 0000000000..f6ae4fc5db
Binary files /dev/null and b/Ghidra/Debug/Debugger/src/main/resources/images/interrupt.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/kill.png b/Ghidra/Debug/Debugger/src/main/resources/images/kill.png
index b7f91ad889..4599a64450 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/kill.png and b/Ghidra/Debug/Debugger/src/main/resources/images/kill.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/launch.png b/Ghidra/Debug/Debugger/src/main/resources/images/launch.png
index 948c5efde4..0503b4491c 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/launch.png and b/Ghidra/Debug/Debugger/src/main/resources/images/launch.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/modules.png b/Ghidra/Debug/Debugger/src/main/resources/images/modules.png
index 4ecd076bdb..d61799e084 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/modules.png and b/Ghidra/Debug/Debugger/src/main/resources/images/modules.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/object-populated.png b/Ghidra/Debug/Debugger/src/main/resources/images/object-populated.png
index ea1e926811..c3cc6c66e7 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/object-populated.png and b/Ghidra/Debug/Debugger/src/main/resources/images/object-populated.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/object-running.png b/Ghidra/Debug/Debugger/src/main/resources/images/object-running.png
index b060bd20c3..804be735ac 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/object-running.png and b/Ghidra/Debug/Debugger/src/main/resources/images/object-running.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/object-terminated.png b/Ghidra/Debug/Debugger/src/main/resources/images/object-terminated.png
index cb1d378235..b5130e3bea 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/object-terminated.png and b/Ghidra/Debug/Debugger/src/main/resources/images/object-terminated.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/object-unpopulated.png b/Ghidra/Debug/Debugger/src/main/resources/images/object-unpopulated.png
index 6386998ebc..8756da3c1d 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/object-unpopulated.png and b/Ghidra/Debug/Debugger/src/main/resources/images/object-unpopulated.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/process.png b/Ghidra/Debug/Debugger/src/main/resources/images/process.png
index 0fbc22619f..4aef23713c 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/process.png and b/Ghidra/Debug/Debugger/src/main/resources/images/process.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/record.png b/Ghidra/Debug/Debugger/src/main/resources/images/record.png
index 27d1402648..69f9ee123a 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/record.png and b/Ghidra/Debug/Debugger/src/main/resources/images/record.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/register-marker.png b/Ghidra/Debug/Debugger/src/main/resources/images/register-marker.png
index 7d843e4796..d6506a58f3 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/register-marker.png and b/Ghidra/Debug/Debugger/src/main/resources/images/register-marker.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/registers.png b/Ghidra/Debug/Debugger/src/main/resources/images/registers.png
index 922c2f9245..c9b6d204ef 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/registers.png and b/Ghidra/Debug/Debugger/src/main/resources/images/registers.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/resume.png b/Ghidra/Debug/Debugger/src/main/resources/images/resume.png
new file mode 100644
index 0000000000..b9f6990bff
Binary files /dev/null and b/Ghidra/Debug/Debugger/src/main/resources/images/resume.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/seek-present.png b/Ghidra/Debug/Debugger/src/main/resources/images/seek-present.png
new file mode 100644
index 0000000000..ec3673bb39
Binary files /dev/null and b/Ghidra/Debug/Debugger/src/main/resources/images/seek-present.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/select-registers.png b/Ghidra/Debug/Debugger/src/main/resources/images/select-registers.png
index 19902fa065..c8ffc2ba31 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/select-registers.png and b/Ghidra/Debug/Debugger/src/main/resources/images/select-registers.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/skipover.png b/Ghidra/Debug/Debugger/src/main/resources/images/skipover.png
index a477c46575..3dd8717a12 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/skipover.png and b/Ghidra/Debug/Debugger/src/main/resources/images/skipover.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/stack.png b/Ghidra/Debug/Debugger/src/main/resources/images/stack.png
index 3a10222bfb..521f2fb0bc 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/stack.png and b/Ghidra/Debug/Debugger/src/main/resources/images/stack.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/stepback.png b/Ghidra/Debug/Debugger/src/main/resources/images/stepback.png
index 3dfc69c95d..0f606929fb 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/stepback.png and b/Ghidra/Debug/Debugger/src/main/resources/images/stepback.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/stepinto.png b/Ghidra/Debug/Debugger/src/main/resources/images/stepinto.png
index bbcb749eb0..4c92124af4 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/stepinto.png and b/Ghidra/Debug/Debugger/src/main/resources/images/stepinto.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/steplast.png b/Ghidra/Debug/Debugger/src/main/resources/images/steplast.png
new file mode 100644
index 0000000000..0c5c187b87
Binary files /dev/null and b/Ghidra/Debug/Debugger/src/main/resources/images/steplast.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/stepout.png b/Ghidra/Debug/Debugger/src/main/resources/images/stepout.png
index 9e533aa876..1e8886167a 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/stepout.png and b/Ghidra/Debug/Debugger/src/main/resources/images/stepout.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/stepover.png b/Ghidra/Debug/Debugger/src/main/resources/images/stepover.png
index d4a38991fb..72d995c318 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/stepover.png and b/Ghidra/Debug/Debugger/src/main/resources/images/stepover.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/stop.png b/Ghidra/Debug/Debugger/src/main/resources/images/stop.png
deleted file mode 100644
index fa53723b0a..0000000000
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/stop.png and /dev/null differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/thread.png b/Ghidra/Debug/Debugger/src/main/resources/images/thread.png
index 338ef79b1e..a0282cfdab 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/thread.png and b/Ghidra/Debug/Debugger/src/main/resources/images/thread.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/write-disabled.png b/Ghidra/Debug/Debugger/src/main/resources/images/write-disabled.png
index 483d165a27..bad4477d96 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/write-disabled.png and b/Ghidra/Debug/Debugger/src/main/resources/images/write-disabled.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/write-emulator.png b/Ghidra/Debug/Debugger/src/main/resources/images/write-emulator.png
index 72600b472c..53964c75ed 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/write-emulator.png and b/Ghidra/Debug/Debugger/src/main/resources/images/write-emulator.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/write-target.png b/Ghidra/Debug/Debugger/src/main/resources/images/write-target.png
index c8f0e047ec..37b05b2d51 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/write-target.png and b/Ghidra/Debug/Debugger/src/main/resources/images/write-target.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/write-trace.png b/Ghidra/Debug/Debugger/src/main/resources/images/write-trace.png
index c0b120cd82..f3c62d5a2c 100644
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/write-trace.png and b/Ghidra/Debug/Debugger/src/main/resources/images/write-trace.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/svg/attach.svg b/Ghidra/Debug/Debugger/src/main/svg/attach.svg
index 1e7270f6a4..73aa81152c 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/attach.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/attach.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,23 +20,31 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1">
+     id="g858">
     <path
-       id="path5895"
-       d="M 3.7011719 1.0703125 A 8 8 0 0 0 2 6 A 8 8 0 0 0 10 14 A 8 8 0 0 0 14.964844 12.263672 L 13.726562 10.701172 A 6 6 0 0 1 10 12 A 6 6 0 0 1 4 6 A 6 6 0 0 1 5.2792969 2.3066406 L 3.7011719 1.0703125 z "
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.04581916;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10 0 A 6 6 0 0 0 5.6054688 1.9257812 L 3.6152344 0.36914062 L 3.3066406 0.76171875 C 2.1360722 2.2566877 1.5005523 4.1012735 1.5 6 C 1.5 10.688498 5.3115019 14.5 10 14.5 C 11.915968 14.4972 13.775267 13.846173 15.275391 12.654297 L 15.666016 12.34375 L 14.103516 10.371094 A 6 6 0 0 0 16 6 A 6 6 0 0 0 10 0 z "
+       id="path833" />
     <path
-       id="path5852"
+       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.7011719,1.0703125 A 8,8 0 0 0 2,6 a 8,8 0 0 0 8,8 8,8 0 0 0 4.964844,-1.736328 l -1.238282,-1.5625 A 6,6 0 0 1 10,12 6,6 0 0 1 4,6 6,6 0 0 1 5.2792969,2.3066406 Z"
+       id="path5895" />
+    <path
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.0000781,1 V 2.1308594 A 4,4 0 0 0 7.1485156,3.1992188 L 6.17,2.6347656 5.17,4.3652344 6.1485156,4.9296875 A 4,4 0 0 0 6.0000781,6 4,4 0 0 0 6.1465625,7.0703125 L 5.17,7.6347656 6.17,9.365234 7.1465625,8.800781 A 4,4 0 0 0 9.0000781,9.867188 V 11 H 11.000078 V 9.869141 a 4,4 0 0 0 1.851562,-1.06836 l 0.978516,0.564453 1,-1.7304684 L 13.85164,7.0703125 A 4,4 0 0 0 14.000078,6 4,4 0 0 0 13.853594,4.9296875 l 0.976562,-0.5644531 -1,-1.7304688 -0.976562,0.5644532 A 4,4 0 0 0 11.000078,2.1328125 V 1 Z m 0.9999999,4 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 A 1,1 0 0 1 9.0000781,6 1,1 0 0 1 10.000078,5 Z"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path5852" />
     <path
-       id="rect5901"
-       d="M 2 10 L 3.2929688 11.292969 L 0.87890625 13.707031 L 2.2929688 15.121094 L 4.7070312 12.707031 L 6 14 L 6 10 L 2 10 z "
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 0.79296875,9.5 1.6464844,10.353516 2.5859375,11.292969 0.171875,13.707031 2.2929688,15.828125 4.7070312,13.414062 6.5,15.207031 V 9.5 Z"
+       id="path836" />
+    <path
+       style="opacity:1;fill:#00c000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2,10 3.2929688,11.292969 0.87890625,13.707031 2.2929688,15.121094 4.7070312,12.707031 6,14 v -4 z"
+       id="rect5901" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/breakpoints-make-effective.svg b/Ghidra/Debug/Debugger/src/main/svg/breakpoints-make-effective.svg
index 1aa938dc7b..bfd9cb2416 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/breakpoints-make-effective.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/breakpoints-make-effective.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -24,17 +24,22 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1">
-    <circle
-       r="4"
-       cy="11.000002"
-       cx="11"
-       id="path821"
-       style="opacity:1;fill:#0166a9;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path821-7"
-       d="M 5,1 C 2.790861,1 1,2.790861 1,5 1,7.209139 2.790861,9 5,9 7.209139,9 9,7.209139 9,5 9,2.790861 7.209139,1 5,1 Z"
-       style="opacity:1;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+  <path
+     id="path822"
+     d="m 11,6.5 c -2.4852814,0 -4.5,2.0147186 -4.5,4.5 0,2.485281 2.0147186,4.5 4.5,4.5 2.485281,0 4.5,-2.014719 4.5,-4.5 0,-2.4852814 -2.014719,-4.5 -4.5,-4.5 z"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.28571439;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.28571439;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 5,0.5 C 2.5147186,0.5 0.5,2.5147186 0.5,5 0.5,7.4852814 2.5147186,9.5 5,9.5 7.4852814,9.5 9.5,7.4852814 9.5,5 9.5,2.5147186 7.4852814,0.5 5,0.5 Z"
+     id="path819" />
+  <circle
+     r="4"
+     cy="11.000002"
+     cx="11"
+     id="path821"
+     style="opacity:1;fill:#0166a9;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path821-7"
+     d="M 5,1 C 2.790861,1 1,2.790861 1,5 1,7.209139 2.790861,9 5,9 7.209139,9 9,7.209139 9,5 9,2.790861 7.209139,1 5,1 Z"
+     style="opacity:1;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/connect.svg b/Ghidra/Debug/Debugger/src/main/svg/connect.svg
index 6974dcb7de..130cd3433b 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/connect.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/connect.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 16 16"
-   version="1.1"
-   id="svg4819"
+   width="16"
    height="16"
-   width="16">
+   id="svg4819"
+   version="1.1"
+   viewBox="0 0 16 16">
   <defs
      id="defs4821" />
   <metadata
@@ -20,19 +20,20 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1">
-    <path
-       id="circle842"
-       d="M 8 2 A 6 6 0 0 0 2 8 A 6 6 0 0 0 3.1132812 11.472656 L 1 13.585938 L 2.4140625 15 L 4.5292969 12.884766 A 6 6 0 0 0 8 14 A 6 6 0 0 0 14 8 L 12 8 A 4 4 0 0 1 8 12 A 4 4 0 0 1 4 8 A 4 4 0 0 1 8 4 L 8 2 z "
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path838"
-       d="M 13.585938 1 L 9.2910156 5.2949219 A 3 3 0 0 0 8 5 A 3 3 0 0 0 5 8 A 3 3 0 0 0 8 11 A 3 3 0 0 0 11 8 A 3 3 0 0 0 10.705078 6.7089844 L 15 2.4140625 L 13.585938 1 z "
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+  <path
+     id="path918"
+     d="M 13.585938,0.29296875 9.1230469,4.7558594 C 8.9179163,4.684856 8.7099701,4.6196832 8.5,4.5703125 V 1.5 H 8 C 4.4160714,1.5 1.5,4.4160714 1.5,8 c 0.00175,1.1999382 0.3850235,2.351348 1.0097656,3.369141 l -2.21679685,2.216797 2.12109375,2.121093 2.21875,-2.21875 C 5.6498713,14.113396 6.7985466,14.497314 7.9980469,14.5 H 8 c 3.583929,0 6.5,-2.916071 6.5,-6.5 V 7.5 H 11.429688 C 11.380317,7.2900293 11.315144,7.0820836 11.244141,6.8769531 l 4.46289,-4.4628906 z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="circle842"
+     d="m 8,2.0000001 a 6,6 0 0 0 -6,6 6,6 0 0 0 1.113282,3.4726559 L 1,13.585938 2.414063,15 4.529297,12.884766 A 6,6 0 0 0 8,14 6,6 0 0 0 14,8.0000001 H 12 A 4,4 0 0 1 8,12 4,4 0 0 1 4,8.0000001 a 4,4 0 0 1 4,-4 z"
+     style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path838"
+     d="M 13.585938,1 9.291016,5.2949219 A 3,3 0 0 0 8,5 3,3 0 0 0 5,8.0000001 3,3 0 0 0 8,11 3,3 0 0 0 11,8.0000001 3,3 0 0 0 10.705078,6.7089844 L 15,2.4140625 Z"
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/console.svg b/Ghidra/Debug/Debugger/src/main/svg/console.svg
index 9d6d818f07..b229d07a79 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/console.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/console.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,19 +20,26 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     y="1.5"
+     x="0.5"
+     height="13"
+     width="15"
+     id="rect817"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.61604667;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
      id="layer1">
     <path
-       id="rect1057"
+       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,2 V 14 H 15 V 2 Z m 2,3 h 10 v 7 H 3 Z"
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="rect1057" />
     <path
-       id="rect1062"
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 4.5861068,5.671573 3.879,6.3786796 6.0003204,8.5 3.879,10.62132 4.5861068,11.328427 7.4145339,8.5 Z"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="rect1062" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/debugger.svg b/Ghidra/Debug/Debugger/src/main/svg/debugger.svg
index 7ba20dc55b..481c8f5adb 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/debugger.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/debugger.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,19 +20,23 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <path
+     id="path821"
+     d="M 8,0.5 V 1 C 8,1.6225344 8.1442403,2.1999658 8.2988281,2.7695312 7.5496907,2.9543138 6.8038418,3.2312501 6.1054688,3.6855469 4.6145984,3.4544422 3.0323973,3.6971892 1.7988281,4.2402344 L 1.5,4.3710938 V 6.6445312 L 2.2382812,6.2441406 C 2.763075,5.959273 3.349207,5.953005 3.9179688,5.8476562 3.3011404,6.7129784 2.8461928,7.6312805 2.6621094,8.5917969 1.9949096,8.6457948 1.3294394,8.7717221 0.74804688,9.109375 L 0.5,9.2539062 v 2.6386718 l 0.8339844,-0.751953 c 0.4192843,-0.377137 0.9675941,-0.55205 1.5273437,-0.587891 l 2.5859378,2.584027 C 5.4125719,13.697629 5.238716,14.24567 4.8613284,14.666058 L 4.1113281,15.5 H 6.7460938 L 6.890625,15.251953 c 0.3370096,-0.580289 0.4631197,-1.244297 0.5175781,-1.910156 0.9612293,-0.184494 1.8803545,-0.640596 2.7460939,-1.257813 -0.105461,0.568053 -0.111919,1.153396 -0.3964845,1.677735 L 9.3574219,14.5 h 2.2695311 l 0.132813,-0.294922 C 12.375196,12.835624 12.537846,11.334986 12.3125,9.890625 12.765047,9.1918929 13.042004,8.4478922 13.224609,7.6992188 13.796089,7.8548836 14.375198,8 15,8 h 0.5 V 6 H 15 C 14.423044,6 13.88292,5.8622708 13.363281,5.6777344 13.3364,5.5113171 13.268215,5.3668283 13.222656,5.2089844 13.643639,5.2348468 14.047442,5.1543016 14.351562,4.8515625 14.44577,4.756869 14.46273,4.6173149 14.523438,4.5 H 15.5 v -2 H 14.259766 C 14.156618,2.3514314 14.065147,2.1945028 13.935547,2.0644531 13.805288,1.9340537 13.648998,1.8420941 13.5,1.7382812 V 0.5 h -2 v 0.9785156 c -0.1166,0.060059 -0.255195,0.074814 -0.349609,0.1679688 l -0.002,0.00195 C 10.847495,1.9509288 10.766729,2.3528607 10.791016,2.7714844 10.633276,2.7261201 10.48855,2.6595597 10.322266,2.6328125 10.138066,2.1137063 10,1.5751981 10,1 V 0.5 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
   <g
-     id="layer1">
+     id="g819">
     <path
-       id="path962"
-       d="M 8.5,1 C 8.5,1.7247441 8.6289321,2.4173758 8.8496094,3.0683594 7.9558048,3.2126832 7.0370041,3.5974858 6.1914062,4.1816406 4.7716325,3.9227677 3.185712,4.1752882 2,4.6972656 V 5.8046875 C 2.9745225,5.2756988 4.0513397,5.0354513 5.1171875,5.0683594 5.1080541,5.0768011 5.0989394,5.0852647 5.0898438,5.09375 3.9613247,6.2260577 3.2205798,7.6417507 3.0449219,9.0019531 3.0299517,9.0012179 3.0149775,9.0005669 3,9 2.297388,9.0015552 1.6075807,9.1881535 1,9.5410156 V 10.769531 C 1.5491933,10.275544 2.2613297,10.001539 3,10 c 0.00586,-1.72e-5 0.011719,-1.72e-5 0.017578,0 v 0.002 L 4.2128906,11.197266 9,7 4.8027344,11.787109 6,12.982422 c 1.72e-5,0.0059 1.72e-5,0.01172 0,0.01758 -0.001,0.738413 -0.2743002,1.450517 -0.7675781,2 H 6.4589844 C 6.8118465,14.392417 6.9984448,13.702612 7,13 c -5.74e-4,-0.01433 -0.00123,-0.02865 -0.00195,-0.04297 1.3612806,-0.176463 2.7777334,-0.917943 3.9101561,-2.046875 0.0085,-0.0091 0.01695,-0.01821 0.02539,-0.02734 0.03331,1.065814 -0.207402,2.142591 -0.736328,3.117188 h 1.105468 c 0.596767,-1.327925 0.76278,-2.790229 0.513672,-4.1875 C 12.400692,8.9644709 12.784213,8.0434872 12.925781,7.1484375 13.578436,7.3703747 14.273091,7.5 15,7.5 v -1 C 14.283954,6.5 13.606636,6.3520477 12.980469,6.1035156 12.937057,5.3942048 12.718552,4.7607409 12.341797,4.2519531 l -0.585938,-0.59375 C 11.24558,3.2788527 10.609301,3.0589618 9.8964844,3.015625 9.6488005,2.3903831 9.5,1.7147552 9.5,1 Z"
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:0.70244753;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:0.70244753;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8.5,1 C 8.5,1.7247441 8.6289321,2.4173758 8.8496094,3.0683594 7.9558048,3.2126832 7.0370041,3.5974858 6.1914062,4.1816406 4.7716325,3.9227677 3.185712,4.1752882 2,4.6972656 V 5.8046875 C 2.9745225,5.2756988 4.0513397,5.0354513 5.1171875,5.0683594 5.1080541,5.0768011 5.0989394,5.0852647 5.0898438,5.09375 3.9613247,6.2260577 3.2205798,7.6417507 3.0449219,9.0019531 3.0299517,9.0012179 3.0149775,9.0005669 3,9 2.297388,9.0015552 1.6075807,9.1881535 1,9.5410156 V 10.769531 C 1.5491933,10.275544 2.2613297,10.001539 3,10 c 0.00586,-1.72e-5 0.011719,-1.72e-5 0.017578,0 v 0.002 L 4.2128906,11.197266 9,7 4.8027344,11.787109 6,12.982422 c 1.72e-5,0.0059 1.72e-5,0.01172 0,0.01758 -0.001,0.738413 -0.2743002,1.450517 -0.7675781,2 H 6.4589844 C 6.8118465,14.392417 6.9984448,13.702612 7,13 6.999426,12.98567 6.99877,12.97135 6.99805,12.95703 c 1.3612806,-0.176463 2.7777334,-0.917943 3.910156,-2.046875 0.0085,-0.0091 0.01695,-0.01821 0.02539,-0.02734 0.03331,1.065814 -0.207402,2.142591 -0.736328,3.117188 h 1.105468 c 0.596767,-1.327925 0.76278,-2.790229 0.513672,-4.1875 C 12.400692,8.9644709 12.784213,8.0434872 12.925781,7.1484375 13.578436,7.3703747 14.273091,7.5 15,7.5 v -1 C 14.283954,6.5 13.606636,6.3520477 12.980469,6.1035156 12.937057,5.3942048 12.718552,4.7607409 12.341797,4.2519531 l -0.585938,-0.59375 C 11.24558,3.2788527 10.609301,3.0589618 9.8964844,3.015625 9.6488005,2.3903831 9.5,1.7147552 9.5,1 Z"
+       id="path962" />
     <path
-       id="path967"
-       d="M 12 1 L 12 1.765625 A 1.7650453 1.1766968 45 0 0 11.501953 2.0019531 A 1.7650453 1.1766968 45 0 0 11.917969 4.0820312 A 1.7650453 1.1766968 45 0 0 13.998047 4.4980469 A 1.7650453 1.1766968 45 0 0 14.236328 4 L 15 4 L 15 3 L 14.017578 3 A 1.7650453 1.1766968 45 0 0 13.582031 2.4179688 A 1.7650453 1.1766968 45 0 0 13 1.9804688 L 13 1 L 12 1 z "
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.17669678;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.17669678;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12,1 V 1.765625 A 1.7650453,1.1766968 45 0 0 11.501953,2.0019531 1.7650453,1.1766968 45 0 0 11.917969,4.0820312 1.7650453,1.1766968 45 0 0 13.998047,4.4980469 1.7650453,1.1766968 45 0 0 14.236328,4 H 15 V 3 H 14.017578 A 1.7650453,1.1766968 45 0 0 13.582031,2.4179688 1.7650453,1.1766968 45 0 0 13,1.9804688 V 1 Z"
+       id="path967" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/detach.svg b/Ghidra/Debug/Debugger/src/main/svg/detach.svg
index 5c1df84373..e147646db9 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/detach.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/detach.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,23 +20,28 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <path
+     id="path833"
+     d="M 10.000125,-1.2484e-4 A 6,6 0 0 0 5.6055938,1.9256564 L 3.6153594,0.36901578 3.3067656,0.7615939 C 2.1361972,2.2565629 1.5006773,4.1011487 1.500125,5.9998752 c 0,4.6884978 3.8115019,8.4999998 8.5,8.4999998 1.915968,-0.0028 3.775267,-0.653827 5.275391,-1.845703 l 0.390625,-0.310547 -1.5625,-1.972656 a 6,6 0 0 0 1.896484,-4.3710938 6,6 0 0 0 -6,-6.00000004 z"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.04581916;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path5895-9"
+     d="m 3.7012969,1.0701877 a 8,8 0 0 0 -1.7011719,4.9296875 8,8 0 0 0 8,7.9999998 8,8 0 0 0 4.964844,-1.736328 l -1.238282,-1.5625 a 6,6 0 0 1 -3.726562,1.298828 6,6 0 0 1 -6,-5.9999998 6,6 0 0 1 1.2792969,-3.6933594 z"
+     style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
-     id="layer1">
+     transform="rotate(-180,3.3360625,12.663938)"
+     id="g847">
     <path
-       id="path5895"
-       d="M 2.7011719,2.0703125 A 8,8 0 0 0 1,7 a 8,8 0 0 0 8,8 8,8 0 0 0 4.964844,-1.736328 l -1.238282,-1.5625 A 6,6 0 0 1 9,13 6,6 0 0 1 3,7 6,6 0 0 1 4.2792969,3.3066406 Z"
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 0.7930938,9.4998752 1.6466094,10.353391 2.5860625,11.292844 0.172,13.706906 2.2930938,15.828 4.7071562,13.413937 6.500125,15.206906 V 9.4998752 Z"
+       id="path836" />
     <path
-       id="path5852"
-       d="M 9.0000781,1 V 2.1308594 A 4,4 0 0 0 7.1485156,3.1992188 L 6.17,2.6347656 5.17,4.3652344 6.1485156,4.9296875 A 4,4 0 0 0 6.0000781,6 4,4 0 0 0 6.1465625,7.0703125 L 5.17,7.6347656 6.17,9.365234 7.1465625,8.800781 A 4,4 0 0 0 9.0000781,9.867188 V 11 H 11.000078 V 9.869141 a 4,4 0 0 0 1.851562,-1.06836 l 0.978516,0.564453 1,-1.7304684 L 13.85164,7.0703125 A 4,4 0 0 0 14.000078,6 4,4 0 0 0 13.853594,4.9296875 l 0.976562,-0.5644531 -1,-1.7304688 -0.976562,0.5644532 A 4,4 0 0 0 11.000078,2.1328125 V 1 Z m 0.9999999,4 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 A 1,1 0 0 1 9.0000781,6 1,1 0 0 1 10.000078,5 Z"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 4.7071067,9.8786796 6.1213203,11.292893 3.2928933,14.12132 1.8786796,12.707107 Z M 4.9999996,15 H 1 l -6.4e-7,-4.000001 z"
-       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5904" />
+       style="opacity:1;fill:#c00000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.000125,9.999875 1.2929688,1.292969 -2.4140625,2.414062 1.4140625,1.414063 2.4140624,-2.414063 1.2929688,1.292969 v -4 z"
+       id="rect5901" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/disconnect.svg b/Ghidra/Debug/Debugger/src/main/svg/disconnect.svg
index 2c2818c1f9..1dac6e0a13 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/disconnect.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/disconnect.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 16 16"
-   version="1.1"
-   id="svg4819"
+   width="16"
    height="16"
-   width="16">
+   id="svg4819"
+   version="1.1"
+   viewBox="0 0 16 16">
   <defs
      id="defs4821" />
   <metadata
@@ -20,19 +20,27 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      id="layer1">
     <path
-       id="circle842"
-       d="M 2 8 A 6 6 0 0 0 3.1132812 11.472656 L 1 13.585938 L 2.4140625 15 L 4.5292969 12.884766 A 6 6 0 0 0 8 14 L 8 12 A 4 4 0 0 1 4 8 L 2 8 z "
-       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path819"
+       d="M 13.585938,0.29296875 13.232422,0.64648438 11.123047,2.7558594 C 10.757941,2.6294826 10.390133,2.5007932 10.001953,2.5 H 10 C 8.0729257,2.5 6.5,4.0729257 6.5,6 6.5,7.9270743 8.0729257,9.5 10,9.5 11.927074,9.5 13.5,7.9270743 13.5,6 V 5.99805 C 13.499207,5.6098661 13.370518,5.242059 13.244141,4.8769531 l 2.46289,-2.4628906 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <path
-       id="path838"
+       id="path815"
+       d="M 1.5,7.5 V 8 c 0.00175,1.1999381 0.3850237,2.351348 1.0097656,3.369141 l -2.21679685,2.216797 2.12109375,2.121093 2.21875,-2.21875 C 5.6498713,14.113396 6.7985465,14.497314 7.9980469,14.5 L 8.5,14.501953 V 11.5 H 8 C 6.0610811,11.5 4.5,9.9389189 4.5,8 V 7.5 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <path
+       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2 8 A 6 6 0 0 0 3.1132812 11.472656 L 1 13.585938 L 2.4140625 15 L 4.5292969 12.884766 A 6 6 0 0 0 8 14 L 8 12 A 4 4 0 0 1 4 8 L 2 8 z "
+       id="circle842" />
+    <path
+       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 13.586,1 11.291016,3.2949219 C 10.888018,3.1016751 10.446934,3.0009132 10,3 8.3431458,3 7,4.3431458 7,6 7,7.6568542 8.3431458,9 10,9 11.656854,9 13,7.6568542 13,6 12.999087,5.5530655 12.898325,5.1119819 12.705078,4.7089844 L 15,2.414 Z"
-       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path838" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/interrupt.svg b/Ghidra/Debug/Debugger/src/main/svg/interrupt.svg
new file mode 100644
index 0000000000..9a70e30785
--- /dev/null
+++ b/Ghidra/Debug/Debugger/src/main/svg/interrupt.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16"
+   id="svg4819"
+   version="1.1"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs4821" />
+  <metadata
+     id="metadata4824">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     y="2.5"
+     x="8.5"
+     height="11"
+     width="5"
+     id="rect819"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.35400641;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.35400641;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect817"
+     width="5"
+     height="11"
+     x="2.5"
+     y="2.5" />
+  <rect
+     y="3"
+     x="3"
+     height="10"
+     width="4"
+     id="rect888"
+     style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1.15470052;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="3"
+     x="9"
+     height="10"
+     width="4"
+     id="rect890"
+     style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1.15470052;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/kill.svg b/Ghidra/Debug/Debugger/src/main/svg/kill.svg
index 3353236304..b70f109290 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/kill.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/kill.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,26 +20,25 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      id="layer1">
-    <path
-       id="path5895"
-       d="M 3.7011719 1.0703125 A 8 8 0 0 0 2 6 A 8 8 0 0 0 10 14 A 8 8 0 0 0 14.964844 12.263672 L 13.726562 10.701172 A 6 6 0 0 1 10 12 A 6 6 0 0 1 4 6 A 6 6 0 0 1 5.2792969 2.3066406 L 3.7011719 1.0703125 z "
-       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path5852"
-       d="M 9.0000781,1 V 2.1308594 A 4,4 0 0 0 7.1485156,3.1992188 L 6.17,2.6347656 5.17,4.3652344 6.1485156,4.9296875 A 4,4 0 0 0 6.0000781,6 4,4 0 0 0 6.1465625,7.0703125 L 5.17,7.6347656 6.17,9.365234 7.1465625,8.800781 A 4,4 0 0 0 9.0000781,9.867188 V 11 H 11.000078 V 9.869141 a 4,4 0 0 0 1.851562,-1.06836 l 0.978516,0.564453 1,-1.7304684 L 13.85164,7.0703125 A 4,4 0 0 0 14.000078,6 4,4 0 0 0 13.853594,4.9296875 l 0.976562,-0.5644531 -1,-1.7304688 -0.976562,0.5644532 A 4,4 0 0 0 11.000078,2.1328125 V 1 Z m 0.9999999,4 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 A 1,1 0 0 1 9.0000781,6 1,1 0 0 1 10.000078,5 Z"
-       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <rect
-       y="10"
-       x="1"
-       height="5"
-       width="5"
+       y="2.5"
+       x="2.5"
+       height="11"
+       width="11"
+       id="rect819"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.19999981;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect838"
-       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       width="10"
+       height="10"
+       x="3"
+       y="3" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/launch.svg b/Ghidra/Debug/Debugger/src/main/svg/launch.svg
index 2ea6d28c0d..eb42347f02 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/launch.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/launch.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,23 +20,27 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.04581916;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10,0 A 6,6 0 0 0 5.6054688,1.9257812 L 3.6152344,0.36914062 3.3066406,0.76171875 C 2.1360722,2.2566877 1.5005523,4.1012735 1.5,6 c 0,4.688498 3.8115019,8.5 8.5,8.5 1.915968,-0.0028 3.775267,-0.653827 5.275391,-1.845703 l 0.390625,-0.310547 -1.5625,-1.972656 A 6,6 0 0 0 16,6 6,6 0 0 0 10,0 Z"
+     id="path833" />
   <g
      id="layer1">
     <path
-       id="path5895"
+       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 3.7011719 1.0703125 A 8 8 0 0 0 2 6 A 8 8 0 0 0 10 14 A 8 8 0 0 0 14.964844 12.263672 L 13.726562 10.701172 A 6 6 0 0 1 10 12 A 6 6 0 0 1 4 6 A 6 6 0 0 1 5.2792969 2.3066406 L 3.7011719 1.0703125 z "
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path5895" />
     <path
-       id="path5852"
+       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.0000781,1 V 2.1308594 A 4,4 0 0 0 7.1485156,3.1992188 L 6.17,2.6347656 5.17,4.3652344 6.1485156,4.9296875 A 4,4 0 0 0 6.0000781,6 4,4 0 0 0 6.1465625,7.0703125 L 5.17,7.6347656 6.17,9.365234 7.1465625,8.800781 A 4,4 0 0 0 9.0000781,9.867188 V 11 H 11.000078 V 9.869141 a 4,4 0 0 0 1.851562,-1.06836 l 0.978516,0.564453 1,-1.7304684 L 13.85164,7.0703125 A 4,4 0 0 0 14.000078,6 4,4 0 0 0 13.853594,4.9296875 l 0.976562,-0.5644531 -1,-1.7304688 -0.976562,0.5644532 A 4,4 0 0 0 11.000078,2.1328125 V 1 Z m 0.9999999,4 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 A 1,1 0 0 1 9.0000781,6 1,1 0 0 1 10.000078,5 Z"
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path5852" />
     <path
-       d="M 4.0000001,16 2.9999999,13 0,12 l 2.9999999,-1 1,-3 1.0000002,3 L 8,12 5.0000001,13 Z"
-       id="path838"
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="rect827"
+       d="M 3.0588236,8.2352937 V 11.058823 H 0.23529412 v 1.882353 H 3.0588236 v 2.82353 h 1.8823528 v -2.82353 H 7.7647058 V 11.058823 H 4.9411764 V 8.2352937 Z"
+       style="fill:#0080ff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/modules.svg b/Ghidra/Debug/Debugger/src/main/svg/modules.svg
new file mode 100644
index 0000000000..00267deb56
--- /dev/null
+++ b/Ghidra/Debug/Debugger/src/main/svg/modules.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="SVGRoot"
+   version="1.1"
+   viewBox="0 0 16 16"
+   height="16px"
+   width="16px">
+  <defs
+     id="defs5287" />
+  <metadata
+     id="metadata5290">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path815"
+     d="M 4,0.5 C 2.0729257,0.5 0.5,2.0729257 0.5,4 V 15.5 H 12 c 1.927074,0 3.5,-1.572926 3.5,-3.5 V 0.5 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.85714287;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 4,1 A 3,3 0 0 0 1,4 3,3 0 0 0 4,7 3,3 0 0 0 6.8261719,5 H 9 v 2 h 2 V 9.1835938 C 9.8371953,9.5967176 9,10.69549 9,12 c 0,1.656854 1.343146,3 3,3 1.656854,0 3,-1.343146 3,-3 0,-1.30451 -0.837195,-2.4032824 -2,-2.8164062 V 7 h 2 V 1 H 9 V 3 H 6.8242188 A 3,3 0 0 0 4,1 Z M 4,3 A 1,1 0 0 1 5,4 1,1 0 0 1 4,5 1,1 0 0 1 3,4 1,1 0 0 1 4,3 Z M 1,9 v 6 H 7 V 9 Z m 2,2 h 2 v 2 H 3 Z"
+     id="path4859" />
+</svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/continue.svg b/Ghidra/Debug/Debugger/src/main/svg/object-populated.svg
similarity index 51%
rename from Ghidra/Debug/Debugger/src/main/svg/continue.svg
rename to Ghidra/Debug/Debugger/src/main/svg/object-populated.svg
index 162f8aee1c..8a68c01cba 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/continue.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/object-populated.svg
@@ -5,34 +5,36 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   width="16px"
+   height="16px"
    viewBox="0 0 16 16"
    version="1.1"
-   id="svg4819"
-   height="16"
-   width="16">
+   id="SVGRoot">
   <defs
-     id="defs4821" />
+     id="defs5287" />
   <metadata
-     id="metadata4824">
+     id="metadata5290">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <circle
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.52294731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path814"
+     cx="8"
+     cy="8"
+     r="4.5" />
   <g
      id="layer1">
     <path
-       id="rect4138-6"
-       d="m 8,4 v 8 l 7,-4 z"
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.76383424;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.76383424;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 2,4 v 8 L 9,8 Z"
-       id="path856" />
+       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8,4 C 5.790861,4 4,5.790861 4,8 c 0,2.209139 1.790861,4 4,4 2.209139,0 4,-1.790861 4,-4 C 12,5.790861 10.209139,4 8,4 Z"
+       id="path821" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/object-running.svg b/Ghidra/Debug/Debugger/src/main/svg/object-running.svg
new file mode 100644
index 0000000000..93f5e2d644
--- /dev/null
+++ b/Ghidra/Debug/Debugger/src/main/svg/object-running.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
+  <defs
+     id="defs5287" />
+  <metadata
+     id="metadata5290">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="rect862"
+     d="M 6.3046875,3.5 C 4.7593192,3.5 3.5,4.7593192 3.5,6.3046875 v 3.390625 C 3.5,11.240681 4.7593192,12.5 6.3046875,12.5 h 3.390625 C 11.240681,12.5 12.5,11.240681 12.5,9.6953125 V 6.3046875 C 12.5,4.7593192 11.240681,3.5 9.6953125,3.5 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <rect
+     ry="2.3050847"
+     y="4"
+     x="4"
+     height="8"
+     width="8"
+     id="rect860"
+     style="fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.55646884;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/object-terminated.svg b/Ghidra/Debug/Debugger/src/main/svg/object-terminated.svg
index 980d822578..9c7275b6ad 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/object-terminated.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/object-terminated.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="16px"
-   height="16px"
-   viewBox="0 0 16 16"
+   id="SVGRoot"
    version="1.1"
-   id="SVGRoot">
+   viewBox="0 0 16 16"
+   height="16px"
+   width="16px">
   <defs
      id="defs5287" />
   <metadata
@@ -24,11 +24,17 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <circle
+     r="4.5"
+     cy="8"
+     cx="8"
+     id="path814"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.52294731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
      id="layer1">
     <path
-       style="opacity:1;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path821"
        d="M 8 4 A 4 4 0 0 0 4 8 A 4 4 0 0 0 8 12 A 4 4 0 0 0 12 8 A 4 4 0 0 0 8 4 z M 8 6 A 2 2 0 0 1 10 8 A 2 2 0 0 1 8 10 A 2 2 0 0 1 6 8 A 2 2 0 0 1 8 6 z "
-       id="path821" />
+       style="opacity:1;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/memory.svg b/Ghidra/Debug/Debugger/src/main/svg/object-unpopulated.svg
similarity index 53%
rename from Ghidra/Debug/Debugger/src/main/svg/memory.svg
rename to Ghidra/Debug/Debugger/src/main/svg/object-unpopulated.svg
index f1ba59159c..7098041a6c 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/memory.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/object-unpopulated.svg
@@ -20,15 +20,22 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <circle
+     r="4.5"
+     cy="8"
+     cx="8"
+     id="path814"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.52294731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
+     style="fill:#aa0000;fill-opacity:1"
      id="layer1">
     <path
-       id="path4859"
-       d="M 4 1 A 3 3 0 0 0 1 4 A 3 3 0 0 0 4 7 A 3 3 0 0 0 6.8261719 5 L 9 5 L 9 7 L 11 7 L 11 9.1835938 C 9.8371953 9.5967176 9 10.69549 9 12 C 9 13.656854 10.343146 15 12 15 C 13.656854 15 15 13.656854 15 12 C 15 10.69549 14.162805 9.5967176 13 9.1835938 L 13 7 L 15 7 L 15 1 L 9 1 L 9 3 L 6.8242188 3 A 3 3 0 0 0 4 1 z M 4 3 A 1 1 0 0 1 5 4 A 1 1 0 0 1 4 5 A 1 1 0 0 1 3 4 A 1 1 0 0 1 4 3 z M 1 9 L 1 15 L 7 15 L 7 9 L 1 9 z M 3 11 L 5 11 L 5 13 L 3 13 L 3 11 z "
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.85714287;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path821"
+       d="M 8 4 A 4 4 0 0 0 4 8 A 4 4 0 0 0 8 12 A 4 4 0 0 0 12 8 A 4 4 0 0 0 8 4 z M 8 6 A 2 2 0 0 1 10 8 A 2 2 0 0 1 8 10 A 2 2 0 0 1 6 8 A 2 2 0 0 1 8 6 z "
+       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/overlay-pencil.svg b/Ghidra/Debug/Debugger/src/main/svg/overlay-pencil.svg
new file mode 100644
index 0000000000..cec162523b
--- /dev/null
+++ b/Ghidra/Debug/Debugger/src/main/svg/overlay-pencil.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg913"
+   version="1.1"
+   viewBox="0 0 4.2333333 4.2333333"
+   height="16"
+   width="16">
+  <defs
+     id="defs907" />
+  <metadata
+     id="metadata910">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-292.76667)"
+     id="layer1">
+    <g
+       transform="translate(92.278163,-80.247377)"
+       id="g5181">
+      <path
+         style="fill:#ffd42a;fill-opacity:1;stroke:none;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -90.161496,376.45363 v -1.32292 l 0.79375,-1.5875 c 0,0 0.264584,-0.52916 0.79375,-0.26458 0.529167,0.26458 0.264584,0.79375 0.264584,0.79375 l -0.79375,1.5875 z"
+         id="path864" />
+      <path
+         style="fill:#ff80b2;fill-opacity:1;stroke:none;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -88.921261,373.20835 c -0.297656,0.0372 -0.446485,0.33486 -0.446485,0.33486 l 1.058334,0.52917 c 0,0 0.264583,-0.52917 -0.264584,-0.79375 -0.132291,-0.0661 -0.248046,-0.0827 -0.347265,-0.0703 z"
+         id="path886" />
+      <path
+         style="fill:#e9ddaf;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -90.161496,375.13071 1.058334,0.52917 -1.058334,0.79375 z"
+         id="path874" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -90.161496,376.45363 0.598929,-0.45306 -0.598929,-0.34069 z"
+         id="path870" />
+      <path
+         id="path872"
+         d="m -90.161496,376.45363 v -1.32292 l 0.79375,-1.5875 c 0,0 0.264584,-0.52916 0.79375,-0.26458 0.529167,0.26458 0.264584,0.79375 0.264584,0.79375 l -0.79375,1.5875 z"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -89.367746,373.54321 1.058334,0.52917"
+         id="path891" />
+    </g>
+  </g>
+</svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/pencil.png b/Ghidra/Debug/Debugger/src/main/svg/pencil.png
deleted file mode 100644
index cd17091c3a..0000000000
Binary files a/Ghidra/Debug/Debugger/src/main/svg/pencil.png and /dev/null differ
diff --git a/Ghidra/Debug/Debugger/src/main/svg/process.svg b/Ghidra/Debug/Debugger/src/main/svg/process.svg
index 1e81213c0e..af6c43bb7a 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/process.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/process.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,23 +20,47 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1">
-    <path
-       id="path5852"
-       d="M 4.0000781,6.0000002 V 7.1308596 A 4,4 0 0 0 2.1485156,8.199219 L 1.17,7.6347658 0.17,9.3652346 1.1485156,9.9296877 A 4,4 0 0 0 1.0000781,11 4,4 0 0 0 1.1465625,12.070313 L 0.17,12.634766 l 1,1.730468 0.9765625,-0.564453 a 4,4 0 0 0 1.8535156,1.066407 V 16 H 6.000078 v -1.130859 a 4,4 0 0 0 1.851562,-1.06836 l 0.978516,0.564453 1,-1.730468 L 8.85164,12.070313 A 4,4 0 0 0 9.000078,11 4,4 0 0 0 8.853594,9.9296877 l 0.976562,-0.5644531 -1,-1.7304688 L 7.853594,8.199219 A 4,4 0 0 0 6.000078,7.1328127 V 6.0000002 Z M 5.000078,10 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 1,1 0 0 1 -0.9999999,-1 1,1 0 0 1 0.9999999,-1 z"
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path898"
-       d="M 1.5449219 0 A 4 4 0 0 0 1.1328125 1 L 0 1 L 0 3 L 1.1308594 3 A 4 4 0 0 0 2.1992188 4.8515625 L 1.6347656 5.8300781 L 3.3652344 6.8300781 L 3.9296875 5.8515625 A 4 4 0 0 0 5 6 A 4 4 0 0 0 6.0703125 5.8535156 L 6.6347656 6.8300781 L 8.3652344 5.8300781 L 7.8007812 4.8535156 A 4 4 0 0 0 8.8671875 3 L 10 3 L 10 1 L 8.8691406 1 A 4 4 0 0 0 8.4550781 0 L 1.5449219 0 z M 5 1 A 1 1 0 0 1 6 2 A 1 1 0 0 1 5 3 A 1 1 0 0 1 4 2 A 1 1 0 0 1 5 1 z "
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path906"
-       d="M 12.365234 6.1699219 L 10.634766 7.1699219 L 11.199219 8.1464844 A 4 4 0 0 0 10.132812 10 L 9 10 L 9 12 L 10.130859 12 A 4 4 0 0 0 11.199219 13.851562 L 10.634766 14.830078 L 12.365234 15.830078 L 12.929688 14.851562 A 4 4 0 0 0 14 15 A 4 4 0 0 0 15.070312 14.853516 L 15.634766 15.830078 L 16 15.619141 L 16 6.3808594 L 15.634766 6.1699219 L 15.070312 7.1484375 A 4 4 0 0 0 14 7 A 4 4 0 0 0 12.929688 7.1464844 L 12.365234 6.1699219 z M 14 10 A 1 1 0 0 1 15 11 A 1 1 0 0 1 14 12 A 1 1 0 0 1 13 11 A 1 1 0 0 1 14 10 z "
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     id="g857">
+    <g
+       id="g886">
+      <circle
+         r="5.5"
+         cy="11"
+         cx="14"
+         id="circle881"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.36729681;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="5.5"
+         cy="2"
+         cx="5"
+         id="circle879"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.36729681;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.36729681;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path814"
+         cx="5"
+         cy="11"
+         r="5.5" />
+    </g>
+    <g
+       id="layer1">
+      <path
+         id="path5852"
+         d="M 4.0000781,6.0000002 V 7.1308596 A 4,4 0 0 0 2.1485156,8.199219 L 1.17,7.6347658 0.17,9.3652346 1.1485156,9.9296877 A 4,4 0 0 0 1.0000781,11 4,4 0 0 0 1.1465625,12.070313 L 0.17,12.634766 l 1,1.730468 0.9765625,-0.564453 a 4,4 0 0 0 1.8535156,1.066407 V 16 H 6.000078 v -1.130859 a 4,4 0 0 0 1.851562,-1.06836 l 0.978516,0.564453 1,-1.730468 L 8.85164,12.070313 A 4,4 0 0 0 9.000078,11 4,4 0 0 0 8.853594,9.9296877 l 0.976562,-0.5644531 -1,-1.7304688 L 7.853594,8.199219 A 4,4 0 0 0 6.000078,7.1328127 V 6.0000002 Z M 5.000078,10 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 1,1 0 0 1 -0.9999999,-1 1,1 0 0 1 0.9999999,-1 z"
+         style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path898"
+         d="M 1.5449219 0 A 4 4 0 0 0 1.1328125 1 L 0 1 L 0 3 L 1.1308594 3 A 4 4 0 0 0 2.1992188 4.8515625 L 1.6347656 5.8300781 L 3.3652344 6.8300781 L 3.9296875 5.8515625 A 4 4 0 0 0 5 6 A 4 4 0 0 0 6.0703125 5.8535156 L 6.6347656 6.8300781 L 8.3652344 5.8300781 L 7.8007812 4.8535156 A 4 4 0 0 0 8.8671875 3 L 10 3 L 10 1 L 8.8691406 1 A 4 4 0 0 0 8.4550781 0 L 1.5449219 0 z M 5 1 A 1 1 0 0 1 6 2 A 1 1 0 0 1 5 3 A 1 1 0 0 1 4 2 A 1 1 0 0 1 5 1 z "
+         style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path906"
+         d="M 12.365234 6.1699219 L 10.634766 7.1699219 L 11.199219 8.1464844 A 4 4 0 0 0 10.132812 10 L 9 10 L 9 12 L 10.130859 12 A 4 4 0 0 0 11.199219 13.851562 L 10.634766 14.830078 L 12.365234 15.830078 L 12.929688 14.851562 A 4 4 0 0 0 14 15 A 4 4 0 0 0 15.070312 14.853516 L 15.634766 15.830078 L 16 15.619141 L 16 6.3808594 L 15.634766 6.1699219 L 15.070312 7.1484375 A 4 4 0 0 0 14 7 A 4 4 0 0 0 12.929688 7.1464844 L 12.365234 6.1699219 z M 14 10 A 1 1 0 0 1 15 11 A 1 1 0 0 1 14 12 A 1 1 0 0 1 13 11 A 1 1 0 0 1 14 10 z "
+         style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/recording.svg b/Ghidra/Debug/Debugger/src/main/svg/record.svg
similarity index 74%
rename from Ghidra/Debug/Debugger/src/main/svg/recording.svg
rename to Ghidra/Debug/Debugger/src/main/svg/record.svg
index 5d9b55b21e..0b2d3278b7 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/recording.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/record.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="16px"
-   height="16px"
-   viewBox="0 0 16 16"
+   id="SVGRoot"
    version="1.1"
-   id="SVGRoot">
+   viewBox="0 0 16 16"
+   height="16px"
+   width="16px">
   <defs
      id="defs5287" />
   <metadata
@@ -25,24 +25,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     transform="matrix(1.5,0,0,1.5,-4,-3.9999972)"
-     id="g3700"
-     style="fill:#000000">
+     id="g858">
+    <circle
+       r="6.5"
+       cy="8"
+       cx="8"
+       id="circle819"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.85714293;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.71428585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="circle3698"
+       cx="8"
+       cy="8"
+       r="6" />
     <circle
        r="4"
        cy="7.9999981"
        cx="8"
-       id="circle3698"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-  <g
-     style="fill:#ff2a2a"
-     id="layer1">
-    <circle
-       style="opacity:1;fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path821"
-       cx="8"
-       cy="7.9999981"
-       r="4" />
+       style="opacity:1;fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/register-marker.svg b/Ghidra/Debug/Debugger/src/main/svg/register-marker.svg
index 6d75f0e38f..5ce488d361 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/register-marker.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/register-marker.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,15 +20,19 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <path
+     id="path814"
+     d="M 10.5,1.7929688 V 3 4.5 h -10 v 7 h 10 v 2.707031 L 16.707031,8 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
   <g
      id="layer1">
     <path
-       id="rect1057"
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 11,3 V 5 H 1 v 6 h 10 v 2 L 16,8 Z M 3,7 h 8 V 9 H 3 Z"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="rect1057" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/registers.svg b/Ghidra/Debug/Debugger/src/main/svg/registers.svg
index b1e5e4d95c..778ed79c6c 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/registers.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/registers.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,15 +20,23 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <g
+     style="fill:#ffffff"
+     id="g816">
+    <path
+       id="path814"
+       d="m 0.5,1.5 v 7 h 2 v 3 h 4 v 3 h 9 v -13 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
   <g
      id="layer1">
     <path
-       id="rect1057"
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 1,2 v 6 h 2 v 3 h 4 v 3 h 8 V 2 Z M 3,4 H 13 V 6 H 3 Z M 5,7 H 7 V 9 H 5 Z m 3,0 h 5 V 9 H 8 Z m 1,3 h 4 v 2 H 9 Z"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="rect1057" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/resume.svg b/Ghidra/Debug/Debugger/src/main/svg/resume.svg
new file mode 100644
index 0000000000..11d119c70f
--- /dev/null
+++ b/Ghidra/Debug/Debugger/src/main/svg/resume.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg4819"
+   height="16"
+   width="16">
+  <defs
+     id="defs4821" />
+  <metadata
+     id="metadata4824">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path842"
+     d="M 3.5,2.1503906 V 13.849609 L 14.029297,8 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#fffffe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="path856"
+     d="M 4,3 V 13 L 13,8 Z"
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.76383424;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/seek-present.svg b/Ghidra/Debug/Debugger/src/main/svg/seek-present.svg
new file mode 100644
index 0000000000..d65f114c2c
--- /dev/null
+++ b/Ghidra/Debug/Debugger/src/main/svg/seek-present.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16"
+   id="svg4819"
+   version="1.1"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs4821" />
+  <metadata
+     id="metadata4824">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path817"
+     d="m 1.5,3.1386719 v 9.7226561 l 6,-3.4277342 V 12.861328 L 16.007812,8 7.5,3.1386719 v 3.4277343 z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect4138-6"
+     d="m 8,4 v 8 l 7,-4 z"
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.76383424;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.76383424;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 2,4 v 8 L 9,8 Z"
+     id="path856" />
+</svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/select-registers.svg b/Ghidra/Debug/Debugger/src/main/svg/select-registers.svg
index 286bb7a162..2a41554bc8 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/select-registers.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/select-registers.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,25 +20,36 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1">
-    <path
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 5,0 v 5 h 1 v 2 h 9 V 0 Z m 2,2 h 6 V 3 H 7 Z m 1,2 h 5 V 5 H 8 Z"
-       id="path4922" />
-    <path
-       id="path4924"
-       d="m 5,9 v 5 h 1 v 2 h 9 V 9 Z m 2,2 h 6 v 1 H 7 Z m 1,2 h 5 v 1 H 8 Z"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="1.5"
-       cy="3.5"
-       cx="2.5"
-       id="path4926"
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 4.5,9.5 v 5 h 1 v 1 h 10 v -6 z"
+     id="path830" />
+  <path
+     id="path826"
+     d="m 4.5,0.5 v 5 h 1 v 1 h 10 v -6 z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <circle
+     r="2"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.33333325;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle824"
+     cx="2.5"
+     cy="3.5" />
+  <path
+     style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 5,1 v 4 h 1 v 1 h 9 V 1 Z m 2,1 h 6 V 3 H 7 Z m 1,2 h 5 V 5 H 8 Z"
+     id="path4922" />
+  <path
+     id="path4924"
+     d="m 5,10 v 4 h 1 v 1 h 9 v -5 z m 2,1 h 6 v 1 H 7 Z m 1,2 h 5 v 1 H 8 Z"
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     r="1.5"
+     cy="3.5"
+     cx="2.5"
+     id="path4926"
+     style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/skipover.svg b/Ghidra/Debug/Debugger/src/main/svg/skipover.svg
index 2711748e65..c4d47a98ef 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/skipover.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/skipover.svg
@@ -5,59 +5,57 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 16 16"
    version="1.1"
-   id="svg5428"
-   height="16"
-   width="16">
-  <defs
-     id="defs5430" />
+   id="svg2"
+   width="16"
+   height="16">
   <metadata
-     id="metadata5433">
+     id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.19106248;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect815"
+     width="14"
+     height="5"
+     x="1"
+     y="10" />
+  <path
+     id="path829"
+     d="M 5,3 H 4.5 C 2,3 2,3 2,5.5 V 11 H 4 V 5.5 C 4,5 4,5 4.5,5 H 5 10.5 C 11,5 11,5 11,5.5 V 9 H 9 l 3,3 3,-3 H 13 V 5.5 C 13,3 13,3 10.5,3 Z"
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 5,3 H 4.5 C 2,3 2,3 2,5.5 V 11 H 4 V 5.5 C 4,5 4,5 4.5,5 H 5 10.5 C 11,5 11,5 11,5.5 V 9 H 9 l 3,3 3,-3 H 13 V 5.5 C 13,3 13,3 10.5,3 Z"
+     id="rect4163" />
   <g
-     id="layer1">
+     id="g826"
+     transform="rotate(45,7.5,12.5)">
     <rect
-       y="1.9999828"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       transform="rotate(90)"
+       y="-10.5"
+       x="11.5"
+       height="6"
+       width="2"
+       id="rect820"
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2.32378983;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <rect
-       y="5.9999828"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138-5"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="rect4163"
-       d="m 1,4 v 7.5 C 1,14 1,14 3.5,14 H 5 v 2 L 8,13 5,10 v 2 H 3.5 C 3,12 3,12 3,11.5 V 4 Z"
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4507"
-       width="6"
-       height="2.0000174"
-       x="9"
-       y="9.9999828" />
-    <rect
-       transform="rotate(45)"
-       y="-4.448771"
-       x="15.76248"
-       height="7.4833283"
-       width="1.0019529"
-       id="rect4512"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00195193;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       transform="scale(-1)"
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2.32378983;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect822"
+       width="2"
+       height="6"
+       x="-8.5"
+       y="-15.5" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/stack.svg b/Ghidra/Debug/Debugger/src/main/svg/stack.svg
index c6c8d32836..f8f77ce27a 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/stack.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/stack.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="16"
-   height="16"
-   id="svg4819"
+   viewBox="0 0 16 16"
    version="1.1"
-   viewBox="0 0 16 16">
+   id="svg4819"
+   height="16"
+   width="16">
   <defs
      id="defs4821" />
   <metadata
@@ -24,28 +24,46 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.52752519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4138-6"
-       width="14"
-       height="2.0000174"
-       x="1"
-       y="2" />
-    <rect
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.52752519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4138"
-       width="14"
-       height="2.0000174"
-       x="1"
-       y="11.999983" />
-    <rect
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.52752519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4138-5"
-       width="14"
-       height="2.0000174"
-       x="1"
-       y="6.9999828" />
-  </g>
+  <rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.93648314;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect826"
+     width="15"
+     height="3"
+     x="0.5"
+     y="6.5" />
+  <rect
+     y="11.5"
+     x="0.5"
+     height="3"
+     width="15"
+     id="rect828"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.93648314;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="1.5"
+     x="0.5"
+     height="3"
+     width="15"
+     id="rect824"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.93648314;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.52752519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4138-6"
+     width="14"
+     height="2.0000174"
+     x="1"
+     y="2" />
+  <rect
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.52752519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4138"
+     width="14"
+     height="2.0000174"
+     x="1"
+     y="11.999983" />
+  <rect
+     style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.52752519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4138-5"
+     width="14"
+     height="2.0000174"
+     x="1"
+     y="6.9999828" />
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/stepback.svg b/Ghidra/Debug/Debugger/src/main/svg/stepback.svg
index 31809cb01d..16f92568b4 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/stepback.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/stepback.svg
@@ -7,50 +7,44 @@
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
    id="svg2"
-   viewBox="0 0 16 16"
-   height="16"
-   width="16">
-  <defs
-     id="defs4" />
+   width="16"
+   height="16">
   <metadata
-     id="metadata7">
+     id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     transform="translate(0,-1036.3622)"
-     id="layer1">
-    <rect
-       y="1038.3622"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="1044.3622"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138-5"
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="1048.3622"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138-6"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="rect4163"
-       d="m 5,1039.3622 0,2 -1.5,0 c -2.5,0 -2.5,0 -2.5,2.5 l 0,5.5 2,0 0,-5.5 c 0,-0.5 0,-0.5 0.5,-0.5 l 1.5,0 -4.759e-4,2 3.0004759,-3 z"
-       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+  <defs
+     id="defs6" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.19106248;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect815"
+     width="14"
+     height="5"
+     x="-15"
+     y="10"
+     transform="scale(-1,1)" />
+  <path
+     id="path829"
+     d="m 11,3 h 0.5 C 14,3 14,3 14,5.5 V 11 H 12 V 5.5 C 12,5 12,5 11.5,5 H 11 5.5 C 5,5 5,5 5,5.5 V 9 H 7 L 4,12 1,9 H 3 V 5.5 C 3,3 3,3 5.5,3 Z"
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     style="fill:#0166a9;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect819"
+     width="3"
+     height="3"
+     x="-10"
+     y="11"
+     transform="scale(-1,1)" />
+  <path
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="m 11,3 h 0.5 C 14,3 14,3 14,5.5 V 11 H 12 V 5.5 C 12,5 12,5 11.5,5 H 11 5.5 C 5,5 5,5 5,5.5 V 9 H 7 L 4,12 1,9 H 3 V 5.5 C 3,3 3,3 5.5,3 Z"
+     id="rect4163" />
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/stepinto.svg b/Ghidra/Debug/Debugger/src/main/svg/stepinto.svg
index 3c50e65ba1..628469626b 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/stepinto.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/stepinto.svg
@@ -5,48 +5,51 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 16 16"
-   version="1.1"
-   id="svg4819"
    height="16"
-   width="16">
-  <defs
-     id="defs4821" />
+   width="16"
+   id="svg2"
+   version="1.1">
   <metadata
-     id="metadata4824">
+     id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1">
-    <rect
-       y="2.9999826"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="6.9999828"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138-5"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="rect4138-6"
-       d="m 13,9 v 2 H 9 v 2 h 4 v 2 l 3,-3 z"
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="rect4163"
-       d="M 5,15 V 13 H 3.5 C 1,13 1,13 1,10.5 V 3 h 2 v 7.5 C 3,11 3,11 3.5,11 H 5 L 4.9995241,9 8,12 Z"
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+  <defs
+     id="defs6" />
+  <rect
+     y="10"
+     x="1"
+     height="5"
+     width="14"
+     id="rect815"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.19106248;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 11,9.0004759 H 9 V 5.5 C 9,3 9,3 6.5,3 H 1 V 5 H 6.5 C 7,5 7,5 7,5.5 V 9.0004759 L 5,9 8,12.000476 Z"
+     id="path834" />
+  <rect
+     y="11"
+     x="2"
+     height="3"
+     width="3"
+     id="rect819"
+     style="fill:#0166a9;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="11"
+     x="11"
+     height="3"
+     width="3"
+     id="rect821"
+     style="fill:#0166a9;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect4163"
+     d="M 11,9.0004759 H 9 V 5.5 C 9,3 9,3 6.5,3 H 1 V 5 H 6.5 C 7,5 7,5 7,5.5 V 9.0004759 L 5,9 8,12.000476 Z"
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/steplast.svg b/Ghidra/Debug/Debugger/src/main/svg/steplast.svg
new file mode 100644
index 0000000000..5eb30d6d2a
--- /dev/null
+++ b/Ghidra/Debug/Debugger/src/main/svg/steplast.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   width="16"
+   height="16">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <path
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 6,2 H 5.5 C 3,2 3,2 3,4.5 V 9 H 5 V 4.5 C 5,4 5,4 5.5,4 H 6 11.5 C 12,4 12,4 12,4.5 V 5 10.5 C 12,11 12,11 11.5,11 H 11 9.6601562 8 V 9 l -3,3 3,3 V 13 H 9.6601562 11 11.5 C 14,13 14,13 14,10.5 V 5 4.5 C 14,2 14,2 11.5,2 Z"
+     id="path839" />
+  <path
+     id="rect4163"
+     d="M 6,2 H 5.5 C 3,2 3,2 3,4.5 V 9 H 5 V 4.5 C 5,4 5,4 5.5,4 H 6 11.5 C 12,4 12,4 12,4.5 V 5 10.5 C 12,11 12,11 11.5,11 H 11 9.6601562 8 V 9 l -3,3 3,3 V 13 H 9.6601562 11 11.5 C 14,13 14,13 14,10.5 V 5 4.5 C 14,2 14,2 11.5,2 Z"
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+</svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/stepout.svg b/Ghidra/Debug/Debugger/src/main/svg/stepout.svg
index 2d60f17b32..e3e7e8ec45 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/stepout.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/stepout.svg
@@ -5,15 +5,12 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="16"
    height="16"
-   id="svg4819"
-   version="1.1"
-   viewBox="0 0 16 16">
-  <defs
-     id="defs4821" />
+   width="16"
+   id="svg2"
+   version="1.1">
   <metadata
-     id="metadata4824">
+     id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -24,29 +21,39 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     y="10"
+     x="1"
+     height="5"
+     width="14"
+     id="rect815"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.19106248;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="11"
+     x="2"
+     height="3"
+     width="3"
+     id="rect819"
+     style="fill:#0166a9;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="11"
+     x="11"
+     height="3"
+     width="3"
+     id="rect821"
+     style="fill:#0166a9;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
-     id="layer1">
+     transform="rotate(-90,8.9786846,4.9786637)"
+     id="g819">
     <path
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 10,1 v 2 h 4 V 5 H 10 V 7.0000002 L 7,4 Z"
-       id="rect4138-6" />
-    <rect
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4138"
-       width="6"
-       height="2.0000174"
-       x="8"
-       y="10.999983" />
-    <rect
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4138-5"
-       width="6"
-       height="2.0000174"
-       x="8"
-       y="7" />
+       id="path834"
+       d="M 11,8.000217 H 9 V 5.5 C 9,3 9,3 6.5,3 H 1 L 1,5 H 6.5 C 7,5 7,5 7,5.5 V 8.000217 L 5,7.9997411 8,11.000217 Z"
+       style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,11 H 2 V 5.499762 c 0,-2.5 0,-2.5 2.5,-2.5 H 7 v 2 H 4.5 c -0.5,0 -0.5,0 -0.5,0.5 V 11 L 6,10.999524 3,14 Z"
+       style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 11,8.000217 H 9 V 5.5 C 9,3 9,3 6.5,3 H 1 L 1,5 H 6.5 C 7,5 7,5 7,5.5 V 8.000217 L 5,7.9997411 8,11.000217 Z"
        id="rect4163" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/stepover.svg b/Ghidra/Debug/Debugger/src/main/svg/stepover.svg
index c76b9a4efa..571d3d4363 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/stepover.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/stepover.svg
@@ -5,51 +5,44 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 16 16"
-   version="1.1"
-   id="svg4819"
    height="16"
-   width="16">
-  <defs
-     id="defs4821" />
+   width="16"
+   id="svg2"
+   version="1.1">
   <metadata
-     id="metadata4824">
+     id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1">
-    <rect
-       y="1.9999828"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="5.9999828"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138-5"
-       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="9.9999828"
-       x="9"
-       height="2.0000174"
-       width="6"
-       id="rect4138-6"
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="rect4163"
-       d="M 5,16 5,14 3.5,14 C 1,14 1,14 1,11.5 L 1,4 3,4 3,11.5 C 3,12 3,12 3.5,12 L 5,12 4.9995241,10 8,13 Z"
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+  <defs
+     id="defs6" />
+  <rect
+     y="10"
+     x="1"
+     height="5"
+     width="14"
+     id="rect815"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.19106248;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 5,3 H 4.5 C 2,3 2,3 2,5.5 V 11 H 4 V 5.5 C 4,5 4,5 4.5,5 H 5 10.5 C 11,5 11,5 11,5.5 V 9 H 9 l 3,3 3,-3 H 13 V 5.5 C 13,3 13,3 10.5,3 Z"
+     id="path829" />
+  <rect
+     y="11"
+     x="6"
+     height="3"
+     width="3"
+     id="rect819"
+     style="fill:#0166a9;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect4163"
+     d="M 5,3 H 4.5 C 2,3 2,3 2,5.5 V 11 H 4 V 5.5 C 4,5 4,5 4.5,5 H 5 10.5 C 11,5 11,5 11,5.5 V 9 H 9 l 3,3 3,-3 H 13 V 5.5 C 13,3 13,3 10.5,3 Z"
+     style="opacity:1;vector-effect:none;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/stop.svg b/Ghidra/Debug/Debugger/src/main/svg/stop.svg
deleted file mode 100644
index b97f9de54a..0000000000
--- a/Ghidra/Debug/Debugger/src/main/svg/stop.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 16 16"
-   version="1.1"
-   id="svg4819"
-   height="16"
-   width="16">
-  <defs
-     id="defs4821" />
-  <metadata
-     id="metadata4824">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <rect
-       y="3"
-       x="3"
-       height="10"
-       width="4"
-       id="rect888"
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1.15470052;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="3"
-       x="9"
-       height="10"
-       width="4"
-       id="rect890"
-       style="opacity:1;fill:#d4aa00;fill-opacity:1;stroke:none;stroke-width:1.15470052;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/thread.svg b/Ghidra/Debug/Debugger/src/main/svg/thread.svg
index a1586d455d..346011e209 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/thread.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/thread.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="SVGRoot"
-   version="1.1"
-   viewBox="0 0 16 16"
+   width="16px"
    height="16px"
-   width="16px">
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot">
   <defs
      id="defs5287" />
   <metadata
@@ -20,15 +20,21 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      id="layer1">
+    <circle
+       r="5.5"
+       cy="8"
+       cx="8"
+       id="path814"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.36729681;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       id="path5852"
+       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 7.0000781,3.0000002 V 4.1308596 A 4,4 0 0 0 5.1485156,5.199219 L 4.17,4.6347658 3.17,6.3652346 4.1485156,6.9296877 A 4,4 0 0 0 4.0000781,8 4,4 0 0 0 4.1465625,9.070313 L 3.17,9.634766 l 1,1.730468 0.9765625,-0.564453 a 4,4 0 0 0 1.8535156,1.066407 V 13 H 9.000078 v -1.130859 a 4,4 0 0 0 1.851562,-1.06836 l 0.978516,0.564453 1,-1.730468 L 11.85164,9.070313 A 4,4 0 0 0 12.000078,8 4,4 0 0 0 11.853594,6.9296877 l 0.976562,-0.5644531 -1,-1.7304688 -0.976562,0.5644532 A 4,4 0 0 0 9.000078,4.1328127 V 3.0000002 Z M 8.000078,7 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 A 1,1 0 0 1 7.0000781,8 1,1 0 0 1 8.000078,7 Z"
-       style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path5852" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/write-disabled.svg b/Ghidra/Debug/Debugger/src/main/svg/write-disabled.svg
index 2af2786bae..c1c1571f12 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/write-disabled.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/write-disabled.svg
@@ -5,12 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 4.2333331 4.2333331"
+   width="15.999999"
    height="15.999999"
-   width="15.999999">
+   viewBox="0 0 4.2333331 4.2333331"
+   version="1.1"
+   id="svg8">
   <defs
      id="defs2" />
   <metadata
@@ -26,24 +25,40 @@
     </rdf:RDF>
   </metadata>
   <g
-     transform="translate(-140.75833,-215.50833)"
-     id="layer1">
-    <image
-       width="4.2333331"
-       height="4.2333331"
-       preserveAspectRatio="none"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAANJJREFU
-OI2dUbsRgzAMfcqlYYSMYUpGoMwKpPMaWcGdXWYFRqAUY2QEypciMQcHAl9USb73kyxT61FSVR+Y
-+6n1kvtrKZldN8+SArPIpcgegKS0+34qUPWBqgqq2xUpSuCwjJ/WN2jeA723D6lPBX4CsQMeCXjd
-HUMIGG6NwDlHqwCQ6kh1BPCdScYYCYBT6+0VRASqOs+x28cdfmPeXeoR+NpvMIdHzETLfZNARDYu
-R+4rgT2yRVqWuUImi4gFWSewwGcpZoGSuKZAXdcYx/EvgQ9cP3cPT6z/fgAAAABJRU5ErkJggg==
-"
-       id="image4638"
-       x="140.75833"
-       y="215.50833" />
+     transform="translate(92.278163,-373.01405)"
+     id="g5181">
     <path
-       id="path4643"
-       d="m 141.16138,215.91138 3.42712,3.42722"
-       style="fill:#ff0000;stroke:#ff0000;stroke-width:0.39167586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:#ffd42a;fill-opacity:1;stroke:none;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -90.161496,376.45363 v -1.32292 l 0.79375,-1.5875 c 0,0 0.264584,-0.52916 0.79375,-0.26458 0.529167,0.26458 0.264584,0.79375 0.264584,0.79375 l -0.79375,1.5875 z"
+       id="path864" />
+    <path
+       style="fill:#ff80b2;fill-opacity:1;stroke:none;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -88.921261,373.20835 c -0.297656,0.0372 -0.446485,0.33486 -0.446485,0.33486 l 1.058334,0.52917 c 0,0 0.264583,-0.52917 -0.264584,-0.79375 -0.132291,-0.0661 -0.248046,-0.0827 -0.347265,-0.0703 z"
+       id="path886" />
+    <path
+       style="fill:#e9ddaf;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -90.161496,375.13071 1.058334,0.52917 -1.058334,0.79375 z"
+       id="path874" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -90.161496,376.45363 0.598929,-0.45306 -0.598929,-0.34069 z"
+       id="path870" />
+    <path
+       id="path872"
+       d="m -90.161496,376.45363 v -1.32292 l 0.79375,-1.5875 c 0,0 0.264584,-0.52916 0.79375,-0.26458 0.529167,0.26458 0.264584,0.79375 0.264584,0.79375 l -0.79375,1.5875 z"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -89.367746,373.54321 1.058334,0.52917"
+       id="path891" />
   </g>
+  <path
+     id="path844"
+     d="m 2.1171834,0.13125814 c -1.091864,0 -1.98592527,0.89406126 -1.98592526,1.98592526 0,1.0918642 0.89424006,1.9838582 1.98592526,1.9838582 1.0916853,0 1.9838582,-0.8921729 1.9838582,-1.9838582 0,-1.0916852 -0.891994,-1.98592527 -1.9838582,-1.98592526 z m 0,0.79375 c 0.6627608,-3e-8 1.1901082,0.52916626 1.1901082,1.19217526 0,0.1799707 -0.074699,0.3322699 -0.1452107,0.4842082 L 1.6324585,1.0707357 C 1.7846572,0.99991123 1.9373132,0.92500814 2.1171834,0.92500814 Z M 1.0707357,1.6324585 2.6013916,3.1620809 c -0.1519383,0.070511 -0.3042375,0.1452107 -0.4842082,0.1452107 -0.663009,0 -1.19217535,-0.5273474 -1.19217532,-1.1901082 0,-0.1798702 0.0749031,-0.3325262 0.14572762,-0.4847249 z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="path4643"
+     transform="scale(0.26458333)"
+     d="M 8.0019531 0.99609375 C 4.1478045 0.99609375 0.99609371 4.1478045 0.99609375 8.0019531 C 0.99609375 11.856102 4.1478045 15 8.0019531 15 C 11.856102 15 15 11.856102 15 8.0019531 C 15 4.1478045 11.856102 0.99609371 8.0019531 0.99609375 z M 8.0019531 2.9960938 C 10.775222 2.9960938 13 5.2286847 13 8.0019531 C 13 9.0253084 12.69344 9.9720494 12.171875 10.761719 L 5.2421875 3.8261719 C 6.0327076 3.3041855 6.9795 2.9960938 8.0019531 2.9960938 z M 3.8261719 5.2421875 L 10.761719 12.171875 C 9.9720494 12.69344 9.0253084 13 8.0019531 13 C 5.2286847 13 2.9960938 10.775222 2.9960938 8.0019531 C 2.9960938 6.9795 3.3041855 6.0327076 3.8261719 5.2421875 z "
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/write-emulator.svg b/Ghidra/Debug/Debugger/src/main/svg/write-emulator.svg
index 7d4627d504..82bf822dd7 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/write-emulator.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/write-emulator.svg
@@ -5,12 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 4.2333331 4.2333331"
+   width="15.999999"
    height="15.999999"
-   width="15.999999">
+   viewBox="0 0 4.2333331 4.2333331"
+   version="1.1"
+   id="svg8">
   <defs
      id="defs2" />
   <metadata
@@ -26,11 +25,32 @@
     </rdf:RDF>
   </metadata>
   <g
-     transform="translate(-140.75833,-215.50833)"
-     id="layer1">
+     id="g857"
+     transform="matrix(0.26458333,0,0,0.26458333,-8.6817406e-5,8.6605656e-5)">
     <g
-       transform="matrix(0.26458333,0,0,0.26458333,140.75833,215.50833)"
-       id="layer1-5">
+       id="g886"
+       transform="translate(3.2812024e-4,-3.2800024e-4)">
+      <circle
+         r="5.5"
+         cy="11"
+         cx="14"
+         id="circle881"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.36729681;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="5.5"
+         cy="2"
+         cx="5"
+         id="circle879"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.36729681;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.36729681;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path814"
+         cx="5"
+         cy="11"
+         r="5.5" />
+    </g>
+    <g
+       id="layer1">
       <path
          id="path5852"
          d="M 4.0000781,6.0000002 V 7.1308596 A 4,4 0 0 0 2.1485156,8.199219 L 1.17,7.6347658 0.17,9.3652346 1.1485156,9.9296877 A 4,4 0 0 0 1.0000781,11 4,4 0 0 0 1.1465625,12.070313 L 0.17,12.634766 l 1,1.730468 0.9765625,-0.564453 a 4,4 0 0 0 1.8535156,1.066407 V 16 H 6.000078 v -1.130859 a 4,4 0 0 0 1.851562,-1.06836 l 0.978516,0.564453 1,-1.730468 L 8.85164,12.070313 A 4,4 0 0 0 9.000078,11 4,4 0 0 0 8.853594,9.9296877 l 0.976562,-0.5644531 -1,-1.7304688 L 7.853594,8.199219 A 4,4 0 0 0 6.000078,7.1328127 V 6.0000002 Z M 5.000078,10 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 1,1 0 0 1 -0.9999999,-1 1,1 0 0 1 0.9999999,-1 z"
@@ -44,13 +64,33 @@
          d="m 12.365234,6.1699219 -1.730468,1 0.564453,0.9765625 A 4,4 0 0 0 10.132812,10 H 9 v 2 h 1.130859 a 4,4 0 0 0 1.06836,1.851562 l -0.564453,0.978516 1.730468,1 0.564454,-0.978516 A 4,4 0 0 0 14,15 4,4 0 0 0 15.070312,14.853516 L 15.634766,15.830078 16,15.619141 V 6.3808594 L 15.634766,6.1699219 15.070312,7.1484375 A 4,4 0 0 0 14,7 4,4 0 0 0 12.929688,7.1464844 Z M 14,10 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 1,1 0 0 1 -1,-1 1,1 0 0 1 1,-1 z"
          style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
-    <image
-       width="4.2333331"
-       height="4.2333331"
-       preserveAspectRatio="none"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAG1BMVEUxMTEAAACcYwCcnJzOzs73 Smv/Y2P/zjH///8dghBMAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsT AQCanBgAAAAHdElNRQfmAxgRMR1me/WzAAAAN0lEQVQI12NgAAFBATDFwJiWCGWIQRkihVCGeCFE DaN7EZRRLghVUq6IqoRBsAjGgCphgPIJAwBLAAY82pfN3gAAAABJRU5ErkJggg== "
-       id="image4544"
-       x="140.75833"
-       y="215.50833" />
+  </g>
+  <g
+     transform="translate(92.278163,-373.01405)"
+     id="g5181">
+    <path
+       style="fill:#ffd42a;fill-opacity:1;stroke:none;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -90.161496,376.45363 v -1.32292 l 0.79375,-1.5875 c 0,0 0.264584,-0.52916 0.79375,-0.26458 0.529167,0.26458 0.264584,0.79375 0.264584,0.79375 l -0.79375,1.5875 z"
+       id="path864" />
+    <path
+       style="fill:#ff80b2;fill-opacity:1;stroke:none;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -88.921261,373.20835 c -0.297656,0.0372 -0.446485,0.33486 -0.446485,0.33486 l 1.058334,0.52917 c 0,0 0.264583,-0.52917 -0.264584,-0.79375 -0.132291,-0.0661 -0.248046,-0.0827 -0.347265,-0.0703 z"
+       id="path886" />
+    <path
+       style="fill:#e9ddaf;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -90.161496,375.13071 1.058334,0.52917 -1.058334,0.79375 z"
+       id="path874" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -90.161496,376.45363 0.598929,-0.45306 -0.598929,-0.34069 z"
+       id="path870" />
+    <path
+       id="path872"
+       d="m -90.161496,376.45363 v -1.32292 l 0.79375,-1.5875 c 0,0 0.264584,-0.52916 0.79375,-0.26458 0.529167,0.26458 0.264584,0.79375 0.264584,0.79375 l -0.79375,1.5875 z"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -89.367746,373.54321 1.058334,0.52917"
+       id="path891" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/write-target.svg b/Ghidra/Debug/Debugger/src/main/svg/write-target.svg
index c559e002f5..fc3f940bd6 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/write-target.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/write-target.svg
@@ -5,12 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 4.2333331 4.2333331"
+   width="15.999999"
    height="15.999999"
-   width="15.999999">
+   viewBox="0 0 4.2333331 4.2333331"
+   version="1.1"
+   id="svg8">
   <defs
      id="defs2" />
   <metadata
@@ -26,40 +25,59 @@
     </rdf:RDF>
   </metadata>
   <g
-     transform="translate(-140.75833,-215.50833)"
      id="layer1">
     <g
-       transform="matrix(0.26458333,0,0,0.26458333,140.75833,215.50833)"
-       id="g4579">
-      <g
-         transform="matrix(1.5,0,0,1.5,-4,-3.9999972)"
-         id="g3700"
-         style="fill:#000000">
-        <circle
-           r="4"
-           cy="7.9999981"
-           cx="8"
-           id="circle3698"
-           style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-      <g
-         style="fill:#ff2a2a"
-         id="layer1-6">
-        <circle
-           style="opacity:1;fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path821"
-           cx="8"
-           cy="7.9999981"
-           r="4" />
-      </g>
+       transform="scale(0.26458333)"
+       id="g858"
+       style="">
+      <circle
+         r="6.5"
+         cy="8"
+         cx="8"
+         id="circle819"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.85714293;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.71428585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle3698"
+         cx="8"
+         cy="8"
+         r="6" />
+      <circle
+         r="4"
+         cy="7.9999981"
+         cx="8"
+         id="path821"
+         style="opacity:1;fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+  <g
+     id="layer2">
+    <g
+       id="g5189">
+      <path
+         style="fill:#ffd42a;fill-opacity:1;stroke:none;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 2.1166667,3.4395831 V 2.1166664 l 0.79375,-1.58749998 c 0,0 0.2645833,-0.52916667232633 0.79375,-0.26458334 C 4.2333334,0.52916642 3.96875,1.0583331 3.96875,1.0583331 l -0.79375,1.5875 z"
+         id="path864" />
+      <path
+         style="fill:#ff80b2;fill-opacity:1;stroke:none;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 3.356901,0.19430338 C 3.0592448,0.23151042 2.9104166,0.52916666 2.9104166,0.52916666 L 3.96875,1.0583333 c 0,0 0.2645833,-0.52916664 -0.2645834,-0.79374997 C 3.571875,0.19843753 3.4561198,0.18190103 3.356901,0.19430338 Z"
+         id="path886" />
+      <path
+         style="fill:#e9ddaf;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 2.1166667,2.1166664 3.175,2.645833 2.1166667,3.439583 Z"
+         id="path874" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 2.1166667,3.439583 2.7155952,2.9865203 2.1166667,2.645833 Z"
+         id="path870" />
+      <path
+         id="path872"
+         d="M 2.1166667,3.4395831 V 2.1166664 l 0.79375,-1.58749998 c 0,0 0.2645833,-0.52916667232633 0.79375,-0.26458334 C 4.2333334,0.52916642 3.96875,1.0583331 3.96875,1.0583331 l -0.79375,1.5875 z"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 2.9104166,0.5291664 3.96875,1.0583331"
+         id="path891" />
     </g>
-    <image
-       width="4.2333331"
-       height="4.2333331"
-       preserveAspectRatio="none"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAG1BMVEUxMTEAAACcYwCcnJzOzs73 Smv/Y2P/zjH///8dghBMAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsT AQCanBgAAAAHdElNRQfmAxgRMR1me/WzAAAAN0lEQVQI12NgAAFBATDFwJiWCGWIQRkihVCGeCFE DaN7EZRRLghVUq6IqoRBsAjGgCphgPIJAwBLAAY82pfN3gAAAABJRU5ErkJggg== "
-       id="image4544"
-       x="140.75833"
-       y="215.50833" />
   </g>
 </svg>
diff --git a/Ghidra/Debug/Debugger/src/main/svg/write-trace.svg b/Ghidra/Debug/Debugger/src/main/svg/write-trace.svg
index 6edb3492dd..484ce7ba7a 100644
--- a/Ghidra/Debug/Debugger/src/main/svg/write-trace.svg
+++ b/Ghidra/Debug/Debugger/src/main/svg/write-trace.svg
@@ -6,11 +6,11 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 4.2333331 4.2333331"
+   width="15.999999"
    height="15.999999"
-   width="15.999999">
+   viewBox="0 0 4.2333331 4.2333331"
+   version="1.1"
+   id="svg8">
   <defs
      id="defs2" />
   <metadata
@@ -25,24 +25,39 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <image
+     width="4.2333331"
+     height="4.2333331"
+     preserveAspectRatio="none"
+     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEEDDonMwh5AwAAADV0RVh0Q29tbWVudAAoYykgMjAw NCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJTVCQ2YtvAAACg0lEQVQ4y52T30tT YRjHP+ec6ZxnxjbEmw3NYrpjWmpqGSpECf2gCNb02qsu6loEqTtB/AdCCIzubAai+CvNQL0QkpLQ nbOoC/XCaTGlneN25qZduEnaTfXcvO8Lz/Pheb/f5xE4Fb19PR1AAKgDXEAUWAKCXZ3dA6fzhd8K LwL9NdW1VxVFQc6Xj5OMPQNVVfm0/HEReNTV2f35BCBTPB3wtxXZC+zoRgwzmSB9kEYSJay5edjl AvSYTvDN622gNQsRM6D+gL+tSJAgpK2wvrGGmTQBMJMm6xtrhLQVBAkC/rYioD/bgdTb19NRU137 uLikmK/fvrC/v08opBLWwnjLvExOTBGN7uByOYnpMdxuDwKCp7KqYn1menZZBAKKoqAbMQA0Lcz8 3AKGbhz9XzeYn1tA08IA6EYMRVHICI0FqJPzZbZ+/MThdBCPx1EUH/cf3AM4PuPxOA6nAzOZwHHG ScYlLBmrSB+ksVgs3Ll7+4RNVquVQPvD43f6IJ29urIiRgEkUSKVSjE+NkFwcAjTzIhomgQHhxgf myCVSiGJUhYQzQKWjD0Da24euzu72Gw2VFVjZHgUgJHhUVRVw2azsbuzizU3D2PPIDNciEBQVVXs cgEAPl85zS1NyPajQZLtMs0tTfh85QDY5QJUVQUIAkgz07PLlVUVt7znvR6H00FMjyEIAg1X6hFF kdJzpUQ2I6yvbdDYeI1kIsm79zOLXZ3dTwAkgJutNz6E1FV/he+C7HZ7KCwsBODw8JAcSw5l3nLq 6xpIJpK8fDUQjUS2np0tLbGGVtXNf9qFqbeTX7e3v0+ZpnkdmANeCP+zjYF2/2XgOTD6B+BvI9Du fwpc+gUuhglRSTLyIQAAAABJRU5ErkJggg== "
+     id="image4608"
+     x="1.2988281e-06"
+     y="1.2988281e-06" />
   <g
-     transform="translate(-140.75833,-215.50833)"
-     id="layer1">
-    <image
-       width="4.2333331"
-       height="4.2333331"
-       preserveAspectRatio="none"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEEDDonMwh5AwAAADV0RVh0Q29tbWVudAAoYykgMjAw NCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJTVCQ2YtvAAACg0lEQVQ4y52T30tT YRjHP+ec6ZxnxjbEmw3NYrpjWmpqGSpECf2gCNb02qsu6loEqTtB/AdCCIzubAai+CvNQL0QkpLQ nbOoC/XCaTGlneN25qZduEnaTfXcvO8Lz/Pheb/f5xE4Fb19PR1AAKgDXEAUWAKCXZ3dA6fzhd8K LwL9NdW1VxVFQc6Xj5OMPQNVVfm0/HEReNTV2f35BCBTPB3wtxXZC+zoRgwzmSB9kEYSJay5edjl AvSYTvDN622gNQsRM6D+gL+tSJAgpK2wvrGGmTQBMJMm6xtrhLQVBAkC/rYioD/bgdTb19NRU137 uLikmK/fvrC/v08opBLWwnjLvExOTBGN7uByOYnpMdxuDwKCp7KqYn1menZZBAKKoqAbMQA0Lcz8 3AKGbhz9XzeYn1tA08IA6EYMRVHICI0FqJPzZbZ+/MThdBCPx1EUH/cf3AM4PuPxOA6nAzOZwHHG ScYlLBmrSB+ksVgs3Ll7+4RNVquVQPvD43f6IJ29urIiRgEkUSKVSjE+NkFwcAjTzIhomgQHhxgf myCVSiGJUhYQzQKWjD0Da24euzu72Gw2VFVjZHgUgJHhUVRVw2azsbuzizU3D2PPIDNciEBQVVXs cgEAPl85zS1NyPajQZLtMs0tTfh85QDY5QJUVQUIAkgz07PLlVUVt7znvR6H00FMjyEIAg1X6hFF kdJzpUQ2I6yvbdDYeI1kIsm79zOLXZ3dTwAkgJutNz6E1FV/he+C7HZ7KCwsBODw8JAcSw5l3nLq 6xpIJpK8fDUQjUS2np0tLbGGVtXNf9qFqbeTX7e3v0+ZpnkdmANeCP+zjYF2/2XgOTD6B+BvI9Du fwpc+gUuhglRSTLyIQAAAABJRU5ErkJggg== "
-       id="image4608"
-       x="140.75833"
-       y="215.50833" />
-    <image
-       width="4.2333331"
-       height="4.2333331"
-       preserveAspectRatio="none"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAG1BMVEUxMTEAAACcYwCcnJzOzs73 Smv/Y2P/zjH///8dghBMAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsT AQCanBgAAAAHdElNRQfmAxgRMR1me/WzAAAAN0lEQVQI12NgAAFBATDFwJiWCGWIQRkihVCGeCFE DaN7EZRRLghVUq6IqoRBsAjGgCphgPIJAwBLAAY82pfN3gAAAABJRU5ErkJggg== "
-       id="image4544"
-       x="140.75833"
-       y="215.50833" />
+     id="g5189">
+    <path
+       style="fill:#ffd42a;fill-opacity:1;stroke:none;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.1166667,3.4395831 V 2.1166664 l 0.79375,-1.58749998 c 0,0 0.2645833,-0.52916667232633 0.79375,-0.26458334 C 4.2333334,0.52916642 3.96875,1.0583331 3.96875,1.0583331 l -0.79375,1.5875 z"
+       id="path864" />
+    <path
+       style="fill:#ff80b2;fill-opacity:1;stroke:none;stroke-width:0.13229166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.356901,0.19430338 C 3.0592448,0.23151042 2.9104166,0.52916666 2.9104166,0.52916666 L 3.96875,1.0583333 c 0,0 0.2645833,-0.52916664 -0.2645834,-0.79374997 C 3.571875,0.19843753 3.4561198,0.18190103 3.356901,0.19430338 Z"
+       id="path886" />
+    <path
+       style="fill:#e9ddaf;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 2.1166667,2.1166664 3.175,2.645833 2.1166667,3.439583 Z"
+       id="path874" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 2.1166667,3.439583 2.7155952,2.9865203 2.1166667,2.645833 Z"
+       id="path870" />
+    <path
+       id="path872"
+       d="M 2.1166667,3.4395831 V 2.1166664 l 0.79375,-1.58749998 c 0,0 0.2645833,-0.52916667232633 0.79375,-0.26458334 C 4.2333334,0.52916642 3.96875,1.0583331 3.96875,1.0583331 l -0.79375,1.5875 z"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.13229167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.9104166,0.5291664 3.96875,1.0583331"
+       id="path891" />
   </g>
 </svg>