diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
index 8de06a776fd..24e931940ef 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
@@ -21,7 +21,6 @@ package org.eclipse.cdt.ui.newui;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -151,7 +150,7 @@ public abstract class AbstractPage extends PropertyPage implements IPreferencePa
 
 	private static final String PREF_ASK_REINDEX = "askReindex"; //$NON-NLS-1$
 
-	private Map<URL, Image> loadedIcons = new HashMap<>();
+	private List<Image> loadedIcons = new ArrayList<>();
 	private static Map<Class<? extends AbstractPage>, Class<? extends ICPropertyTab>> recentTabs = new HashMap<>();
 
 	private final Image IMG_WARN = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_REFACTORING_WARNING);
@@ -1052,7 +1051,7 @@ public abstract class AbstractPage extends PropertyPage implements IPreferencePa
 		if (displayedConfig)
 			forEach(ICPropertyTab.DISPOSE);
 		// Dispose any loaded images
-		for (Image img : loadedIcons.values())
+		for (Image img : loadedIcons)
 			img.dispose();
 		loadedIcons.clear();
 
@@ -1196,7 +1195,6 @@ public abstract class AbstractPage extends PropertyPage implements IPreferencePa
 
 	private Image getIcon(IConfigurationElement config) {
 		ImageDescriptor idesc = null;
-		URL url = null;
 		String iconName = config.getAttribute(IMAGE_NAME);
 		if (iconName != null) {
 			idesc = ResourceLocator.imageDescriptorFromBundle(
@@ -1206,7 +1204,7 @@ public abstract class AbstractPage extends PropertyPage implements IPreferencePa
 		if (idesc == null)
 			return null;
 		Image img = idesc.createImage();
-		loadedIcons.put(url, img);
+		loadedIcons.add(img);
 		return img;
 	}