diff --git a/Ghidra/Debug/Debugger/certification.manifest b/Ghidra/Debug/Debugger/certification.manifest
index 9f3c7f66f3..bf1ca8156f 100644
--- a/Ghidra/Debug/Debugger/certification.manifest
+++ b/Ghidra/Debug/Debugger/certification.manifest
@@ -114,6 +114,7 @@ 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/emulator32.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|
@@ -123,7 +124,6 @@ src/main/resources/images/object-running.png||GHIDRA||||END|
 src/main/resources/images/object-terminated.png||GHIDRA||||END|
 src/main/resources/images/object-unpopulated.png||GHIDRA||||END|
 src/main/resources/images/process.png||GHIDRA||||END|
-src/main/resources/images/process32.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|
@@ -162,6 +162,7 @@ src/main/svg/console.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/emulator32.svg||GHIDRA||||END|
 src/main/svg/interrupt.svg||GHIDRA||||END|
 src/main/svg/kill.svg||GHIDRA||||END|
 src/main/svg/launch.svg||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger/src/main/resources/defaultTools/Emulator.tool b/Ghidra/Debug/Debugger/src/main/resources/defaultTools/Emulator.tool
index e5502b6c61..2c4f19c0f5 100644
--- a/Ghidra/Debug/Debugger/src/main/resources/defaultTools/Emulator.tool
+++ b/Ghidra/Debug/Debugger/src/main/resources/defaultTools/Emulator.tool
@@ -3,7 +3,7 @@
     <SUPPORTED_DATA_TYPE CLASS_NAME="ghidra.program.model.listing.Program" />
     <SUPPORTED_DATA_TYPE CLASS_NAME="ghidra.program.model.listing.DataTypeArchive" />
     <SUPPORTED_DATA_TYPE CLASS_NAME="ghidra.trace.model.Trace" />
-    <ICON LOCATION="process32.png" />
+    <ICON LOCATION="emulator32.png" />
     <TOOL TOOL_NAME="Emulator" INSTANCE_NAME="">
         <OPTIONS />
         <PACKAGE NAME="Ghidra Core">
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/emulator32.png b/Ghidra/Debug/Debugger/src/main/resources/images/emulator32.png
new file mode 100644
index 0000000000..c4ef1490ca
Binary files /dev/null and b/Ghidra/Debug/Debugger/src/main/resources/images/emulator32.png differ
diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/process32.png b/Ghidra/Debug/Debugger/src/main/resources/images/process32.png
deleted file mode 100644
index 139ac4a07d..0000000000
Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/process32.png and /dev/null differ
diff --git a/Ghidra/Debug/Debugger/src/main/svg/emulator32.svg b/Ghidra/Debug/Debugger/src/main/svg/emulator32.svg
new file mode 100644
index 0000000000..e36f7de797
--- /dev/null
+++ b/Ghidra/Debug/Debugger/src/main/svg/emulator32.svg
@@ -0,0 +1,54 @@
+<?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 32 32"
+   height="32"
+   width="32">
+  <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>
+  <g
+     transform="translate(0,16)"
+     id="g857">
+    <g
+       id="g901">
+      <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.71428585;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 6.3613281,1.0839844 2.28125,3.4414062 3.328125,5.2519531 C 2.8635664,5.8229591 2.5006536,6.4540816 2.2402344,7.1425781 H 0.14257812 V 11.857422 H 2.2382812 c 0.2611916,0.688197 0.6246541,1.318197 1.0898438,1.888672 l -1.046875,1.8125 3.3378906,1.927734 c -0.4832505,0.231824 -0.945809,0.49978 -1.3652344,0.841797 l -1.8125,-1.046875 -2.35742183,4.080078 1.71679683,0.990234 C 1.7346818,22.73279 1.643479,23.110301 1.6425781,23.498047 V 23.5 c 2.193e-4,0.387302 0.092923,0.765567 0.1582031,1.146484 L 0.08398437,25.638672 2.4414062,29.71875 4.2519531,28.671875 c 0.5710059,0.464558 1.2021286,0.827471 1.890625,1.087891 v 2.097656 h 4.7148439 v -2.095703 c 0.688197,-0.261192 1.318197,-0.624654 1.888672,-1.089844 l 1.8125,1.046875 1.927734,-3.337891 c 0.231824,0.483251 0.499779,0.945809 0.841797,1.365235 l -1.046875,1.8125 4.080078,2.357422 0.990234,-1.716797 c 0.381229,0.0661 0.758739,0.157302 1.146485,0.158203 H 22.5 c 0.387301,-2.19e-4 0.765567,-0.09292 1.146484,-0.158203 l 0.992188,1.716797 4.080078,-2.357422 -1.046875,-1.810547 c 0.464558,-0.571006 0.827472,-1.202129 1.087891,-1.890625 h 2.097656 V 21.142578 H 30 28.761719 c -0.261191,-0.688197 -0.624655,-1.318197 -1.089844,-1.888672 l 1.046875,-1.8125 -4.080078,-2.357422 -0.990234,1.716797 c -0.381229,-0.0661 -0.758739,-0.157302 -1.146485,-0.158203 H 22.5 c -0.387301,2.19e-4 -0.765567,0.09292 -1.146484,0.158203 l -0.992188,-1.716797 -4.080078,2.357422 1.046875,1.810547 c -0.341835,0.420162 -0.61037,0.883019 -0.841797,1.367188 l -1.927734,-3.337891 -1.810547,1.046875 c -0.420162,-0.341835 -0.883019,-0.61037 -1.367188,-0.841797 l 3.337891,-1.927734 -1.046875,-1.810547 c 0.464558,-0.571006 0.827472,-1.202129 1.087891,-1.890625 h 2.097656 V 7.1425781 H 16 14.761719 C 14.500528,6.4543804 14.137065,5.8243812 13.671875,5.2539062 L 14.71875,3.4414062 10.638672,1.0839844 9.6484375,2.8007812 C 9.2672105,2.7346812 8.8896988,2.6434791 8.5019531,2.6425781 H 8.5 c -0.3873016,2.19e-4 -0.7655669,0.09292 -1.1464844,0.1582031 z M 8.5,8.8574219 C 8.8651926,8.857422 9.1425781,9.1348074 9.1425781,9.5 9.1425781,9.8651926 8.8651926,10.142578 8.5,10.142578 8.1348073,10.142578 7.8574219,9.8651927 7.8574219,9.5 7.8574219,9.1348073 8.1348073,8.8574219 8.5,8.8574219 Z m 0,14.0000001 c 0.3651926,0 0.6425781,0.277385 0.6425781,0.642578 0,0.365193 -0.2773855,0.642578 -0.6425781,0.642578 -0.3651927,0 -0.6425781,-0.277385 -0.6425781,-0.642578 0,-0.365193 0.2773854,-0.642578 0.6425781,-0.642578 z m 14,0 c 0.365193,0 0.642578,0.277385 0.642578,0.642578 0,0.365193 -0.277385,0.642578 -0.642578,0.642578 -0.365193,0 -0.642578,-0.277385 -0.642578,-0.642578 0,-0.365193 0.277385,-0.642578 0.642578,-0.642578 z"
+         transform="translate(0,-16)"
+         id="path864" />
+      <g
+         id="g862">
+        <path
+           id="path842"
+           d="m 30.000001,6 h -1.69629 A 6,6 0 0 0 26.701173,3.2226557 L 27.547852,1.7548829 24.952149,0.25488285 24.105469,1.7226562 A 6,6 0 0 0 22.500001,1.5 6,6 0 0 0 20.894532,1.7197266 L 20.047852,0.25488285 17.45215,1.7548829 18.29883,3.2197261 A 6,6 0 0 0 16.699219,6 H 15 v 3 h 1.69629 a 6,6 0 0 0 1.60254,2.777343 l -0.84668,1.467774 2.595702,1.5 0.84668,-1.467774 A 6,6 0 0 0 22.500001,13.5 6,6 0 0 0 24.105469,13.280274 l 0.84668,1.464843 2.595703,-1.5 -0.846679,-1.464843 A 6,6 0 0 0 28.30078,9 h 1.699221 z m -6,1.5 a 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 1.5,1.5 0 0 1 1.5,1.5 z"
+           style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.71428585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.71428585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 16,-8 h -1.696289 a 6,6 0 0 0 -1.602539,-2.777345 l 0.846679,-1.467772 -2.595703,-1.5 -0.84668,1.467773 A 6,6 0 0 0 8.5000005,-12.5 6,6 0 0 0 6.8945309,-12.280274 l -0.8466795,-1.464843 -2.595702,1.5 0.8466795,1.464843 A 6,6 0 0 0 2.6992185,-8 H 1 v 3 h 1.696289 a 6,6 0 0 0 1.6025399,2.777343 l -0.8466795,1.467774 2.595702,1.5 0.8466795,-1.467774 A 6,6 0 0 0 8.5000005,-0.5 6,6 0 0 0 10.105468,-0.719726 l 0.84668,1.464843 2.595703,-1.5 -0.846679,-1.464843 A 6,6 0 0 0 14.30078,-5 H 16 Z m -6,1.5 A 1.5,1.5 0 0 1 8.5000005,-5 1.5,1.5 0 0 1 7.0000004,-6.5 1.5,1.5 0 0 1 8.5000005,-8 1.5,1.5 0 0 1 10,-6.5 Z"
+           id="path840" />
+        <path
+           id="path5852"
+           d="M 7.0001174,3e-7 V 1.6962894 A 6,6 0 0 0 4.2227737,3.2988285 l -1.4677734,-0.8466798 -1.5,2.5957032 1.4677734,0.8466796 A 6,6 0 0 0 2.5001175,7.5 6,6 0 0 0 2.719844,9.1054695 l -1.4648437,0.8466795 1.5,2.595702 1.4648437,-0.846679 a 6,6 0 0 0 2.7802734,1.59961 V 15 h 2.9999996 v -1.696289 a 6,6 0 0 0 2.777343,-1.60254 l 1.467774,0.84668 1.5,-2.595702 L 14.27746,9.1054695 A 6,6 0 0 0 14.500117,7.5 6,6 0 0 0 14.280391,5.8945315 l 1.464843,-0.8466796 -1.5,-2.5957032 -1.464843,0.8466798 A 6,6 0 0 0 10.000117,1.699219 V 3e-7 Z M 8.5001173,6 A 1.5,1.5 0 0 1 10.000117,7.5 1.5,1.5 0 0 1 8.5001173,9 1.5,1.5 0 0 1 7.0001175,7.5 1.5,1.5 0 0 1 8.5001173,6 Z"
+           style="opacity:1;fill:#2c5aa0;fill-opacity:1;stroke:none;stroke-width:1.71428585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>