diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DbViewerProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DbViewerProvider.java
index cba3aabeec..d8dc8d9b72 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DbViewerProvider.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DbViewerProvider.java
@@ -17,7 +17,6 @@ package ghidra.app.plugin.debug;
 
 import java.awt.event.MouseEvent;
 
-import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 
 import db.DBHandle;
@@ -34,14 +33,14 @@ public class DbViewerProvider extends ComponentProviderAdapter {
 
 	private DBHandle dbh;
 	private String dbName;
-	private Plugin plugin;
-	private ImageIcon icon;
 	private DbViewerComponent comp;
 
 	public DbViewerProvider(Plugin plugin) {
 		super(plugin.getTool(), "Database Viewer", plugin.getName());
+
+		setIcon(ResourceManager.loadImage(ICON_IMAGE));
 		setDefaultWindowPosition(WindowPosition.BOTTOM);
-		this.plugin = plugin;
+
 		setHelpLocation(new HelpLocation(plugin.getName(), "DbViewer"));
 	}
 
@@ -93,13 +92,4 @@ public class DbViewerProvider extends ComponentProviderAdapter {
 		}
 		return comp;
 	}
-
-	@Override
-	public ImageIcon getIcon() {
-		if (icon == null) {
-			icon = ResourceManager.loadImage(ICON_IMAGE);
-		}
-		return icon;
-	}
-
 }
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/plugins/fsbrowser/FileSystemBrowserComponentProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/plugins/fsbrowser/FileSystemBrowserComponentProvider.java
index b8c98ad4de..6d5eeba21b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/plugins/fsbrowser/FileSystemBrowserComponentProvider.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/plugins/fsbrowser/FileSystemBrowserComponentProvider.java
@@ -23,8 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.*;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
@@ -65,22 +63,21 @@ class FileSystemBrowserComponentProvider extends ComponentProviderAdapter {
 	 */
 	public FileSystemBrowserComponentProvider(FileSystemBrowserPlugin plugin, FileSystemRef fsRef) {
 		super(plugin.getTool(), fsRef.getFilesystem().getName(), plugin.getName());
-		setTransient();
 
 		this.plugin = plugin;
-
 		this.rootNode = new FSBRootNode(fsRef);
+
+		setTransient();
+		setIcon(ImageManager.PHOTO);
+
 		gTree = new GTree(rootNode);
 		gTree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
-		gTree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
-			@Override
-			public void valueChanged(TreeSelectionEvent e) {
-				tool.contextChanged(FileSystemBrowserComponentProvider.this);
-				TreePath[] paths = gTree.getSelectionPaths();
-				if (paths.length == 1) {
-					GTreeNode clickedNode = (GTreeNode) paths[0].getLastPathComponent();
-					handleSingleClick(clickedNode);
-				}
+		gTree.getSelectionModel().addTreeSelectionListener(e -> {
+			tool.contextChanged(FileSystemBrowserComponentProvider.this);
+			TreePath[] paths = gTree.getSelectionPaths();
+			if (paths.length == 1) {
+				GTreeNode clickedNode = (GTreeNode) paths[0].getLastPathComponent();
+				handleSingleClick(clickedNode);
 			}
 		});
 		gTree.addMouseListener(new MouseAdapter() {
@@ -301,11 +298,6 @@ class FileSystemBrowserComponentProvider extends ComponentProviderAdapter {
 		return WindowPosition.WINDOW;
 	}
 
-	@Override
-	public Icon getIcon() {
-		return ImageManager.PHOTO;
-	}
-
 	void dispose() {
 		if (actionManager != null) {
 			actionManager.dispose();
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
index 55b6e2dd35..47c24fb9e2 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
@@ -559,8 +559,6 @@ public abstract class ComponentProvider implements HelpDescriptor, ActionContext
 			 	 Fix:
 			 	 	
 			 	 	-Update key binding methods to use an enum for: no management / full management / shared management
-			 	 	-remove superfluous overrides of getIcon()	
-			 	 
 			 */
 
 			dockingTool.getWindowManager().setIcon(this, icon);