diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 6fe7856..a349add 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -80,7 +80,6 @@ function filter_theme() {
   return array(
     'filter_tips' => array(
       'variables' => array('tips' => NULL, 'long' => FALSE),
-      'file' => 'filter.pages.inc',
       'template' => 'filter-tips',
     ),
     'text_format_wrapper' => array(
@@ -766,8 +765,6 @@ function filter_process_format($element) {
     '#attributes' => array('class' => array('filter-help')),
     '#markup' => l(t('About text formats'), 'filter/tips', array('attributes' => array('target' => '_blank'))),
     '#weight' => 0,
-    '#prefix' => '<p>',
-    '#suffix' => '</p>',
   );
 
   $all_formats = filter_formats();
diff --git a/core/modules/filter/filter.pages.inc b/core/modules/filter/filter.pages.inc
deleted file mode 100644
index 8f2e298..0000000
--- a/core/modules/filter/filter.pages.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * @file
- * User page callbacks for the Filter module.
- */
-
-/**
- * Returns HTML for a set of filter tips.
- *
- * @param array $variables
- *   An associative array containing:
- *   - tips: An array containing descriptions and a CSS ID in the form of
- *     'module-name/filter-id' (only used when $long is TRUE) for each
- *     filter in one or more text formats. Example:
- *     @code
- *       array(
- *         'Full HTML' => array(
- *           0 => array(
- *             'tip' => 'Web page addresses and e-mail addresses turn into links automatically.',
- *             'id' => 'filter/2',
- *           ),
- *         ),
- *       );
- *     @endcode
- *   - long: (optional) Whether the passed-in filter tips contain extended
- *     explanations, i.e. intended to be output on the path 'filter/tips'
- *     (TRUE), or are in a short format, i.e. suitable to be displayed below a
- *     form element. Defaults to FALSE.
- *
- * @see _filter_tips()
- * @ingroup themeable
- */
-function theme_filter_tips($variables) {
-  $tips = $variables['tips'];
-  $long = $variables['long'];
-  $output = '';
-
-  $multiple = count($tips) > 1;
-  if ($multiple) {
-    $output = '<h2>' . t('Text Formats') . '</h2>';
-  }
-
-  if (count($tips)) {
-    if ($multiple) {
-      $output .= '<div class="compose-tips">';
-    }
-    foreach ($tips as $name => $tiplist) {
-      if ($multiple) {
-        $output .= '<div class="filter-type filter-' . drupal_html_class($name) . '">';
-        $output .= '<h3>' . $name . '</h3>';
-      }
-
-      if (count($tiplist) > 0) {
-        $output .= '<ul class="tips">';
-        foreach ($tiplist as $tip) {
-          $output .= '<li' . ($long ? ' class="filter-' . str_replace("/", "-", $tip['id']) . '">' : '>') . $tip['tip'] . '</li>';
-        }
-        $output .= '</ul>';
-      }
-
-      if ($multiple) {
-        $output .= '</div>';
-      }
-    }
-    if ($multiple) {
-      $output .= '</div>';
-    }
-  }
-
-  return $output;
-}
diff --git a/core/modules/filter/lib/Drupal/filter/Controller/FilterController.php b/core/modules/filter/lib/Drupal/filter/Controller/FilterController.php
index ca4e733..ae8bc01 100644
--- a/core/modules/filter/lib/Drupal/filter/Controller/FilterController.php
+++ b/core/modules/filter/lib/Drupal/filter/Controller/FilterController.php
@@ -23,7 +23,7 @@ class FilterController {
    * @return array
    *   A renderable array.
    *
-   * @see theme_filter_tips()
+   * @see template_preprocess_filter_tips()
    */
   function filterTips(FilterFormatInterface $filter_format = NULL) {
     $tips = $filter_format ? $filter_format->format : -1;
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php b/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php
index 40156e4..1d0df9e 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php
@@ -262,7 +262,7 @@ public function getHTMLRestrictions();
    * @param bool $long
    *   Whether this callback should return a short tip to display in a form
    *   (FALSE), or whether a more elaborate filter tips should be returned for
-   *   theme_filter_tips() (TRUE).
+   *   template_preprocess_filter_tips() (TRUE).
    *
    * @return string|null
    *   Translated text to display as a tip, or NULL if this filter has no tip.
diff --git a/core/modules/filter/templates/text-format-wrapper.html.twig b/core/modules/filter/templates/text-format-wrapper.html.twig
index 511c2b0..f453971 100644
--- a/core/modules/filter/templates/text-format-wrapper.html.twig
+++ b/core/modules/filter/templates/text-format-wrapper.html.twig
@@ -7,12 +7,10 @@
  * - children: Text format element children.
  * - description: Text format element description.
  *
- * @see template_preprocess_text_format_wrapper()
- *
  * @ingroup themeable
  */
 #}
-<div class="text-format-wrapper">
+<div class="text-format-wrapper form-item">
   {{ children }}
   {% if description %}
     <div class="description">{{ description }}</div>