diff --git a/css/jquery.mobile.button.css b/css/jquery.mobile.button.css
index 640ad044..3fecb926 100644
--- a/css/jquery.mobile.button.css
+++ b/css/jquery.mobile.button.css
@@ -4,7 +4,7 @@
 * Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
 */
 .ui-btn { display: block; text-align: center; cursor:pointer;  position: relative; margin: .5em 5px; padding: 0; }
-.ui-header .ui-btn, .ui-bar .ui-btn { display: inline-block; font-size: 13px; margin: 0; }
+.ui-header .ui-btn, .ui-bar .ui-btn, .ui-btn-inline { display: inline-block; font-size: 13px; margin: 0; }
 .ui-btn-inner { padding: .6em 25px; display: block; height: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
 .ui-btn-text {  }
 .ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner { padding: .4em 8px .5em; }
diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js
index 717c8009..37057a82 100644
--- a/js/jquery.mobile.buttonMarkup.js
+++ b/js/jquery.mobile.buttonMarkup.js
@@ -24,8 +24,9 @@ $.fn.buttonMarkup = function( options ){
 						return 'c';
 					}
 				})(),
-				iconpos: el.attr('data-iconpos'),
-				icon: el.attr('data-icon')
+				iconpos: el.data('iconpos'),
+				icon: el.data('icon'),
+				inline: el.data('inline')
 			}, $.fn.buttonMarkup.defaults, options),
 			
 			// Classes Defined
@@ -33,6 +34,10 @@ $.fn.buttonMarkup = function( options ){
 			innerClass = "ui-btn-inner",
 			iconClass;
 		
+		if( o.inline ){
+			buttonClass += " ui-btn-inline";
+		}
+		
 		if (o.icon) {
 			o.icon = 'ui-icon-' + o.icon;
 
diff --git a/js/jquery.mobile.forms.button.js b/js/jquery.mobile.forms.button.js
index dd2ca24f..3d30493a 100644
--- a/js/jquery.mobile.forms.button.js
+++ b/js/jquery.mobile.forms.button.js
@@ -10,7 +10,12 @@ $.fn.customButton = function(){
 		var button = $(this).addClass('ui-btn-hidden').attr('tabindex','-1');
 		//add ARIA role
 		$('<a href="#" role="button">'+ (button.text() || button.val()) +'</a>')
-			.buttonMarkup({theme: button.attr('data-theme'), icon: button.attr('data-icon')})
+			.buttonMarkup({
+				theme: button.data('theme'), 
+				icon: button.data('icon'),
+				iconpos: button.data('iconpos'),
+				inline: button.data('inline')
+			})
 			.click(function(){
 				button.click(); 
 				return false;