diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index 481ffda426..1031937326 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -92,7 +92,8 @@ frappe.upload = {
 						var attachment = r.message;
 						opts.callback(attachment, r);
 						$(document).trigger("upload_complete", attachment);
-					}
+					},
+					btn: opts.btn
 				});
 			}
 		}
diff --git a/frappe/templates/styles/standard.css b/frappe/templates/styles/standard.css
index a2b9e0fb1a..2e5e4b5469 100644
--- a/frappe/templates/styles/standard.css
+++ b/frappe/templates/styles/standard.css
@@ -24,6 +24,11 @@
 	.page-break:last-child {
 		border-bottom: 0px;
 	}
+
+	/* mozilla hack for images in table */
+	body:last-child .print-format td img {
+		width: 100% !important;
+	}
 }
 
 @media print {