@@ -94,7 +94,7 @@ mpl.figure.prototype._init_toolbar = function () {
     var fig = this;
 
     var toolbar = document.createElement('div');
-    toolbar.setAttribute('style', 'width: 100%');
+    toolbar.classList = 'btn-toolbar';
     this.root.appendChild(toolbar);
 
     function on_click_closure(name) {
@@ -109,6 +109,8 @@ mpl.figure.prototype._init_toolbar = function () {
         };
     }
 
+    var buttonGroup = document.createElement('div');
+    buttonGroup.classList = 'btn-group';
     var button;
     for (var toolbar_ind in mpl.toolbar_items) {
         var name = mpl.toolbar_items[toolbar_ind][0];
@@ -117,6 +119,12 @@ mpl.figure.prototype._init_toolbar = function () {
         var method_name = mpl.toolbar_items[toolbar_ind][3];
 
         if (!name) {
+            /* Instead of a spacer, we start a new button group. */
+            if (buttonGroup.hasChildNodes()) {
+                toolbar.appendChild(buttonGroup);
+            }
+            buttonGroup = document.createElement('div');
+            buttonGroup.classList = 'btn-group';
             continue;
         }
 
@@ -127,13 +135,16 @@ mpl.figure.prototype._init_toolbar = function () {
         button.innerHTML = '<i class="fa ' + image + ' fa-lg"></i>';
         button.addEventListener('click', on_click_closure(method_name));
         button.addEventListener('mouseover', on_mouseover_closure(tooltip));
-        toolbar.appendChild(button);
+        buttonGroup.appendChild(button);
+    }
+
+    if (buttonGroup.hasChildNodes()) {
+        toolbar.appendChild(buttonGroup);
     }
 
     // Add the status bar.
     var status_bar = document.createElement('span');
-    status_bar.classList = 'mpl-message';
-    status_bar.setAttribute('style', 'text-align:right; float: right;');
+    status_bar.classList = 'mpl-message pull-right';
     toolbar.appendChild(status_bar);
     this.message = status_bar;