diff --git a/css/ui/list.css b/css/ui/list.css
index bd08b49928..7a8a704953 100644
--- a/css/ui/list.css
+++ b/css/ui/list.css
@@ -8,8 +8,8 @@
 
 .wnlist .img-load {
 	display: none;
-	margin-left: 11px;
-	margin-top: 8px;
+	float: left;
+	margin-bottom: 8px;
 }
 
 /* list-row */
diff --git a/js/core.min.js b/js/core.min.js
index c52e243970..fb71952fa8 100644
--- a/js/core.min.js
+++ b/js/core.min.js
@@ -126,7 +126,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\
     </div>\
     \
     <div style="height: 37px; margin-bottom:9px" class="list-toolbar-wrapper">\
-     <div class="list-toolbar" style="float: left">\
+     <div class="list-toolbar btn-group" style="display:inline-block;">\
       <a class="btn btn-small btn-refresh btn-info">\
        <i class="icon-refresh icon-white"></i> Refresh</a>\
       <a class="btn btn-small btn-new">\
@@ -134,8 +134,9 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\
       <a class="btn btn-small btn-filter">\
        <i class="icon-search"></i> Filter</a>\
      </div>\
-     <img src="lib/images/ui/button-load.gif" \
-      class="img-load" style="float: left"/>\
+     <div style="display:inline-block; width: 24px; margin-left: 4px">\
+      <img src="lib/images/ui/button-load.gif" \
+      class="img-load"/></div>\
     </div><div style="clear:both"></div>\
     \
     <div class="no-result help hide">\
@@ -155,7 +156,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\
 if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newdoc(me.new_doctype);})}else{this.$w.find('.btn-new').remove();}
 if(!me.show_filters){this.$w.find('.btn-filter').remove();}
 if(this.hide_refresh||this.no_refresh){this.$w.find('.btn-refresh').remove();}
-this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){this.$w.find('.list-toolbar').addClass('btn-group')}
+this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){var w=0;this.$w.find('.list-toolbar a').each(function(i,e){w+=$(this).outerWidth();});this.$w.find('.list-toolbar').css('width',(w+10)+'px');}
 if(nbtns==0){this.$w.find('.list-toolbar-wrapper').toggle(false);}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function')
 this.onrun=a0;if(a0&&a0.callback)
 this.onrun=a0.callback;if(!a1&&!(a0&&a0.append))
diff --git a/js/wn/ui/listing.js b/js/wn/ui/listing.js
index 2b4a94f59c..1f763548a5 100644
--- a/js/wn/ui/listing.js
+++ b/js/wn/ui/listing.js
@@ -92,7 +92,7 @@ wn.ui.Listing = Class.extend({
 				</div>\
 				\
 				<div style="height: 37px; margin-bottom:9px" class="list-toolbar-wrapper">\
-					<div class="list-toolbar" style="float: left">\
+					<div class="list-toolbar btn-group" style="display:inline-block;">\
 						<a class="btn btn-small btn-refresh btn-info">\
 							<i class="icon-refresh icon-white"></i> Refresh</a>\
 						<a class="btn btn-small btn-new">\
@@ -100,8 +100,9 @@ wn.ui.Listing = Class.extend({
 						<a class="btn btn-small btn-filter">\
 							<i class="icon-search"></i> Filter</a>\
 					</div>\
-					<img src="lib/images/ui/button-load.gif" \
-						class="img-load" style="float: left"/>\
+					<div style="display:inline-block; width: 24px; margin-left: 4px">\
+						<img src="lib/images/ui/button-load.gif" \
+						class="img-load"/></div>\
 				</div><div style="clear:both"></div>\
 				\
 				<div class="no-result help hide">\
@@ -181,10 +182,14 @@ wn.ui.Listing = Class.extend({
 	btn_groupify: function() {
 		var nbtns = this.$w.find('.list-toolbar a').length;
 		if(nbtns > 1) {
-			this.$w.find('.list-toolbar').addClass('btn-group')
+			var w = 0;
+			this.$w.find('.list-toolbar a').each(function(i,e) { 
+				w+= $(this).outerWidth(); 
+			});
+			this.$w.find('.list-toolbar').css('width', (w+10) + 'px');
 		}
 
-		if(nbtns == 0) {
+		if(nbtns == 0) {	
 			this.$w.find('.list-toolbar-wrapper').toggle(false);
 		}
 	},