diff --git a/core/modules/filter/css/filter.admin.css b/core/modules/filter/css/filter.admin.css
index e6a0d96..f766597 100644
--- a/core/modules/filter/css/filter.admin.css
+++ b/core/modules/filter/css/filter.admin.css
@@ -80,6 +80,6 @@
   padding-right: 0;
 }
 
-tr.fallback_format td {
+.fallback-filter-format-roles-description {
   font-style: italic;
 }
diff --git a/core/modules/filter/src/FilterFormatListBuilder.php b/core/modules/filter/src/FilterFormatListBuilder.php
index f5f925b..4844448 100644
--- a/core/modules/filter/src/FilterFormatListBuilder.php
+++ b/core/modules/filter/src/FilterFormatListBuilder.php
@@ -96,8 +96,8 @@ public function buildRow(EntityInterface $entity) {
     // Check whether this is the fallback text format. This format is available
     // to all roles and cannot be disabled via the admin interface.
     $row['label'] = $this->getLabel($entity);
+    $row['roles'] = [];
     if ($entity->isFallbackFormat()) {
-      $row['#attributes']['class'][] = 'fallback_format';
       $fallback_choice = $this->configFactory->get('filter.settings')->get('always_show_fallback_choice');
       if ($fallback_choice) {
         $roles_markup = $this->t('All roles may use this format');
@@ -105,13 +105,14 @@ public function buildRow(EntityInterface $entity) {
       else {
         $roles_markup = $this->t('This format is shown when no other formats are available');
       }
+      $row['roles']['#wrapper_attributes']['class'][] = 'fallback-filter-format-roles-description';
     }
     else {
       $roles = array_map('\Drupal\Component\Utility\SafeMarkup::checkPlain', filter_get_roles_by_format($entity));
       $roles_markup = $roles ? implode(', ', $roles) : $this->t('No roles may use this format');
     }
 
-    $row['roles'] = !empty($this->weightKey) ? array('#markup' => $roles_markup) : $roles_markup;
+    $row['roles']['#markup'] = $roles_markup;
 
     return $row + parent::buildRow($entity);
   }
diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php
index 73076a3..220ea71 100644
--- a/core/modules/node/src/Controller/NodeController.php
+++ b/core/modules/node/src/Controller/NodeController.php
@@ -206,9 +206,9 @@ public function revisionOverview(NodeInterface $node) {
         $row[0]['class'] = ['revision-current'];
         $row[] = [
           'data' => [
-            'prefix' => '<em>',
+            '#prefix' => '<em>',
             '#markup' => $this->t('current revision'),
-            'suffix' => '</em>',
+            '#suffix' => '</em>',
           ],
           'class' => ['revision-current'],
         ];
diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc
index d911fdf..6b75764 100644
--- a/core/modules/update/update.report.inc
+++ b/core/modules/update/update.report.inc
@@ -243,7 +243,7 @@ function template_preprocess_update_project_status(&$variables) {
       $extra_item = array();
       $extra_item['attributes'] = new Attribute();
       $extra_item['label'] = $value['label'];
-      $extra_item['data'] = ['prefix' => '<em>', '#markup' => $value['data'], '#prefix' => '</em>'];
+      $extra_item['data'] = ['#prefix' => '<em>', '#markup' => $value['data'], '#prefix' => '</em>'];
       $variables['extras'][] = $extra_item;
     }
   }