diff --git a/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java b/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java
index 8db33ed2c2..7af4822c57 100644
--- a/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java
+++ b/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java
@@ -27,6 +27,7 @@ import java.net.URL;
 import java.util.Properties;
 import java.util.logging.Level;
 
+import org.adempiere.base.Core;
 import org.compiere.model.MAttachment;
 import org.compiere.model.MImage;
 import org.compiere.print.MPrintFormatItem;
@@ -209,6 +210,9 @@ public class ImageElement extends PrintElement
 		{
 			ClassLoader cl = getClass().getClassLoader();
 			url = cl.getResource(urlString);
+			if (url != null)
+				return url;
+			url = Core.getResourceFinder().getResource(urlString);
 			if (url != null)
 				return url;
 			log.log(Level.WARNING, "Not found - " + urlString);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
index 4aa2f88c27..ea9407d22e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
@@ -27,7 +27,12 @@ public class WebUIResourceFinder implements IResourceFinder {
 
 	@Override
 	public URL getResource(String name) {
-		return WebUIActivator.getBundleContext().getBundle().getEntry(name);
+		URL url = WebUIActivator.getBundleContext().getBundle().getEntry(name);
+		if (url == null && name.startsWith("org/compiere/images")) {
+			String t = name.substring("org/compiere/".length());
+			url = WebUIActivator.getBundleContext().getBundle().getEntry(t);
+		}
+		return url;
 	}
 
 }