diff --git a/core/modules/toolbar/js/escapeAdmin.js b/core/modules/toolbar/js/escapeAdmin.js
index 7c83971..e17ff7b 100644
--- a/core/modules/toolbar/js/escapeAdmin.js
+++ b/core/modules/toolbar/js/escapeAdmin.js
@@ -28,15 +28,7 @@ Drupal.behaviors.escapeAdmin = {
     var $toolbarEscape = $('[data-toolbar-escape-admin]').once('escapeAdmin');
     if ($toolbarEscape.length) {
       if (drupalSettings.currentPathIsAdmin && escapeAdminPath) {
-        $toolbarEscape
-          .removeClass('toolbar-icon-home')
-          .addClass('toolbar-icon-escape-admin')
-          .attr({
-            'href': Drupal.url(escapeAdminPath),
-            'title': Drupal.t('Return to site content')
-          })
-          .text(Drupal.t('Back to site'));
-
+        $toolbarEscape.attr('href', Drupal.url(escapeAdminPath));
         $toolbarEscape.closest('.toolbar-tab').removeClass('hidden');
 
         // Escape admin when hitting Esc key.
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 763b603..017b5b8 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -410,12 +410,12 @@ function toolbar_toolbar() {
     '#type' => 'toolbar_item',
     'tab' => array(
       '#type' => 'link',
-      '#title' => t('Home'),
+      '#title' => t('Back to site'),
       '#href' => '<front>',
       '#options' => array(
         'attributes' => array(
-          'title' => t('Home page'),
-          'class' => array('toolbar-icon', 'toolbar-icon-home'),
+          'title' => t('Return to site content'),
+          'class' => array('toolbar-icon', 'toolbar-icon-escape-admin'),
           'data-toolbar-escape-admin' => TRUE,
         ),
       ),