diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 1aec980d0..623e2b88b 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -805,6 +805,19 @@
     }
 
 
+    .cp-toolbar-bottom {
+        .cp-toolbar-bottom-right {
+            .fa-history { order: 50; }
+            .fa-list, .fa-th-large { order: 25; }
+            #cp-app-drive-toolbar-context-mobile, #cp-app-drive-toolbar-contextbuttons { order: 0; }
+            #cp-app-drive-toolbar-contextbuttons {
+                height: @variables_bar-height;
+                display: flex;
+                align-items: center;
+            }
+        }
+    }
+
     /* Toolbar */
 
     #cp-app-drive-toolbar {
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 2729c6fb0..e15b36011 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -556,6 +556,7 @@ define([
         APP.origin = priv.origin;
         APP.hideDuplicateOwned = Util.find(priv, ['settings', 'drive', 'hideDuplicate']);
         APP.closed = false;
+        APP.toolbar = driveConfig.toolbar;
 
         var $readOnly = $(h('div#cp-app-drive-edition-state.cp-app-drive-content-info-box', Messages.readonly));
 
@@ -582,7 +583,7 @@ define([
         var $tree = APP.$tree = $("#cp-app-drive-tree");
         var $content = APP.$content = $("#cp-app-drive-content");
         var $appContainer = $(".cp-app-drive-container");
-        var $driveToolbar = $("#cp-app-drive-toolbar");
+        var $driveToolbar = APP.toolbar.$bottom;
         var $contextMenu = createContextMenu().appendTo($appContainer);
 
         var $contentContextMenu = $("#cp-app-drive-context-content");
@@ -2237,8 +2238,12 @@ define([
         window.addEventListener("resize", collapseDrivePath);
         var treeResizeObserver = new MutationObserver(collapseDrivePath);
         treeResizeObserver.observe($("#cp-app-drive-tree")[0], {"attributes": true});
+
+        // XXX
+        /*
         var toolbarButtonAdditionObserver = new MutationObserver(collapseDrivePath);
         $(function () { toolbarButtonAdditionObserver.observe($("#cp-app-drive-toolbar")[0], {"childList": true, "subtree": true}); });
+        */
 
 
         // Create the title block with the "parent folder" button
@@ -2367,16 +2372,16 @@ define([
             var $gridButton = $gridIcon.clone();
 
             $listButton.click(function () {
-                $gridButton.removeClass('cp-app-drive-toolbar-active');
-                $listButton.addClass('cp-app-drive-toolbar-active');
+                $gridButton.show();
+                $listButton.hide();
                 setViewMode('list');
                 $('#' + FOLDER_CONTENT_ID).removeClass('cp-app-drive-content-grid');
                 $('#' + FOLDER_CONTENT_ID).addClass('cp-app-drive-content-list');
                 Feedback.send('DRIVE_LIST_MODE');
             });
             $gridButton.click(function () {
-                $listButton.removeClass('cp-app-drive-toolbar-active');
-                $gridButton.addClass('cp-app-drive-toolbar-active');
+                $listButton.show();
+                $gridButton.hide();
                 setViewMode('grid');
                 $('#' + FOLDER_CONTENT_ID).addClass('cp-app-drive-content-grid');
                 $('#' + FOLDER_CONTENT_ID).removeClass('cp-app-drive-content-list');
@@ -2384,9 +2389,9 @@ define([
             });
 
             if (getViewMode() === 'list') {
-                $listButton.addClass('cp-app-drive-toolbar-active');
+                $listButton.hide();
             } else {
-                $gridButton.addClass('cp-app-drive-toolbar-active');
+                $gridButton.hide();
             }
             $listButton.attr('title', Messages.fm_viewListButton);
             $gridButton.attr('title', Messages.fm_viewGridButton);
@@ -3002,20 +3007,16 @@ define([
 
         // Drive content toolbar
         var createToolbar = function () {
-            var $toolbar = $driveToolbar;
-            $toolbar.html('');
-            $('<div>', {'class': 'cp-app-drive-toolbar-leftside'}).appendTo($toolbar);
-            $('<div>', {'class': 'cp-app-drive-path cp-unselectable'}).appendTo($toolbar);
-            $('<div>', {'class': 'cp-app-drive-toolbar-filler'}).appendTo($toolbar);
-            var $rightside = $('<div>', {'class': 'cp-app-drive-toolbar-rightside'})
-                .appendTo($toolbar);
+            var $toolbar = APP.toolbar.$bottom;
+            APP.toolbar.$bottomL.html('');
+            APP.toolbar.$bottomR.html('');
             if (APP.histConfig && (APP.loggedIn || !APP.newSharedFolder)) {
                 // ANON_SHARED_FOLDER
                 var $hist = common.createButton('history', true, {histConfig: APP.histConfig});
-                $rightside.append($hist);
+                APP.toolbar.$bottomR.append($hist);
             }
             if (APP.$burnThisDrive) {
-                $rightside.append(APP.$burnThisDrive);
+                APP.toolbar.$bottomR.append(APP.$burnThisDrive);
             }
             return $toolbar;
         };
@@ -3514,10 +3515,10 @@ define([
                 if (mode) {
                     $dirContent.addClass(getViewModeClass());
                 }
-                createViewModeButton($toolbar.find('.cp-app-drive-toolbar-rightside'));
+                createViewModeButton(APP.toolbar.$bottomR);
             }
             if (inTrash) {
-                createEmptyTrashButton($toolbar.find('.cp-app-drive-toolbar-rightside'));
+                createEmptyTrashButton(APP.toolbar.$bottomR);
             }
 
             var $list = $('<ul>').appendTo($dirContent);
@@ -3536,27 +3537,27 @@ define([
 
             // NewButton can be undefined if we're in read only mode
             if (!readOnlyFolder) {
-                createNewButton(isInRoot, $toolbar.find('.cp-app-drive-toolbar-leftside'));
+                createNewButton(isInRoot, APP.toolbar.$bottomL);
             }
             if (sfId) {
-                createShareButton(sfId, $toolbar.find('.cp-app-drive-toolbar-leftside'));
+                createShareButton(sfId, APP.toolbar.$bottomL);
             }
 
 
-            createTitle($toolbar.find('.cp-app-drive-path'), path);
+            createTitle($toolbar.find('.cp-app-drive-path'), path); // XXX
 
             if (APP.mobile()) {
                 var $context = $('<button>', {
                     id: 'cp-app-drive-toolbar-context-mobile'
                 });
                 $context.append($('<span>', {'class': 'fa fa-caret-down'}));
-                $context.appendTo($toolbar.find('.cp-app-drive-toolbar-rightside'));
+                $context.appendTo(APP.toolbar.$bottomR);
                 $context.click(function (e) {
                     e.preventDefault();
                     e.stopPropagation();
                     var $li = findSelectedElements();
                     if ($li.length !== 1) {
-                        $li = findDataHolder($tree.find('.cp-app-drive-element-active'));
+                        $li = findDataHolder($tree.find('.cp-toolbar-button-active'));
                     }
                     // Close if already opened
                     if ($('.cp-contextmenu:visible').length) {
@@ -3568,7 +3569,7 @@ define([
                 });
             } else {
                 var $contextButtons = $('<span>', {'id' : 'cp-app-drive-toolbar-contextbuttons'});
-                $contextButtons.appendTo($toolbar.find('.cp-app-drive-toolbar-rightside'));
+                $contextButtons.appendTo(APP.toolbar.$bottomR);
             }
             updateContextButton();
 
diff --git a/www/drive/inner.html b/www/drive/inner.html
index b53b1a90e..cfafb0e1f 100644
--- a/www/drive/inner.html
+++ b/www/drive/inner.html
@@ -15,7 +15,6 @@
         <div id="cp-app-drive-tree">
         </div>
         <div id="cp-app-drive-content-container">
-            <div id="cp-app-drive-toolbar"></div>
             <div id="cp-app-drive-connection-state" style="display: none"></div>
             <div id="cp-app-drive-edition-state" class="cp-app-drive-content-info-box" style="display: none"></div>
             <div id="cp-app-drive-content" tabindex="2"></div>
diff --git a/www/drive/inner.js b/www/drive/inner.js
index 3d439eda4..831192a52 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -201,10 +201,8 @@ define([
                 sfCommon: common,
                 $container: APP.$bar
             };
-            var toolbar = APP.toolbar = Toolbar.create(configTb);
+            var toolbar = Toolbar.create(configTb);
 
-            var $rightside = toolbar.$rightside;
-            $rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar
             var $displayName = APP.$bar.find('.' + Toolbar.constants.username);
             metadataMgr.onChange(function () {
                 var name = metadataMgr.getUserData().name || Messages.anonymous;
@@ -274,6 +272,7 @@ define([
                 updateObject: updateObject,
                 updateSharedFolders: updateSharedFolders,
                 history: history,
+                toolbar: toolbar,
                 APP: APP
             });
 
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 1cacec694..1c376962b 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -319,6 +319,7 @@ define([
                 updateSharedFolders: updateSharedFolders,
 
                 $limit: APP.usageBar && APP.usageBar.$container,
+                toolbar: APP.toolbar,
                 APP: driveAPP,
                 edPublic: APP.teamEdPublic,
                 editKey: teamData.secondaryKey
@@ -509,7 +510,6 @@ define([
             h('div.cp-app-drive-container', {tabindex:0}, [
                 h('div#cp-app-drive-tree'),
                 h('div#cp-app-drive-content-container', [
-                    h('div#cp-app-drive-toolbar'),
                     h('div#cp-app-drive-connection-state', {style: "display: none;"}, Messages.disconnected),
                     h('div#cp-app-drive-content', {tabindex:2})
                 ])
@@ -1313,8 +1313,7 @@ define([
                 sfCommon: common,
                 $container: $bar
             };
-            var toolbar = Toolbar.create(configTb);
-            toolbar.$rightside.hide(); // hide the bottom part of the toolbar
+            var toolbar = APP.toolbar = Toolbar.create(configTb);
             // Update the name in the user menu
             var $displayName = $bar.find('.' + Toolbar.constants.username);
             metadataMgr.onChange(function () {