diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 3d4e5b13d..813620528 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -738,7 +738,8 @@
             .cp-toolbar-title-value {
                 overflow: hidden;
                 text-overflow: ellipsis;
-                border-collapse: collapse;
+                margin: 0;
+                line-height: 1.5;
                 &:focus {
                     margin: 2px;
                     border-radius: @variables_radius;
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index efb057681..9a523a1e0 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -856,16 +856,16 @@ MessengerUI, Messages, Pages, PadTypes, Icons) {
 
     var createPageTitle = function (toolbar, config) {
         if (!config.pageTitle) { return; }
-        var $titleContainer = $('<span>', {
+        var $titleContainer = $('<div>', {
             'class': TITLE_CLS
         }).appendTo(toolbar.$top);
 
         toolbar.$top.find('.filler').hide();
 
-        var $hoverable = $('<span>', {'class': 'cp-toolbar-title-hoverable'}).appendTo($titleContainer);
+        var $hoverable = $('<div>', {'class': 'cp-toolbar-title-hoverable'}).appendTo($titleContainer);
 
         // Buttons
-        var $b = $('<span>', {
+        var $b = $('<h1>', {
             'class': 'cp-toolbar-title-value cp-toolbar-title-value-page'
         }).appendTo($hoverable).text(config.pageTitle);