diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 607a25e7175..54b39a70949 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -10186,8 +10186,8 @@ nsCSSFrameConstructor::CantRenderReplacedElement(nsIPresShell* aPresShell,
   parentFrame->FirstChild(aPresContext, listName, &firstChild);
   nsFrameList   frameList(firstChild);
   
-  // See whether it's an IMG or an OBJECT element
-  if (nsHTMLAtoms::img == tag.get()) {
+  // See whether it's an IMG or an INPUT element (for image buttons)
+  if (nsHTMLAtoms::img == tag.get() || nsHTMLAtoms::input == tag.get()) {
     // It's an IMG element. Try and construct an alternate frame to use when the
     // image can't be rendered
     nsIFrame* newFrame;
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index 607a25e7175..54b39a70949 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -10186,8 +10186,8 @@ nsCSSFrameConstructor::CantRenderReplacedElement(nsIPresShell* aPresShell,
   parentFrame->FirstChild(aPresContext, listName, &firstChild);
   nsFrameList   frameList(firstChild);
   
-  // See whether it's an IMG or an OBJECT element
-  if (nsHTMLAtoms::img == tag.get()) {
+  // See whether it's an IMG or an INPUT element (for image buttons)
+  if (nsHTMLAtoms::img == tag.get() || nsHTMLAtoms::input == tag.get()) {
     // It's an IMG element. Try and construct an alternate frame to use when the
     // image can't be rendered
     nsIFrame* newFrame;