diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java
index 67647fe..f0670c0 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jface.resource;
 
+import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -100,8 +101,10 @@
 /**
  * Returns a stream on the image contents.  Returns
  * null if a stream could not be opened.
+ * 
+ * @return the buffered stream on the file
  */
-private InputStream getStream() {
+private BufferedInputStream getStream() {
 	InputStream is = null;
 
 	if (location != null) {
@@ -113,7 +116,7 @@
 			return null;
 		}
 	}
-	return is;
+	return new BufferedInputStream(is);
 }
 /* (non-Javadoc)
  * Method declared on Object.
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java
index c6341a2..01ccf0b 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jface.resource;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -71,10 +72,11 @@
 /**
  * Returns a stream on the image contents.  Returns
  * null if a stream could not be opened.
+ * @return the stream for loading the data
  */
 protected InputStream getStream() {
 	try {
-		return url.openStream();
+		return new BufferedInputStream(url.openStream());
 	} catch (IOException e) {
 		return null;
 	}