diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalettePopupActions.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalettePopupActions.java
index 04ca15415..4d4cd9841 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalettePopupActions.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalettePopupActions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc and others.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -14,6 +14,7 @@
 package org.eclipse.wb.internal.core.editor.palette;
 
 import org.eclipse.wb.core.controls.palette.IPalette;
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.editor.constants.IEditorPreferenceConstants;
 import org.eclipse.wb.core.editor.palette.model.CategoryInfo;
 import org.eclipse.wb.core.editor.palette.model.EntryInfo;
@@ -51,7 +52,7 @@
  */
 final class DesignerPalettePopupActions {
 	// image constants
-	private static final ImageDescriptor ID_ADD_CATEGORY = getImageDescription("add_category.gif");
+	private static final ImageDescriptor ID_ADD_CATEGORY = CoreImages.FOLDER_OPEN;
 	private static final ImageDescriptor ID_ADD_COMPONENT = getImageDescription("add_component.gif");
 	private static final ImageDescriptor IMPORT_JAR_IMAGE = getImageDescription("import_jar.png");
 	private static final ImageDescriptor ID_REMOVE = getImageDescription("remove.gif");
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/ImportArchiveDialog.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/ImportArchiveDialog.java
index 0cd3671b3..e444a0cb1 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/ImportArchiveDialog.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/ImportArchiveDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.core.editor.palette.dialogs;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.editor.palette.model.CategoryInfo;
 import org.eclipse.wb.core.editor.palette.model.PaletteInfo;
 import org.eclipse.wb.internal.core.DesignerPlugin;
@@ -208,7 +209,7 @@ public void widgetSelected(SelectionEvent e) {
 		// choose menu
 		m_browseItem = new ToolItem(browseToolBar, SWT.DROP_DOWN);
 		m_browseItem.setToolTipText(Messages.ImportArchiveDialog_browseToolTip);
-		m_browseItem.setImage(DesignerPlugin.getImage("palette/category.gif"));
+		m_browseItem.setImage(CoreImages.getSharedImage(CoreImages.FOLDER_OPEN));
 		//
 		m_browseMenu = new Menu(browseToolBar);
 		// Classpath
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java
index f5aa2935f..7be8e1e5f 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.core.editor.palette.dialogs;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.editor.palette.model.AbstractElementInfo;
 import org.eclipse.wb.core.editor.palette.model.CategoryInfo;
 import org.eclipse.wb.core.editor.palette.model.EntryInfo;
@@ -106,7 +107,7 @@ public final class PaletteManagerDialog extends ResizableTitleAreaDialog {
 	////////////////////////////////////////////////////////////////////////////
 	private static final Image IMAGE_CLEAR_FILTER =
 			DesignerPlugin.getImage("palette/clear_filter.gif");
-	private static final Image IMAGE_CATEGORY = DesignerPlugin.getImage("palette/category.gif");
+	private static final Image IMAGE_CATEGORY = CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Instance fields
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/creation/factory/InstanceFactoryContainerInfo.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/creation/factory/InstanceFactoryContainerInfo.java
index b32c53b2a..bb9560b6a 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/creation/factory/InstanceFactoryContainerInfo.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/creation/factory/InstanceFactoryContainerInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,9 +12,9 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.core.model.creation.factory;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.core.model.ObjectInfo;
-import org.eclipse.wb.internal.core.DesignerPlugin;
 import org.eclipse.wb.internal.core.model.presentation.DefaultObjectPresentation;
 import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation;
 
@@ -82,7 +82,7 @@ public String getText() throws Exception {
 
 			@Override
 			public ImageDescriptor getIcon() throws Exception {
-				return DesignerPlugin.getImageDescriptor("components/factory_container.gif");
+				return CoreImages.FOLDER_OPEN;
 			}
 		};
 	}
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/AbstractArrayObjectInfo.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/AbstractArrayObjectInfo.java
index b5848bd09..ecbaa56c2 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/AbstractArrayObjectInfo.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/AbstractArrayObjectInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,13 +12,13 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.core.model.nonvisual;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.core.model.ObjectInfo;
 import org.eclipse.wb.core.model.association.Association;
 import org.eclipse.wb.core.model.association.AssociationUtils;
 import org.eclipse.wb.core.model.broadcast.ObjectInfoChildAddAfter;
 import org.eclipse.wb.core.model.broadcast.ObjectInfoChildAddBefore;
-import org.eclipse.wb.internal.core.DesignerPlugin;
 import org.eclipse.wb.internal.core.model.creation.CreationSupport;
 import org.eclipse.wb.internal.core.model.presentation.DefaultObjectPresentation;
 import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation;
@@ -87,7 +87,7 @@ public String getText() throws Exception {
 
 			@Override
 			public ImageDescriptor getIcon() throws Exception {
-				return DesignerPlugin.getImageDescriptor("components/non_visual_beans_container.gif");
+				return CoreImages.FOLDER_OPEN;
 			}
 
 			@Override
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/CollectorObjectInfo.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/CollectorObjectInfo.java
index 0a73dc753..d0bba22f0 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/CollectorObjectInfo.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/CollectorObjectInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,10 +12,10 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.core.model.nonvisual;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.model.AbstractComponentInfo;
 import org.eclipse.wb.core.model.ObjectInfo;
 import org.eclipse.wb.core.model.broadcast.ObjectInfoChildTree;
-import org.eclipse.wb.internal.core.DesignerPlugin;
 import org.eclipse.wb.internal.core.model.presentation.DefaultObjectPresentation;
 import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation;
 import org.eclipse.wb.internal.core.utils.ast.AstEditor;
@@ -105,7 +105,7 @@ public String getText() throws Exception {
 
 			@Override
 			public ImageDescriptor getIcon() throws Exception {
-				return DesignerPlugin.getImageDescriptor("components/non_visual_beans_container.gif");
+				return CoreImages.FOLDER_OPEN;
 			}
 
 			@Override
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/NonVisualBeanContainerInfo.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/NonVisualBeanContainerInfo.java
index c5de63fe9..1bfabfa85 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/NonVisualBeanContainerInfo.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/nonvisual/NonVisualBeanContainerInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,11 +12,11 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.core.model.nonvisual;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.eval.ExecutionFlowDescription;
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.core.model.ObjectInfo;
 import org.eclipse.wb.core.model.association.AssociationObjects;
-import org.eclipse.wb.internal.core.DesignerPlugin;
 import org.eclipse.wb.internal.core.model.JavaInfoUtils;
 import org.eclipse.wb.internal.core.model.generation.GenerationUtils;
 import org.eclipse.wb.internal.core.model.generation.statement.PureFlatStatementGenerator;
@@ -158,7 +158,7 @@ public String getText() throws Exception {
 
 			@Override
 			public ImageDescriptor getIcon() throws Exception {
-				return DesignerPlugin.getImageDescriptor("components/non_visual_beans_container.gif");
+				return CoreImages.FOLDER_OPEN;
 			}
 		};
 	}
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/util/factory/FactoryCreateAction.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/util/factory/FactoryCreateAction.java
index 19a7e00ee..0b81a86b2 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/util/factory/FactoryCreateAction.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/util/factory/FactoryCreateAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -13,6 +13,7 @@
 package org.eclipse.wb.internal.core.model.util.factory;
 
 import org.eclipse.wb.core.editor.IDesignPageSite;
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.editor.palette.model.CategoryInfo;
 import org.eclipse.wb.core.editor.palette.model.IPaletteSite;
 import org.eclipse.wb.core.editor.palette.model.PaletteInfo;
@@ -853,7 +854,7 @@ public void handleEvent(Event event) {
 				// creation
 				{
 					TreeItem creationItem = new TreeItem(tree, SWT.NONE);
-					creationItem.setImage(DesignerPlugin.getImage("actions/factory/folder.png"));
+					creationItem.setImage(CoreImages.getSharedImage(CoreImages.FOLDER_OPEN));
 					creationItem.setText(ModelMessages.FactoryCreateAction_dialogArgumentsCreation);
 					creationItem.setGrayed(true);
 					creationItem.setChecked(true);
@@ -873,7 +874,7 @@ public void handleEvent(Event event) {
 				{
 					TreeItem invocationsItem = new TreeItem(tree, SWT.NONE);
 					invocationsItem.setText(ModelMessages.FactoryCreateAction_dialogArgumentsInvocations);
-					invocationsItem.setImage(DesignerPlugin.getImage("actions/factory/folder.png"));
+					invocationsItem.setImage(CoreImages.getSharedImage(CoreImages.FOLDER_OPEN));
 					invocationsItem.setGrayed(true);
 					invocationsItem.setChecked(true);
 					// for each invocation
diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/utils/ui/dialogs/image/pages/browse/classpath/SrcImageContainer.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/utils/ui/dialogs/image/pages/browse/classpath/SrcImageContainer.java
index a1975d20f..4a22e4ff3 100644
--- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/utils/ui/dialogs/image/pages/browse/classpath/SrcImageContainer.java
+++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/utils/ui/dialogs/image/pages/browse/classpath/SrcImageContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.classpath;
 
-import org.eclipse.wb.internal.core.DesignerPlugin;
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.model.IImageContainer;
 
 import org.eclipse.jdt.core.IJavaElement;
@@ -65,7 +65,7 @@ public SrcImageContainer(String id, IPackageFragmentRoot packageFragmentRoot) th
 	////////////////////////////////////////////////////////////////////////////
 	@Override
 	public Image getImage() {
-		return DesignerPlugin.getImage("folder_package.gif");
+		return CoreImages.getSharedImage(CoreImages.FOLDER_PACKAGE);
 	}
 
 	@Override
diff --git a/org.eclipse.wb.core/icons/actions/factory/folder.png b/org.eclipse.wb.core/icons/actions/factory/folder.png
deleted file mode 100644
index 43770067b..000000000
Binary files a/org.eclipse.wb.core/icons/actions/factory/folder.png and /dev/null differ
diff --git a/org.eclipse.wb.core/icons/components/factory_container.gif b/org.eclipse.wb.core/icons/components/factory_container.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.core/icons/components/factory_container.gif and /dev/null differ
diff --git a/org.eclipse.wb.core/icons/components/non_visual_beans_container.gif b/org.eclipse.wb.core/icons/components/non_visual_beans_container.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.core/icons/components/non_visual_beans_container.gif and /dev/null differ
diff --git a/org.eclipse.wb.core/icons/folder_closed.png b/org.eclipse.wb.core/icons/folder_closed.png
new file mode 100644
index 000000000..9b142127d
Binary files /dev/null and b/org.eclipse.wb.core/icons/folder_closed.png differ
diff --git a/org.eclipse.wb.core/icons/folder_closed.svg b/org.eclipse.wb.core/icons/folder_closed.svg
new file mode 100644
index 000000000..676020697
--- /dev/null
+++ b/org.eclipse.wb.core/icons/folder_closed.svg
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   id="svg25490"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs25492">
+    <linearGradient
+       xlink:href="#linearGradient11290"
+       id="linearGradient8238"
+       gradientUnits="userSpaceOnUse"
+       x1="12.51806"
+       y1="1037.6146"
+       x2="12.51806"
+       y2="1044.4806" />
+    <linearGradient
+       id="linearGradient11290">
+      <stop
+         style="stop-color:#567ead;stop-opacity:1"
+         offset="0"
+         id="stop11292" />
+      <stop
+         style="stop-color:#35679d;stop-opacity:1"
+         offset="1"
+         id="stop11294" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient11290"
+       id="linearGradient25512"
+       gradientUnits="userSpaceOnUse"
+       x1="12.51806"
+       y1="1037.6146"
+       x2="12.51806"
+       y2="1044.4806" />
+    <linearGradient
+       xlink:href="#linearGradient11290"
+       id="linearGradient25520"
+       gradientUnits="userSpaceOnUse"
+       x1="12.51806"
+       y1="1037.6146"
+       x2="12.51806"
+       y2="1044.4806" />
+    <linearGradient
+       xlink:href="#linearGradient11290"
+       id="linearGradient7357"
+       gradientUnits="userSpaceOnUse"
+       x1="12.51806"
+       y1="1037.6146"
+       x2="12.51806"
+       y2="1044.4806" />
+    <linearGradient
+       y2="373.2294"
+       x2="543.91406"
+       y1="373.2294"
+       x1="523.00781"
+       gradientTransform="translate(-60.558598,1.4188)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9459"
+       xlink:href="#linearGradient3955" />
+    <linearGradient
+       id="linearGradient3955">
+      <stop
+         id="stop3957"
+         offset="0"
+         style="stop-color:#c38536;stop-opacity:1" />
+      <stop
+         style="stop-color:#f2dc91;stop-opacity:1"
+         offset="0.15381166"
+         id="stop3959" />
+      <stop
+         style="stop-color:#fbdc8b;stop-opacity:1"
+         offset="0.5"
+         id="stop3961" />
+      <stop
+         id="stop3963"
+         offset="0.75"
+         style="stop-color:#e6bd7a;stop-opacity:1" />
+      <stop
+         id="stop3965"
+         offset="1"
+         style="stop-color:#ba772f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="1044.4806"
+       x2="12.51806"
+       y1="1037.6146"
+       x1="12.51806"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient25569"
+       xlink:href="#linearGradient11290" />
+    <linearGradient
+       y2="1044.4806"
+       x2="12.51806"
+       y1="1037.6146"
+       x1="12.51806"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient25571"
+       xlink:href="#linearGradient11290" />
+    <linearGradient
+       xlink:href="#linearGradient11290-0"
+       id="linearGradient7357-5"
+       gradientUnits="userSpaceOnUse"
+       x1="12.51806"
+       y1="1037.6146"
+       x2="12.51806"
+       y2="1044.4806" />
+    <linearGradient
+       id="linearGradient11290-0">
+      <stop
+         style="stop-color:#567ead;stop-opacity:1"
+         offset="0"
+         id="stop11292-3" />
+      <stop
+         style="stop-color:#35679d;stop-opacity:1"
+         offset="1"
+         id="stop11294-4" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3967-5"
+       id="linearGradient3939-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-61.366562,1.4453859)"
+       x1="531.09253"
+       y1="366.78851"
+       x2="531.09253"
+       y2="371.17883" />
+    <linearGradient
+       id="linearGradient3967-5">
+      <stop
+         id="stop3969-3"
+         offset="0"
+         style="stop-color:#c48a4e;stop-opacity:1;" />
+      <stop
+         id="stop3971-6"
+         offset="1"
+         style="stop-color:#ad6c24;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3973-6"
+       id="linearGradient4933-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60.558598,0)"
+       x1="538.00562"
+       y1="396.2229"
+       x2="538.00562"
+       y2="374.21222" />
+    <linearGradient
+       id="linearGradient3973-6">
+      <stop
+         id="stop3975-0"
+         offset="0"
+         style="stop-color:#f8d078;stop-opacity:1" />
+      <stop
+         id="stop3977-3"
+         offset="1"
+         style="stop-color:#f8f0c8;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3949-4"
+       id="linearGradient4935-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60.558598,0)"
+       x1="548.45923"
+       y1="398.98798"
+       x2="548.45923"
+       y2="373.77069" />
+    <linearGradient
+       id="linearGradient3949-4">
+      <stop
+         style="stop-color:#9e6627;stop-opacity:1"
+         offset="0"
+         id="stop3951-7" />
+      <stop
+         style="stop-color:#c38536;stop-opacity:1"
+         offset="1"
+         id="stop3953-6" />
+    </linearGradient>
+    <linearGradient
+       y2="373.2294"
+       x2="543.91406"
+       y1="373.2294"
+       x1="523.00781"
+       gradientTransform="translate(-60.558598,1.4188)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient25567-7"
+       xlink:href="#linearGradient3955-1" />
+    <linearGradient
+       id="linearGradient3955-1">
+      <stop
+         id="stop3957-4"
+         offset="0"
+         style="stop-color:#c38536;stop-opacity:1" />
+      <stop
+         style="stop-color:#f2dc91;stop-opacity:1"
+         offset="0.15381166"
+         id="stop3959-2" />
+      <stop
+         style="stop-color:#fbdc8b;stop-opacity:1"
+         offset="0.5"
+         id="stop3961-1" />
+      <stop
+         id="stop3963-4"
+         offset="0.75"
+         style="stop-color:#e6bd7a;stop-opacity:1" />
+      <stop
+         id="stop3965-5"
+         offset="1"
+         style="stop-color:#ba772f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="373.2294"
+       x2="543.91406"
+       y1="373.2294"
+       x1="523.00781"
+       gradientTransform="translate(-60.558598,1.4188)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient26656"
+       xlink:href="#linearGradient3955-1" />
+  </defs>
+  <metadata
+     id="metadata25495">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="translate(324.0078,-599.7683)"
+       style="stroke:url(#linearGradient8238);stroke-opacity:1;display:inline"
+       id="layer1-2">
+      <g
+         id="g11331-3-1-1-7"
+         style="stroke:url(#linearGradient25569);display:inline"
+         transform="matrix(0.27903303,0,0,0.27903303,-100.53208,912.07901)">
+        <g
+           style="fill:#737986;fill-opacity:1;stroke:#595e68;stroke-opacity:1"
+           id="g13408-8-9" />
+      </g>
+      <g
+         id="g6124-3"
+         style="stroke:url(#linearGradient25571);display:inline"
+         transform="matrix(-1,0,0,1,16.12959,8.0140628)">
+        <g
+           id="text6430"
+           style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+           transform="scale(-1,1)" />
+        <g
+           id="g6438"
+           style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+           transform="scale(-1,1)">
+          <g
+             style="font-size:13.58917427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Sans"
+             id="layer1-9"
+             transform="matrix(1.2778996,0,0.03747938,1.2778996,-58.56426,-297.79529)">
+            <g
+               transform="translate(20,0)"
+               id="text3909-7-7-1"
+               style="font-size:11.05178356px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#236298;fill-opacity:1;stroke:#236298;stroke-width:0.24860173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:AustralianFlyingCorpsStencil;-inkscape-font-specification:AustralianFlyingCorpsStencil">
+              <g
+                 style="stroke:url(#linearGradient7357-5);stroke-opacity:1;display:inline"
+                 transform="matrix(0.25843864,0,-0.00757972,0.25843864,-399.71149,1413.8121)"
+                 id="g13813">
+                <rect
+                   style="fill:#fdf7eb;fill-opacity:1;stroke:url(#linearGradient3939-2);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+                   id="rect13693-3"
+                   width="15"
+                   height="16.625"
+                   x="463.74335"
+                   y="368.49503"
+                   rx="2.625"
+                   ry="2.625" />
+                <path
+                   style="fill:url(#linearGradient4933-1);fill-opacity:1;stroke:url(#linearGradient4935-8);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+                   d="m 463.24874,374.64819 31.13385,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,19.0178 c 0,1.45425 -1.17076,2.63221 -2.625,2.625 l -31.13385,-0.15421 c -1.45423,-0.007 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
+                   id="rect13693" />
+                <path
+                   style="fill:none;stroke:url(#linearGradient26656);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   d="m 462.26171,374.64819 20.09375,0"
+                   id="path13797" />
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/org.eclipse.wb.core/icons/folder_open.gif b/org.eclipse.wb.core/icons/folder_open.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.core/icons/folder_open.gif and /dev/null differ
diff --git a/org.eclipse.wb.core/icons/folder_open.png b/org.eclipse.wb.core/icons/folder_open.png
new file mode 100644
index 000000000..e5e2deaac
Binary files /dev/null and b/org.eclipse.wb.core/icons/folder_open.png differ
diff --git a/org.eclipse.wb.core/icons/folder_open.svg b/org.eclipse.wb.core/icons/folder_open.svg
new file mode 100644
index 000000000..67017b88a
--- /dev/null
+++ b/org.eclipse.wb.core/icons/folder_open.svg
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3973">
+      <stop
+         id="stop3975"
+         offset="0"
+         style="stop-color:#f8d078;stop-opacity:1" />
+      <stop
+         id="stop3977"
+         offset="1"
+         style="stop-color:#f8f0c8;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3967">
+      <stop
+         id="stop3969"
+         offset="0"
+         style="stop-color:#c48a4e;stop-opacity:1;" />
+      <stop
+         id="stop3971"
+         offset="1"
+         style="stop-color:#ad6c24;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3955">
+      <stop
+         id="stop3957"
+         offset="0"
+         style="stop-color:#c38536;stop-opacity:1" />
+      <stop
+         style="stop-color:#f2dc91;stop-opacity:1"
+         offset="0.10921973"
+         id="stop3959" />
+      <stop
+         style="stop-color:#fdf7eb;stop-opacity:1"
+         offset="0.27304932"
+         id="stop3961" />
+      <stop
+         id="stop3963"
+         offset="0.5638296"
+         style="stop-color:#e6bd7a;stop-opacity:1" />
+      <stop
+         id="stop3965"
+         offset="1"
+         style="stop-color:#ba772f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3949">
+      <stop
+         style="stop-color:#9e6627;stop-opacity:1"
+         offset="0"
+         id="stop3951" />
+      <stop
+         style="stop-color:#c38536;stop-opacity:1"
+         offset="1"
+         id="stop3953" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3967"
+       id="linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-61.366562,1.4453859)"
+       x1="531.09253"
+       y1="366.78851"
+       x2="531.09253"
+       y2="371.17883" />
+    <linearGradient
+       xlink:href="#linearGradient3955"
+       id="linearGradient3945"
+       gradientUnits="userSpaceOnUse"
+       x1="523.00781"
+       y1="373.2294"
+       x2="543.91406"
+       y2="373.2294"
+       gradientTransform="translate(-60.558598,1.4188)" />
+    <linearGradient
+       id="linearGradient3973-7">
+      <stop
+         id="stop3975-4"
+         offset="0"
+         style="stop-color:#f8d078;stop-opacity:1" />
+      <stop
+         id="stop3977-0"
+         offset="1"
+         style="stop-color:#f8f0c8;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="381.57214"
+       x2="538.83301"
+       y1="397.56107"
+       x1="537.94318"
+       gradientTransform="matrix(1,0,0,1.4165687,344.32442,-1.0061522e-6)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4776"
+       xlink:href="#linearGradient3973-7" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask4917">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
+         d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
+         id="path4919" />
+    </mask>
+    <filter
+       id="filter4929"
+       x="-0.39147933"
+       width="1.7829587"
+       y="-0.42999801"
+       height="1.859996">
+      <feGaussianBlur
+         stdDeviation="3.5620748"
+         id="feGaussianBlur4931" />
+    </filter>
+    <linearGradient
+       xlink:href="#linearGradient3973"
+       id="linearGradient4933"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60.558598,0)"
+       x1="538.00562"
+       y1="396.2229"
+       x2="538.00562"
+       y2="374.21222" />
+    <linearGradient
+       xlink:href="#linearGradient3949"
+       id="linearGradient4935"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60.558598,0)"
+       x1="548.45923"
+       y1="398.98798"
+       x2="548.45923"
+       y2="373.77069" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="matrix(0.27903303,0,0,0.27903303,-129.51159,939.94639)"
+       style="display:inline"
+       id="g13862">
+      <g
+         transform="matrix(1.1835826,0,0,1.1835826,-75.612218,-78.069702)"
+         id="g13813">
+        <rect
+           style="fill:#fdf7eb;fill-opacity:1;stroke:url(#linearGradient3939);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+           id="rect13693-3"
+           width="15"
+           height="16.625"
+           x="463.74335"
+           y="368.49503"
+           rx="2.625"
+           ry="2.625" />
+        <path
+           style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,-0.30124 2.625,1.15301 l 0,12.76575 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-21.37109 c 0,0 1.17075,-0.1175 2.625,-0.1175 z"
+           id="rect13693" />
+        <path
+           style="fill:none;stroke:url(#linearGradient3945);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 462.26171,374.64819 18.01958,-0.0669"
+           id="path13797" />
+        <g
+           id="g4914"
+           mask="url(#mask4917)">
+          <rect
+             transform="matrix(1,0,-0.70828043,0.70593118,4.9445873e-7,0)"
+             ry="3.7184925"
+             rx="2.625"
+             y="542.8974"
+             x="860.68469"
+             height="22.649353"
+             width="24.877882"
+             id="rect13693-2-2"
+             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.38039374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;filter:url(#filter4929)" />
+        </g>
+        <rect
+           style="fill:url(#linearGradient4776);fill-opacity:1;stroke:#9e6627;stroke-width:4.3245993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+           id="rect13693-2"
+           width="30.475229"
+           height="21.377747"
+           x="860.68469"
+           y="543.56671"
+           rx="2.625"
+           ry="3.7184927"
+           transform="matrix(1,0,-0.70828042,0.70593119,0,0)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/org.eclipse.wb.core/icons/folder_package.gif b/org.eclipse.wb.core/icons/folder_package.gif
deleted file mode 100644
index fca9c53e6..000000000
Binary files a/org.eclipse.wb.core/icons/folder_package.gif and /dev/null differ
diff --git a/org.eclipse.wb.core/icons/folder_package.png b/org.eclipse.wb.core/icons/folder_package.png
new file mode 100644
index 000000000..7c2e1010a
Binary files /dev/null and b/org.eclipse.wb.core/icons/folder_package.png differ
diff --git a/org.eclipse.wb.core/icons/folder_package.svg b/org.eclipse.wb.core/icons/folder_package.svg
new file mode 100644
index 000000000..5d1c64c3b
--- /dev/null
+++ b/org.eclipse.wb.core/icons/folder_package.svg
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4">
+    <linearGradient
+       xlink:href="#linearGradient3967"
+       id="linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-61.366562,1.4453859)"
+       x1="531.09253"
+       y1="366.78851"
+       x2="531.09253"
+       y2="371.17883" />
+    <linearGradient
+       id="linearGradient3967">
+      <stop
+         id="stop3969"
+         offset="0"
+         style="stop-color:#c48a4e;stop-opacity:1;" />
+      <stop
+         id="stop3971"
+         offset="1"
+         style="stop-color:#ad6c24;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3973"
+       id="linearGradient4933"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60.558598,0)"
+       x1="538.00562"
+       y1="396.2229"
+       x2="538.00562"
+       y2="374.21222" />
+    <linearGradient
+       id="linearGradient3973">
+      <stop
+         id="stop3975"
+         offset="0"
+         style="stop-color:#f8d078;stop-opacity:1" />
+      <stop
+         id="stop3977"
+         offset="1"
+         style="stop-color:#f8f0c8;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3949"
+       id="linearGradient4935-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60.558598,0)"
+       x1="548.45923"
+       y1="398.98798"
+       x2="548.45923"
+       y2="373.77069" />
+    <linearGradient
+       id="linearGradient3949">
+      <stop
+         style="stop-color:#9e6627;stop-opacity:1"
+         offset="0"
+         id="stop3951" />
+      <stop
+         style="stop-color:#c38536;stop-opacity:1"
+         offset="1"
+         id="stop3953" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3955">
+      <stop
+         id="stop3957"
+         offset="0"
+         style="stop-color:#c38536;stop-opacity:1" />
+      <stop
+         style="stop-color:#f2dc91;stop-opacity:1"
+         offset="0.15381166"
+         id="stop3959" />
+      <stop
+         style="stop-color:#fbdc8b;stop-opacity:1"
+         offset="0.5"
+         id="stop3961" />
+      <stop
+         id="stop3963"
+         offset="0.75"
+         style="stop-color:#e6bd7a;stop-opacity:1" />
+      <stop
+         id="stop3965"
+         offset="1"
+         style="stop-color:#ba772f;stop-opacity:1" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask5153">
+      <g
+         id="g5155"
+         style="display:inline"
+         transform="matrix(0.84489245,0,0,0.84489245,66.961974,62.982434)">
+        <path
+           transform="matrix(1.1835826,0,0,1.1835826,-79.255026,-74.544902)"
+           id="path5157"
+           d="m 462.77563,373.22885 29.11636,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,18.76896 c 0,1.45425 -1.17412,2.52598 -2.625,2.625 l -29.11636,1.98708 c -1.45088,0.099 -2.625,-1.17075 -2.625,-2.625 l 0,-20.75604 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
+           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline" />
+      </g>
+    </mask>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter4929-6"
+       x="-0.33426729"
+       width="1.6685346"
+       y="-0.42999801"
+       height="1.859996">
+      <feGaussianBlur
+         stdDeviation="3.5620748"
+         id="feGaussianBlur4931-9" />
+    </filter>
+    <linearGradient
+       y2="381.57214"
+       x2="538.83301"
+       y1="397.56107"
+       x1="537.94318"
+       gradientTransform="matrix(0.33025864,0,0,0.46783406,884.33713,1300.6675)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6107"
+       xlink:href="#linearGradient3973-7-8-2" />
+    <linearGradient
+       id="linearGradient3973-7-8-2">
+      <stop
+         id="stop3975-4-9-2"
+         offset="0"
+         style="stop-color:#f8d078;stop-opacity:1" />
+      <stop
+         id="stop3977-0-4-1"
+         offset="1"
+         style="stop-color:#f8f0c8;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="381.19754"
+       x2="548.01556"
+       y1="398.98798"
+       x1="548.45923"
+       gradientTransform="matrix(0.33025864,0,0,0.46783406,884.33713,1300.6675)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6109"
+       xlink:href="#linearGradient4807-2-8" />
+    <linearGradient
+       id="linearGradient4807-2-8">
+      <stop
+         id="stop4809-7-5"
+         offset="0"
+         style="stop-color:#9e6627;stop-opacity:1" />
+      <stop
+         id="stop4811-50-7"
+         offset="1"
+         style="stop-color:#bc8532;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="373.2294"
+       x2="543.91406"
+       y1="373.2294"
+       x1="523.00781"
+       gradientTransform="translate(-60.558598,1.4188)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5342"
+       xlink:href="#linearGradient3955" />
+    <radialGradient
+       xlink:href="#linearGradient11146-4-4-3-4"
+       id="radialGradient5103-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-219.20821,-165.52072)"
+       cx="387.59717"
+       cy="442.57816"
+       fx="387.59717"
+       fy="442.57816"
+       r="6.1875" />
+    <linearGradient
+       id="linearGradient11146-4-4-3-4">
+      <stop
+         style="stop-color:#faefba;stop-opacity:1"
+         offset="0"
+         id="stop11150-4-72-2-0" />
+      <stop
+         id="stop11152-9-0-2-9"
+         offset="1"
+         style="stop-color:#9e6542;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient11146-8-3-2-5-8"
+       id="radialGradient5105-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-208.33321,-165.52072)"
+       cx="387.59717"
+       cy="442.57816"
+       fx="387.59717"
+       fy="442.57816"
+       r="6.1875" />
+    <linearGradient
+       id="linearGradient11146-8-3-2-5-8">
+      <stop
+         style="stop-color:#faefba;stop-opacity:1"
+         offset="0"
+         id="stop11150-7-5-9-0-8" />
+      <stop
+         id="stop11152-8-4-35-4-2"
+         offset="1"
+         style="stop-color:#9e6542;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient11146-7-5-30-9-5"
+       id="radialGradient5107-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-219.20821,-154.64572)"
+       cx="387.59717"
+       cy="442.57816"
+       fx="387.59717"
+       fy="442.57816"
+       r="6.1875" />
+    <linearGradient
+       id="linearGradient11146-7-5-30-9-5">
+      <stop
+         style="stop-color:#faefba;stop-opacity:1"
+         offset="0"
+         id="stop11150-9-6-9-9-5" />
+      <stop
+         id="stop11152-6-7-6-1-1"
+         offset="1"
+         style="stop-color:#9e6542;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient11146-8-7-5-7-9-1"
+       id="radialGradient5109-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-208.33321,-154.64572)"
+       cx="387.59717"
+       cy="442.57816"
+       fx="387.59717"
+       fy="442.57816"
+       r="6.1875" />
+    <linearGradient
+       id="linearGradient11146-8-7-5-7-9-1">
+      <stop
+         style="stop-color:#faefba;stop-opacity:1"
+         offset="0"
+         id="stop11150-7-8-3-8-47-1" />
+      <stop
+         id="stop11152-8-8-6-3-4-5"
+         offset="1"
+         style="stop-color:#9e6542;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient11146-4-4-3-4"
+       id="radialGradient3055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-219.20821,-165.52072)"
+       cx="387.59717"
+       cy="442.57816"
+       fx="387.59717"
+       fy="442.57816"
+       r="6.1875" />
+    <radialGradient
+       xlink:href="#linearGradient11146-8-3-2-5-8"
+       id="radialGradient3057"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-208.33321,-165.52072)"
+       cx="387.59717"
+       cy="442.57816"
+       fx="387.59717"
+       fy="442.57816"
+       r="6.1875" />
+    <radialGradient
+       xlink:href="#linearGradient11146-7-5-30-9-5"
+       id="radialGradient3059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-219.20821,-154.64572)"
+       cx="387.59717"
+       cy="442.57816"
+       fx="387.59717"
+       fy="442.57816"
+       r="6.1875" />
+    <radialGradient
+       xlink:href="#linearGradient11146-8-7-5-7-9-1"
+       id="radialGradient3061"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5657869,-2.9706834e-6,2.6069523e-6,1.3740716,-208.33321,-154.64572)"
+       cx="387.59717"
+       cy="442.57816"
+       fx="387.59717"
+       fy="442.57816"
+       r="6.1875" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       transform="matrix(0.33025864,0,0,0.33025864,-150.61632,918.18176)"
+       id="g13813">
+      <rect
+         style="fill:#fdf7eb;fill-opacity:1;stroke:url(#linearGradient3939);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+         id="rect13693-3"
+         width="15"
+         height="16.625"
+         x="463.74335"
+         y="368.49503"
+         rx="2.625"
+         ry="2.625" />
+      <path
+         style="fill:url(#linearGradient4933);fill-opacity:1;stroke:url(#linearGradient4935-1);stroke-width:3.02792978;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 463.24874,374.64819 28.07551,0 c 1.45425,0 2.625,1.17075 2.625,2.625 l 0,11.29376 c 0,1.45425 -1.22088,2.24642 -2.625,2.625 l -28.07551,7.56983 c -1.40411,0.37858 -2.625,-1.17075 -2.625,-2.625 l 0,-18.86359 c 0,-1.45425 1.17075,-2.625 2.625,-2.625 z"
+         id="rect13693" />
+      <path
+         style="fill:none;stroke:url(#linearGradient5342);stroke-width:3.02792978;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 462.26171,374.64819 20.09375,0"
+         id="path13797" />
+    </g>
+    <g
+       id="g11260-4-3"
+       transform="matrix(0.27903303,0,0,0.27903303,-93.454142,917.99265)"
+       style="display:inline">
+      <g
+         id="g3047"
+         transform="translate(-2.4638659,-2.5758595)"
+         style="stroke-width:3.58380508;stroke-miterlimit:4;stroke-dasharray:none">
+        <rect
+           transform="translate(-20.000002,2.6171874e-6)"
+           y="439.17468"
+           x="384.25"
+           height="10.875"
+           width="10.875"
+           id="rect10961-8-9"
+           style="fill:url(#radialGradient3055);fill-opacity:1;stroke:#694337;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+        <rect
+           transform="translate(-20.000002,2.6171874e-6)"
+           y="439.17468"
+           x="395.125"
+           height="10.875"
+           width="10.875"
+           id="rect10961-9-0-0"
+           style="fill:url(#radialGradient3057);fill-opacity:1;stroke:#694337;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+        <rect
+           transform="translate(-20.000002,2.6171874e-6)"
+           y="450.04968"
+           x="384.25"
+           height="10.875"
+           width="10.875"
+           id="rect10961-3-9-3"
+           style="fill:url(#radialGradient3059);fill-opacity:1;stroke:#694337;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+        <rect
+           transform="translate(-20.000002,2.6171874e-6)"
+           y="450.04968"
+           x="395.125"
+           height="10.875"
+           width="10.875"
+           id="rect10961-9-6-4-0"
+           style="fill:url(#radialGradient3061);fill-opacity:1;stroke:#694337;stroke-width:3.58380508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+        <path
+           style="fill:none;stroke:#694337;stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 359.71634,450.03981 30.58237,0"
+           id="path11108-6-0" />
+        <path
+           style="fill:none;stroke:#694337;stroke-width:3.58380508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+           d="m 375.00752,434.74862 0,30.58237"
+           id="path11108-8-0-8" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.33025864,0,0,0.33025864,-151.62636,919.14589)"
+       style="display:inline"
+       id="g6258"
+       mask="none">
+      <g
+         mask="url(#mask5153)"
+         id="g4914"
+         transform="translate(3.058339,-2.9193236)">
+        <rect
+           style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.38039374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;filter:url(#filter4929-6)"
+           id="rect13693-2-2"
+           width="29.135895"
+           height="22.649353"
+           x="860.68469"
+           y="542.8974"
+           rx="2.625"
+           ry="3.7184925"
+           transform="matrix(1,0,-0.70828043,0.70593118,4.9445873e-7,-4.9445987e-8)" />
+      </g>
+    </g>
+    <rect
+       transform="matrix(1,0,-0.70828042,0.7059312,0,0)"
+       ry="1.2280643"
+       rx="0.86692894"
+       y="1480.1853"
+       x="1054.8699"
+       height="7.0601854"
+       width="10.064708"
+       id="rect13693-2"
+       style="fill:url(#linearGradient6107);fill-opacity:1;stroke:url(#linearGradient6109);stroke-width:1.19019687;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+    <g
+       id="g5082"
+       transform="translate(18.738328,2)" />
+  </g>
+</svg>
diff --git a/org.eclipse.wb.core/icons/palette/add_category.gif b/org.eclipse.wb.core/icons/palette/add_category.gif
deleted file mode 100644
index 4888da8e7..000000000
Binary files a/org.eclipse.wb.core/icons/palette/add_category.gif and /dev/null differ
diff --git a/org.eclipse.wb.core/icons/palette/category.gif b/org.eclipse.wb.core/icons/palette/category.gif
deleted file mode 100644
index 4888da8e7..000000000
Binary files a/org.eclipse.wb.core/icons/palette/category.gif and /dev/null differ
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java
index 83614f18d..c3c19aba0 100644
--- a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java
+++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.wb.core.controls.palette;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.draw2d.Figure;
 import org.eclipse.wb.draw2d.FigureUtils;
 import org.eclipse.wb.draw2d.Layer;
@@ -111,8 +112,8 @@ public final class PaletteComposite extends Composite {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	private static final Image NO_ICON = loadImage("icons/no_icon.gif");
-	private static final Image FOLDER_OPEN = loadImage("icons/folder_open.gif");
-	private static final Image FOLDER_CLOSED = loadImage("icons/folder_closed.gif");
+	private static final Image FOLDER_OPEN = CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
+	private static final Image FOLDER_CLOSED = CoreImages.getSharedImage(CoreImages.FOLDER_CLOSED);
 
 	/**
 	 * @return the {@link Image} using path relative to this class.
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/icons/folder_closed.gif b/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/icons/folder_closed.gif
deleted file mode 100644
index 92b3bddc3..000000000
Binary files a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/icons/folder_closed.gif and /dev/null differ
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/icons/folder_open.gif b/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/icons/folder_open.gif
deleted file mode 100644
index 4888da8e7..000000000
Binary files a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/icons/folder_open.gif and /dev/null differ
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/editor/constants/CoreImages.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/editor/constants/CoreImages.java
index 14bf44710..57ecaf65a 100644
--- a/org.eclipse.wb.core/src/org/eclipse/wb/core/editor/constants/CoreImages.java
+++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/editor/constants/CoreImages.java
@@ -118,6 +118,10 @@ public abstract class CoreImages {
 
 	public static ImageDescriptor LAYOUT_FIT_TO_SIZE = of("info/layout/fit_to_size.svg");
 
+	public static ImageDescriptor FOLDER_CLOSED = of("folder_closed.svg");
+	public static ImageDescriptor FOLDER_OPEN = of("folder_open.svg");
+	public static ImageDescriptor FOLDER_PACKAGE = of("folder_package.svg");
+
 	/**
 	 * Images returned by this method must <b>not</b> be disposed.
 	 *
diff --git a/org.eclipse.wb.rcp/icons/info/Action/container.gif b/org.eclipse.wb.rcp/icons/info/Action/container.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.rcp/icons/info/Action/container.gif and /dev/null differ
diff --git a/org.eclipse.wb.rcp/icons/info/perspective/container.gif b/org.eclipse.wb.rcp/icons/info/perspective/container.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.rcp/icons/info/perspective/container.gif and /dev/null differ
diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/action/ActionContainerInfo.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/action/ActionContainerInfo.java
index 544a09009..fd83e0b18 100644
--- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/action/ActionContainerInfo.java
+++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/jface/action/ActionContainerInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.rcp.model.jface.action;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.core.model.ObjectInfo;
 import org.eclipse.wb.core.model.association.AssociationObjects;
@@ -27,7 +28,6 @@
 import org.eclipse.wb.internal.core.utils.ast.BodyDeclarationTarget;
 import org.eclipse.wb.internal.core.utils.ast.StatementTarget;
 import org.eclipse.wb.internal.core.utils.check.Assert;
-import org.eclipse.wb.internal.rcp.Activator;
 
 import org.eclipse.jdt.core.dom.Block;
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
@@ -77,7 +77,7 @@ public String getText() throws Exception {
 
 			@Override
 			public ImageDescriptor getIcon() throws Exception {
-				return Activator.getImageDescriptor("info/Action/container.gif");
+				return CoreImages.FOLDER_OPEN;
 			}
 		};
 	}
diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/rcp/CategoriesAndViewsDialog.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/rcp/CategoriesAndViewsDialog.java
index 7f6fe1c72..9a1309eec 100644
--- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/rcp/CategoriesAndViewsDialog.java
+++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/rcp/CategoriesAndViewsDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.rcp.model.rcp;
 
-import org.eclipse.wb.internal.core.DesignerPlugin;
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils;
 import org.eclipse.wb.internal.core.utils.execution.RunnableEx;
 import org.eclipse.wb.internal.core.utils.ui.EmptyTransfer;
@@ -512,12 +512,12 @@ public String getText(Object element) {
 		@Override
 		public Image getImage(Object element) {
 			if (element == OTHER_CATEGORY) {
-				return DesignerPlugin.getImage("folder_open.gif");
+				return CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
 			}
 			//
 			IPluginElement pluginElement = (IPluginElement) element;
 			if (isCategoryElement(pluginElement)) {
-				return DesignerPlugin.getImage("folder_open.gif");
+				return CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
 			}
 			if (pluginElement.getName().equals("view")) {
 				return m_resourceManager.createImageWithDefault(PdeUtils.getElementIcon(pluginElement, "icon", null));
diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/rcp/perspective/shortcuts/AbstractShortcutContainerInfo.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/rcp/perspective/shortcuts/AbstractShortcutContainerInfo.java
index c4bd40948..caa2bc44e 100644
--- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/rcp/perspective/shortcuts/AbstractShortcutContainerInfo.java
+++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/model/rcp/perspective/shortcuts/AbstractShortcutContainerInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.rcp.model.rcp.perspective.shortcuts;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.model.ObjectInfo;
 import org.eclipse.wb.internal.core.model.JavaInfoUtils;
 import org.eclipse.wb.internal.core.model.presentation.DefaultObjectPresentation;
@@ -24,7 +25,6 @@
 import org.eclipse.wb.internal.core.utils.ast.StatementTarget;
 import org.eclipse.wb.internal.core.utils.check.Assert;
 import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory;
-import org.eclipse.wb.internal.rcp.Activator;
 import org.eclipse.wb.internal.rcp.model.rcp.perspective.EditorAreaInfo;
 import org.eclipse.wb.internal.rcp.model.rcp.perspective.PageLayoutInfo;
 import org.eclipse.wb.internal.swt.support.CoordinateUtils;
@@ -110,7 +110,7 @@ public List<AbstractShortcutInfo> getShortcuts() {
 	private final IObjectPresentation m_presentation = new DefaultObjectPresentation(this) {
 		@Override
 		public ImageDescriptor getIcon() throws Exception {
-			return Activator.getImageDescriptor("info/perspective/container.gif");
+			return CoreImages.FOLDER_OPEN;
 		}
 
 		@Override
diff --git a/org.eclipse.wb.swing/icons/info/Action/container.gif b/org.eclipse.wb.swing/icons/info/Action/container.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.swing/icons/info/Action/container.gif and /dev/null differ
diff --git a/org.eclipse.wb.swing/icons/info/ButtonGroup/ButtonGroup_container.gif b/org.eclipse.wb.swing/icons/info/ButtonGroup/ButtonGroup_container.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.swing/icons/info/ButtonGroup/ButtonGroup_container.gif and /dev/null differ
diff --git a/org.eclipse.wb.swing/icons/info/laf/container.gif b/org.eclipse.wb.swing/icons/info/laf/container.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.swing/icons/info/laf/container.gif and /dev/null differ
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/bean/ActionContainerInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/bean/ActionContainerInfo.java
index 60cf5980f..6b6f676d6 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/bean/ActionContainerInfo.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/bean/ActionContainerInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.swing.model.bean;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.eval.ExecutionFlowDescription;
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.core.model.ObjectInfo;
@@ -26,7 +27,6 @@
 import org.eclipse.wb.internal.core.model.variable.FieldInitializerVariableSupport;
 import org.eclipse.wb.internal.core.model.variable.LazyVariableSupport;
 import org.eclipse.wb.internal.core.model.variable.VariableSupport;
-import org.eclipse.wb.internal.swing.Activator;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 
@@ -155,7 +155,7 @@ public String getText() throws Exception {
 
 			@Override
 			public ImageDescriptor getIcon() throws Exception {
-				return Activator.getImageDescriptor("info/Action/container.gif");
+				return CoreImages.FOLDER_OPEN;
 			}
 		};
 	}
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/bean/ButtonGroupContainerInfo.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/bean/ButtonGroupContainerInfo.java
index 4e6c3da1d..f9cc72094 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/bean/ButtonGroupContainerInfo.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/bean/ButtonGroupContainerInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.swing.model.bean;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.core.model.ObjectInfo;
 import org.eclipse.wb.core.model.association.AssociationObjects;
@@ -22,7 +23,6 @@
 import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation;
 import org.eclipse.wb.internal.core.model.variable.FieldInitializerVariableSupport;
 import org.eclipse.wb.internal.core.utils.ast.AstEditor;
-import org.eclipse.wb.internal.swing.Activator;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 
@@ -137,7 +137,7 @@ public String getText() throws Exception {
 
 			@Override
 			public ImageDescriptor getIcon() throws Exception {
-				return Activator.getImageDescriptor("info/ButtonGroup/ButtonGroup_container.gif");
+				return CoreImages.FOLDER_OPEN;
 			}
 		};
 	}
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/property/editor/models/tree/TreeModelDialog.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/property/editor/models/tree/TreeModelDialog.java
index 3c5ac66b1..8e62d74d1 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/property/editor/models/tree/TreeModelDialog.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/property/editor/models/tree/TreeModelDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.swing.model.property.editor.models.tree;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.internal.core.utils.ui.GridDataFactory;
 import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.ResizableDialog;
@@ -220,8 +221,7 @@ public List<ItemInformation> getChildren() {
 	// Refresh
 	//
 	////////////////////////////////////////////////////////////////////////////
-	private static final Image IMAGE_FOLDER = new Image(null,
-			TreeModelDialog.class.getResourceAsStream("icons/folder.gif"));
+	private static final Image IMAGE_FOLDER = CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
 	private static final Image IMAGE_LEAF = new Image(null,
 			TreeModelDialog.class.getResourceAsStream("icons/leaf.gif"));
 
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/property/editor/models/tree/icons/folder.gif b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/property/editor/models/tree/icons/folder.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/model/property/editor/models/tree/icons/folder.gif and /dev/null differ
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/preferences/laf/LafPreferencePage.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/preferences/laf/LafPreferencePage.java
index c48144cd7..c67b0d102 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/preferences/laf/LafPreferencePage.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/preferences/laf/LafPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2024 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.swing.preferences.laf;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.internal.core.DesignerPlugin;
 import org.eclipse.wb.internal.core.utils.GenericsUtils;
 import org.eclipse.wb.internal.core.utils.check.Assert;
@@ -114,7 +115,7 @@ public class LafPreferencePage extends PreferencePage
 IWorkbenchPreferencePage,
 IPreferenceConstants {
 	// constants
-	private static final Image CATEGORY_IMAGE = Activator.getImage("info/laf/container.gif");
+	private static final Image CATEGORY_IMAGE = CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
 	private static final Image LAF_ITEM_IMAGE = Activator.getImage("info/laf/laf.png");
 	// variables
 	private LafInfo m_defaultLAF;
diff --git a/org.eclipse.wb.swt/icons/components/registry_container.gif b/org.eclipse.wb.swt/icons/components/registry_container.gif
deleted file mode 100644
index 152ce470c..000000000
Binary files a/org.eclipse.wb.swt/icons/components/registry_container.gif and /dev/null differ
diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/jface/resource/RegistryContainerInfo.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/jface/resource/RegistryContainerInfo.java
index c2030419d..615246933 100644
--- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/jface/resource/RegistryContainerInfo.java
+++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/jface/resource/RegistryContainerInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,11 +12,11 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.swt.model.jface.resource;
 
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.core.model.JavaInfo;
 import org.eclipse.wb.internal.core.model.presentation.DefaultObjectPresentation;
 import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation;
 import org.eclipse.wb.internal.core.utils.check.Assert;
-import org.eclipse.wb.internal.swt.Activator;
 import org.eclipse.wb.internal.swt.model.ModelMessages;
 
 import org.eclipse.jdt.core.dom.ASTNode;
@@ -92,7 +92,7 @@ public String getText() throws Exception {
 
 			@Override
 			public ImageDescriptor getIcon() throws Exception {
-				return Activator.getImageDescriptor("components/registry_container.gif");
+				return CoreImages.FOLDER_OPEN;
 			}
 		};
 	}
diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/plugin/BundleImageContainer.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/plugin/BundleImageContainer.java
index 64461b32b..3b5c954bd 100644
--- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/plugin/BundleImageContainer.java
+++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/plugin/BundleImageContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.swt.model.property.editor.image.plugin;
 
-import org.eclipse.wb.internal.core.DesignerPlugin;
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.model.IHasChildren;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.model.IImageContainer;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.model.IImageElement;
@@ -161,7 +161,7 @@ protected IImageElement[] directElements() {
 	////////////////////////////////////////////////////////////////////////////
 	@Override
 	public Image getImage() {
-		return DesignerPlugin.getImage("folder_open.gif");
+		return CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
 	}
 
 	@Override
diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/plugin/FileImageContainer.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/plugin/FileImageContainer.java
index ca508afde..8f72e4366 100644
--- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/plugin/FileImageContainer.java
+++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/plugin/FileImageContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2025 Google, Inc. and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.wb.internal.swt.model.property.editor.image.plugin;
 
-import org.eclipse.wb.internal.core.DesignerPlugin;
+import org.eclipse.wb.core.editor.constants.CoreImages;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.AbstractBrowseImagePage;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.model.IHasChildren;
 import org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.model.IImageContainer;
@@ -148,7 +148,7 @@ protected IImageElement[] directElements() {
 	////////////////////////////////////////////////////////////////////////////
 	@Override
 	public Image getImage() {
-		return DesignerPlugin.getImage("folder_open.gif");
+		return CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
 	}
 
 	@Override