diff --git a/server.js b/server.js
index 3cea171c6..07cae4b23 100644
--- a/server.js
+++ b/server.js
@@ -311,7 +311,7 @@ var httpServer = Env.httpServer = Http.createServer(app);
 nThen(function (w) {
     Fs.exists(__dirname + "/customize", w(function (e) {
         if (e) { return; }
-        console.log("Cryptpad is customizable, see customize.dist/readme.md for details");
+        console.log("CryptPad is customizable, see customize.dist/readme.md for details");
     }));
 }).nThen(function (w) {
     httpServer.listen(config.httpPort,config.httpAddress,function(){
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index e954d21f4..fd1c96490 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -460,7 +460,11 @@ MessengerUI, Messages, Pages) {
     Messages.ui_expand = "Expand"; // XXX
 
     createCollapse = function (toolbar) {
-        var icon = h('i.fa.fa-caret-up');
+        var up = 'fa-chevron-up';
+        var down = 'fa-chevron-down';
+        var both = up + ' ' + down;
+
+        var icon = h('i.fa.' + up);
         var $icon = $(icon);
         var text = h('span', Messages.ui_collapse);
         var $text = $(text);
@@ -472,7 +476,7 @@ MessengerUI, Messages, Pages) {
         $button.click(function () {
             toolbar.$top.toggleClass('toolbar-hidden');
             var hidden = toolbar.$top.hasClass('toolbar-hidden');
-            $icon.toggleClass('fa-caret-down fa-caret-up'); //.toggleClass('fa-caret-up');
+            $icon.toggleClass(both);
             $button.toggleClass('cp-toolbar-button-active');
             $text.text(Messages[(hidden ? 'ui_expand': 'ui_collapse')]);
         });