diff --git a/core/modules/quickedit/js/theme.js b/core/modules/quickedit/js/theme.js
index 93dc3f2..6ecd8fc 100644
--- a/core/modules/quickedit/js/theme.js
+++ b/core/modules/quickedit/js/theme.js
@@ -37,14 +37,14 @@
    */
   Drupal.theme.quickeditEntityToolbar = function (settings) {
     var html = '';
-    html += '<div id="' + settings.id + '" class="quickedit quickedit-toolbar-container clearfix">';
-    html += '<i class="quickedit-toolbar-pointer"></i>';
-    html += '<div class="quickedit-toolbar-content">';
-    html += '<div class="quickedit-toolbar quickedit-toolbar-entity clearfix icon icon-pencil">';
-    html += '<div class="quickedit-toolbar-label" />';
+    html += '<div id="' + settings.id + '" class="quickedit-toolbar__container clearfix">';
+    html += '<i class="quickedit-toolbar__pointer"></i>';
+    html += '<div class="quickedit-toolbar__content">';
+    html += '<div class="quickedit-toolbar__entity quickedit-icon quickedit-icon--pencil clearfix">';
+    html += '<div class="quickedit-toolbar__label" />';
     html += '</div>';
-    html += '<div class="quickedit-toolbar quickedit-toolbar-field clearfix" />';
-    html += '</div><div class="quickedit-toolbar-lining"></div></div>';
+    html += '<div class="quickedit-toolbar__field clearfix" />';
+    html += '</div><div class="quickedit-toolbar__lining"></div></div>';
     return html;
   };
 
@@ -73,7 +73,7 @@
    *   The corresponding HTML.
    */
   Drupal.theme.quickeditEntityToolbarFence = function () {
-    return '<div id="quickedit-toolbar-fence" />';
+    return '<div class="quickedit-fence" />';
   };
 
   /**