diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java
index c991795cce..fcca577c35 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java
@@ -91,7 +91,7 @@ public class OpenOSRSPlugin extends Plugin
 	{
 		ExternalPluginManagerPanel panel = injector.getInstance(ExternalPluginManagerPanel.class);
 
-		final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "externalmanager_icon.png");
+		final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "externalmanager_icon.png");
 
 		navButton = NavigationButton.builder()
 			.tooltip("External Plugin Manager")
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/ExternalPluginManagerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/ExternalPluginManagerPanel.java
index c4c4ee8390..67212c8cfc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/ExternalPluginManagerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/ExternalPluginManagerPanel.java
@@ -9,7 +9,6 @@ import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.concurrent.ScheduledExecutorService;
 import javax.inject.Inject;
 import javax.swing.ImageIcon;
 import javax.swing.JCheckBox;
@@ -37,9 +36,9 @@ public class ExternalPluginManagerPanel extends PluginPanel
 	static
 	{
 		final BufferedImage addIconRaw =
-			ImageUtil.getResourceStreamFromClass(ExternalPluginManagerPanel.class, "add_raw_icon.png");
+			ImageUtil.loadImageResource(ExternalPluginManagerPanel.class, "add_raw_icon.png");
 		final BufferedImage addIconGh = ImageUtil
-			.resizeImage(ImageUtil.getResourceStreamFromClass(ExternalPluginManagerPanel.class, "gh_icon.png"), 14, 14);
+			.resizeImage(ImageUtil.loadImageResource(ExternalPluginManagerPanel.class, "gh_icon.png"), 14, 14);
 		ADD_ICON_RAW = new ImageIcon(addIconRaw);
 		ADD_HOVER_ICON_RAW = new ImageIcon(ImageUtil.alphaOffset(addIconRaw, 0.53f));
 		ADD_ICON_GH = new ImageIcon(addIconGh);
@@ -47,16 +46,14 @@ public class ExternalPluginManagerPanel extends PluginPanel
 	}
 
 	private final OPRSExternalPluginManager externalPluginManager;
-	private final ScheduledExecutorService executor;
 	private final EventBus eventBus;
 
 	@Inject
-	private ExternalPluginManagerPanel(OPRSExternalPluginManager externalPluginManager, ScheduledExecutorService executor, EventBus eventBus)
+	private ExternalPluginManagerPanel(OPRSExternalPluginManager externalPluginManager, EventBus eventBus)
 	{
 		super(false);
 
 		this.externalPluginManager = externalPluginManager;
-		this.executor = executor;
 		this.eventBus = eventBus;
 
 		buildPanel();
@@ -258,7 +255,7 @@ public class ExternalPluginManagerPanel extends PluginPanel
 	{
 		JTabbedPane mainTabPane = new JTabbedPane();
 
-		PluginsPanel pluginPanel = new PluginsPanel(this.externalPluginManager, this.executor, this.eventBus);
+		PluginsPanel pluginPanel = new PluginsPanel(this.externalPluginManager, this.eventBus);
 		JScrollPane repositoryPanel = wrapContainer(new RepositoryPanel(this.externalPluginManager, this.eventBus));
 
 		mainTabPane.add("Plugins", pluginPanel);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/PluginsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/PluginsPanel.java
index 6989e2ae19..e1606e59c0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/PluginsPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/PluginsPanel.java
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
 import javax.swing.ImageIcon;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -64,7 +63,7 @@ public class PluginsPanel extends JPanel
 	{
 		final BufferedImage addIcon =
 			ImageUtil.recolorImage(
-				ImageUtil.getResourceStreamFromClass(PluginsPanel.class, "add_icon.png"), ColorScheme.BRAND_BLUE
+				ImageUtil.loadImageResource(PluginsPanel.class, "add_icon.png"), ColorScheme.BRAND_BLUE
 			);
 		ADD_ICON = new ImageIcon(addIcon);
 		ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f));
@@ -72,7 +71,7 @@ public class PluginsPanel extends JPanel
 		final BufferedImage deleteImg =
 			ImageUtil.recolorImage(
 				ImageUtil.resizeCanvas(
-					ImageUtil.getResourceStreamFromClass(PluginsPanel.class, "delete_icon.png"), 14, 14
+					ImageUtil.loadImageResource(PluginsPanel.class, "delete_icon.png"), 14, 14
 				), ColorScheme.BRAND_BLUE
 			);
 		DELETE_ICON = new ImageIcon(deleteImg);
@@ -84,8 +83,6 @@ public class PluginsPanel extends JPanel
 
 	private final OPRSExternalPluginManager externalPluginManager;
 	private final UpdateManager updateManager;
-	private final ScheduledExecutorService executor;
-	private final EventBus eventBus;
 
 	private final IconTextField searchBar = new IconTextField();
 	private final JPanel filterwrapper = new JPanel(new BorderLayout(0, 10));
@@ -97,12 +94,10 @@ public class PluginsPanel extends JPanel
 	private JComboBox<String> filterComboBox;
 	private Set<String> deps;
 
-	PluginsPanel(OPRSExternalPluginManager externalPluginManager, ScheduledExecutorService executor, EventBus eventBus)
+	PluginsPanel(OPRSExternalPluginManager externalPluginManager, EventBus eventBus)
 	{
 		this.externalPluginManager = externalPluginManager;
 		this.updateManager = externalPluginManager.getUpdateManager();
-		this.executor = executor;
-		this.eventBus = eventBus;
 
 		setLayout(new BorderLayout(0, 10));
 		setBackground(ColorScheme.DARK_GRAY_COLOR);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/RepositoryBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/RepositoryBox.java
index 8a1aec5eaf..dba7a23832 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/RepositoryBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/RepositoryBox.java
@@ -37,7 +37,7 @@ public class RepositoryBox extends JPanel
 		final BufferedImage deleteImg =
 			ImageUtil.recolorImage(
 				ImageUtil.resizeCanvas(
-					ImageUtil.getResourceStreamFromClass(ExternalPluginManagerPanel.class, "delete_icon.png"), 14, 14
+					ImageUtil.loadImageResource(ExternalPluginManagerPanel.class, "delete_icon.png"), 14, 14
 				), ColorScheme.BRAND_BLUE
 			);
 		DELETE_ICON = new ImageIcon(deleteImg);
@@ -46,7 +46,7 @@ public class RepositoryBox extends JPanel
 		final BufferedImage discordImg =
 			ImageUtil.recolorImage(
 				ImageUtil.resizeCanvas(
-					ImageUtil.getResourceStreamFromClass(ExternalPluginManagerPanel.class, "discord_icon.png"), 14, 14
+					ImageUtil.loadImageResource(ExternalPluginManagerPanel.class, "discord_icon.png"), 14, 14
 				), Color.WHITE
 			);
 		DISCORD_ICON = new ImageIcon(discordImg);