diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php
index 3979fff..959042d 100644
--- a/core/modules/content_translation/src/ContentTranslationHandler.php
+++ b/core/modules/content_translation/src/ContentTranslationHandler.php
@@ -536,7 +536,12 @@ protected function addTranslatabilityClue(&$element) {
 
     // Elements which can have a #title attribute according to FAPI Reference.
     if (!isset($suffix)) {
-      $suffix = ' <span class="translation-entity-all-languages">(' . t('all languages') . ')</span>';
+      $build = array(
+        '#theme' => 'mark',
+        '#status' => 'shared',
+        '#type' => 'warning',
+      );
+      $suffix = drupal_render($build);
       $fapi_title_elements = array_flip(array('checkbox', 'checkboxes', 'date', 'details', 'fieldset', 'file', 'item', 'password', 'password_confirm', 'radio', 'radios', 'select', 'text_format', 'textarea', 'textfield', 'weight'));
     }
 
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php b/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
index a5d6d09..a34ff01 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
@@ -116,8 +116,8 @@ protected function doTestBasicTranslation() {
     // Assert that HTML is escaped in "all languages" in UI after SafeMarkup
     // change.
     if ($this->testHTMLEscapeForAllLanguages) {
-      $this->assertNoRaw('&lt;span class=&quot;translation-entity-all-languages&quot;&gt;(all languages)&lt;/span&gt;');
-      $this->assertRaw('<span class="translation-entity-all-languages">(all languages)</span>');
+      $this->assertNoRaw('&lt;mark class=&quot;marker marker--warning&quot;&gt;shared&lt;/mark&gt;');
+      $this->assertRaw('<mark class="marker marker--warning">shared</mark>');
     }
 
     // Ensure that the content language cache context is not yet added to the