diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index fa0cf7791..b5f315706 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -244,9 +244,11 @@ define(function () {
     out.canvas_enable = "Enable draw";
     out.canvas_width = "Width";
     out.canvas_opacity = "Opacity";
-    out.canvas_opacityLabel = "opacity: {0}";
+    out.canvas_opacityLabel = "Opacity: {0}";
     out.canvas_widthLabel = "Width: {0}";
     out.canvas_saveToDrive = "Save this image as a file in your CryptDrive";
+    out.canvas_currentBrush = "Current brush";
+    out.canvas_chooseColor = "Choose a color";
 
     // Profile
     out.profileButton = "Profile"; // dropdown menu
@@ -343,6 +345,8 @@ define(function () {
     out.fm_backup_title = 'Backup link';
     out.fm_nameFile = 'How would you like to name that file?';
     out.fm_error_cantPin = "Internal server error. Please reload the page and try again.";
+    out.fm_viewListButton = "List view";
+    out.fm_viewGridButton = "Grid view";
     // File - Context menu
     out.fc_newfolder = "New folder";
     out.fc_rename = "Rename";
@@ -483,6 +487,10 @@ define(function () {
     out.todo_markAsIncompleteTitle = "Mark this task as incomplete";
     out.todo_removeTaskTitle = "Remove this task from your todo list";
 
+    // pad
+    out.pad_showToolbar = "Show toolbar";
+    out.pad_hideToolbar = "Hide toolbar";
+
     // general warnings
     out.warn_notPinned = "This pad is not in anyone's CryptDrive. It will expire after 3 months. <a href='/about.html#pinning'>Learn more...</a>";
 
diff --git a/www/drive/main.js b/www/drive/main.js
index b1b764336..468be48b8 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1374,6 +1374,8 @@ define([
             } else {
                 $gridButton.addClass('active');
             }
+            $listButton.attr('title', Messages.fm_viewListButton);
+            $gridButton.attr('title', Messages.fm_viewGridButton);
             $container.append($listButton).append($gridButton);
         };
 
diff --git a/www/pad/main.js b/www/pad/main.js
index 712edc9bf..a095ba46e 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -520,14 +520,17 @@ define([
                     $collapse.removeClass('fa-question');
                     var updateIcon = function () {
                         $collapse.removeClass('fa-caret-down').removeClass('fa-caret-up');
+                        $collapse.attr('title', '');
                         var isCollapsed = !$bar.find('.cke_toolbox_main').is(':visible');
                         if (isCollapsed) {
                             if (!initializing) { Cryptpad.feedback('HIDETOOLBAR_PAD'); }
                             $collapse.addClass('fa-caret-down');
+                            $collapse.attr('title', Messages.pad_showToolbar);
                         }
                         else {
                             if (!initializing) { Cryptpad.feedback('SHOWTOOLBAR_PAD'); }
                             $collapse.addClass('fa-caret-up');
+                            $collapse.attr('title', Messages.pad_hideToolbar);
                         }
                     };
                     updateIcon();
diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js
index 5a6fefb35..8a0fcf415 100644
--- a/www/whiteboard/main.js
+++ b/www/whiteboard/main.js
@@ -93,7 +93,7 @@ window.canvas = canvas;
             var img = ccanvas.toDataURL("image/png");
             var $img = $('<img>', {
                 src: img,
-                title: 'Current brush'
+                title: Messages.canvas_currentBrush
             });
             $controls.find('.selected').html('').append($img);
             canvas.freeDrawingCursor = 'url('+img+') '+size/2+' '+size/2+', crosshair';
@@ -289,7 +289,7 @@ window.canvas = canvas;
 
             var $color = module.$color = $('<button>', {
                 id: "color-picker",
-                title: "choose a color",
+                title: Messages.canvas_chooseColor,
                 'class': "fa fa-square rightside-button",
             })
             .on('click', function () {