diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin3Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin3Test.java
index f1eb4aff49..a03922ea72 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin3Test.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin3Test.java
@@ -390,8 +390,7 @@ public class SearchTextPlugin3Test extends AbstractGhidraHeadedIntegrationTest {
 
 		Collections.sort(list);
 		Collections.reverse(list);
-		for (int i = 0; i < list.size(); i++) {
-			Address addr = list.get(i);
+		for (Address addr : list) {
 			pressSearchButton(dialog, searchButton);
 			ProgramLocation loc = cbPlugin.getCurrentLocation();
 			assertEquals(addr, loc.getAddress());
@@ -627,7 +626,8 @@ public class SearchTextPlugin3Test extends AbstractGhidraHeadedIntegrationTest {
 		setToggleButtonSelected(cb, true);
 
 		// install our own task monitor so we can cancel before the task finishes
-		CancellingStubTaskMonitorComponent testMonitor = new CancellingStubTaskMonitorComponent();
+		CancellingStubTaskMonitorComponent testMonitor =
+			runSwing(() -> new CancellingStubTaskMonitorComponent());
 		setInstanceField("taskMonitorComponent", dialog, testMonitor);
 
 		setText(tf, "hello");
diff --git a/Ghidra/Framework/Gui/certification.manifest b/Ghidra/Framework/Gui/certification.manifest
index 9e2c066941..866ff3ec78 100644
--- a/Ghidra/Framework/Gui/certification.manifest
+++ b/Ghidra/Framework/Gui/certification.manifest
@@ -46,6 +46,7 @@ src/main/resources/images/information.png||FAMFAMFAM Icons - CC 2.5|||famfamfam
 src/main/resources/images/kgpg.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END|
 src/main/resources/images/left.alternate.png||GHIDRA||||END|
 src/main/resources/images/left.png||GHIDRA||||END|
+src/main/resources/images/list-remove.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
 src/main/resources/images/locationIn.gif||GHIDRA||||END|
 src/main/resources/images/locationOut.gif||GHIDRA||||END|
 src/main/resources/images/openFolder.png||Modified Nuvola Icons - LGPL 2.1||||END|
diff --git a/Ghidra/Framework/Docking/src/main/resources/images/list-remove.png b/Ghidra/Framework/Gui/src/main/resources/images/list-remove.png
similarity index 100%
rename from Ghidra/Framework/Docking/src/main/resources/images/list-remove.png
rename to Ghidra/Framework/Gui/src/main/resources/images/list-remove.png
diff --git a/Ghidra/Framework/Help/src/main/java/help/HelpBuildUtils.java b/Ghidra/Framework/Help/src/main/java/help/HelpBuildUtils.java
index 25c2cd7216..56f4a6f429 100644
--- a/Ghidra/Framework/Help/src/main/java/help/HelpBuildUtils.java
+++ b/Ghidra/Framework/Help/src/main/java/help/HelpBuildUtils.java
@@ -491,6 +491,7 @@ public class HelpBuildUtils {
 		catch (FileSystemNotFoundException e) {
 			try {
 				FileSystems.newFileSystem(uri, Collections.emptyMap());
+				return Paths.get(uri);
 			}
 			catch (IOException e1) {
 				debug("Exception loading filesystem for uri: " + uri + "\n\t" + e1.getMessage());