diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/.ratings
index b78c28a17cda209bfd559396ab41fb74d7bc08a4..5afaa2dcaf00a02441f0f9334c76f9c8257b65c3 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/.ratings
@@ -1 +1 @@
-ToolingBaseUIActivator.java 42fa7691bceec500b4e08cb28ef7fc69b9f8f658 GREEN
+ToolingBaseUIActivator.java dbb6f64b87a553ffbcfeb92160d84b63073dfd89 YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
index 42fa7691bceec500b4e08cb28ef7fc69b9f8f658..dbb6f64b87a553ffbcfeb92160d84b63073dfd89 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
@@ -15,6 +15,8 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.base.ui;
 
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
+
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -53,6 +55,6 @@ public class ToolingBaseUIActivator extends AbstractUIPlugin {
 
 	/** Returns image descriptor of the image in the kernel plugin. */
 	public static ImageDescriptor getImageDescriptor(String iconPath) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, iconPath);
+		return imageDescriptorFromBundle(PLUGIN_ID, iconPath).orElse(null);
 	}
 }
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/.ratings
index a43153e7ec1c24ed07b02f4c2668e456311d707a..c7735d19c4d52a03af9686a1455c26cbcf9384f8 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/.ratings
@@ -1 +1 @@
-ToolingCommonUIActivator.java cce1178fb9941ee2d4d97cfdbe6af8cf94170fd3 GREEN
+ToolingCommonUIActivator.java 0e00121865e18435bb9f130e23eea6e07b43af46 YELLOW
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/ToolingCommonUIActivator.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/ToolingCommonUIActivator.java
index cce1178fb9941ee2d4d97cfdbe6af8cf94170fd3..0e00121865e18435bb9f130e23eea6e07b43af46 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/ToolingCommonUIActivator.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/ToolingCommonUIActivator.java
@@ -15,6 +15,8 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.common.ui;
 
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
+
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -53,6 +55,6 @@ public class ToolingCommonUIActivator extends AbstractUIPlugin {
 
 	/** Returns the image descriptor for the given icon file. */
 	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+		return imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
 	}
 }
diff --git a/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/.ratings b/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/.ratings
index c6edc8e2348631a76c121a42bd3455f3b828c919..00858ce6d25dab51d595247b9c8bdf1dd0455dbe 100644
--- a/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/.ratings
+++ b/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/.ratings
@@ -1 +1 @@
-ToolingGraphicsGLUIActivator.java 278f2896961a12211d7b48daf6ec6e685e105dc8 GREEN
+ToolingGraphicsGLUIActivator.java d8e45ba22affcad57dc7f194004aa110f11590fc YELLOW
diff --git a/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java b/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
index 278f2896961a12211d7b48daf6ec6e685e105dc8..d8e45ba22affcad57dc7f194004aa110f11590fc 100644
--- a/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
+++ b/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
@@ -17,6 +17,7 @@ package org.fortiss.tooling.graphicsGL.ui;
 
 import static java.lang.System.mapLibraryName;
 import static org.eclipse.core.runtime.FileLocator.toFileURL;
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
 import static org.fortiss.tooling.base.utils.SystemUtils.isOs64BitArch;
 
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -93,6 +94,6 @@ public class ToolingGraphicsGLUIActivator extends AbstractUIPlugin {
 
 	/** Returns the image descriptor for the given icon file. */
 	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+		return imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
 	}
 }
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
index fbd0cab3259f881979947837bbf444692e417ac6..ced0addf3dc9c957ec2fb08091bbf094927c742c 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
@@ -1,3 +1,3 @@
 ESharedImages.java dd65be1d1ee807db8460064d9b970847e6303ff0 GREEN
 ToolingKernelUI.java 250e5dde230272e286aa8d327fd597cf542774fe GREEN
-ToolingKernelUIActivator.java 1c6ac50477a78cd77d9e4daf36f423d4b4dbdf63 GREEN
+ToolingKernelUIActivator.java fc281e60592e54bd606d0b6667168afdfde8389e YELLOW
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
index 1c6ac50477a78cd77d9e4daf36f423d4b4dbdf63..fc281e60592e54bd606d0b6667168afdfde8389e 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
@@ -15,6 +15,8 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.kernel.ui;
 
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
+
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -81,7 +83,7 @@ public class ToolingKernelUIActivator extends AbstractUIPlugin {
 
 	/** Returns image descriptor of the image in the kernel plugin. */
 	public static ImageDescriptor getImageDescriptor(String iconPath) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, iconPath);
+		return imageDescriptorFromBundle(PLUGIN_ID, iconPath).orElse(null);
 	}
 
 	/** {@inheritDoc} */