diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 89c52d007ee..6e2af595802 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -204,6 +204,10 @@ $.widget( "ui.button", {
 					}
 				});
 			}
+			
+			this.buttonElement.find("img").click(function() {
+				self.buttonElement.click();
+			});
 		}
 
 		// TODO: pull out $.Widget's handling for the disabled option into
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 065d640fb31..6393278378c 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -626,7 +626,7 @@ $.widget("ui.dialog", {
 				height: "auto",
 				width: options.width
 			})
-			.height();
+			.outerHeight();
 		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
 		
 		if ( options.height === "auto" ) {