diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 9efbd7a4d..c3f882460 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -582,10 +582,10 @@ MessengerUI, Messages) {
             throw new Error("You must provide a `metadataMgr` to display the userlist");
         }
 
-        var $shareBlock = $('<button>', {
-            'class': 'fa fa-shhare-alt cp-toolbar-share-button',
-            title: Messages.shareButton
-        });
+        var $shareBlock = $(h('button.cp-toolar-share-button', [
+            h('i.fa.fa-shhare-alt'),
+            h('span.cp-button-name', Messages.shareButton)
+        ]));
         Common.getSframeChannel().event('EV_SHARE_OPEN', {
             hidden: true,
             file: true
diff --git a/www/file/inner.js b/www/file/inner.js
index b3e6d47e8..dba267b46 100644
--- a/www/file/inner.js
+++ b/www/file/inner.js
@@ -86,7 +86,6 @@ define([
             configTb.pageTitle = Messages.upload_title;
         }
         var toolbar = APP.toolbar = Toolbar.create(configTb);
-        toolbar.$rightside.html('');
 
         if (!uploadMode) {
             var hexFileName = secret.channel;
@@ -132,11 +131,12 @@ define([
                     pageTitle: title,
                     title: Title.getTitleConfig(),
                 });
-                toolbar.$rightside.append(common.createButton('forget', true));
-                toolbar.$rightside.append(common.createButton('properties', true));
+                toolbar.$drawer.append(common.createButton('forget', true));
+                toolbar.$drawer.append(common.createButton('properties', true));
                 if (common.isLoggedIn()) {
-                    toolbar.$rightside.append(common.createButton('hashtag', true));
+                    toolbar.$drawer.append(common.createButton('hashtag', true));
                 }
+                toolbar.$file.show();
 
                 var displayFile = function (ev, sizeMb, CB) {
                     var called_back;
@@ -159,7 +159,7 @@ define([
                         if (ev) { $dlButton.click(); }
 
                         if (!rightsideDisplayed) {
-                            toolbar.$rightside
+                            toolbar.$drawer
                             .append(common.createButton('export', true, {}, function () {
                                 saveAs(decrypted.content, decrypted.metadata.name);
                             }));