diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
index 140968c..519d1ef 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
@@ -93,8 +93,6 @@ public function getFormId() {
    * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state, Vocabulary $taxonomy_vocabulary = NULL) {
-    // @todo entity_page_label does not work with new routing system.
-    drupal_set_title($taxonomy_vocabulary->label());
     global $pager_page_array, $pager_total, $pager_total_items;
 
     // Check for confirmation forms.
@@ -235,8 +233,15 @@ public function buildForm(array $form, array &$form_state, Vocabulary $taxonomy_
     );
     foreach ($current_page as $key => $term) {
       $form['terms'][$key]['#term'] = $term;
+      $indentation = array();
+      if (isset($term->depth) && $term->depth > 0) {
+        $indentation = array(
+          '#theme' => 'indentation',
+          '#size' => $term->depth,
+        );
+      }
       $form['terms'][$key]['term'] = array(
-        '#prefix' => isset($term->depth->value) && $term->depth->value > 0 ? theme('indentation', array('size' => $term->depth->value)) : '',
+        '#prefix' => !empty($indentation) ? drupal_render($indentation) : '',
         '#type' => 'link',
         '#title' => $term->label(),
         '#href' => "taxonomy/term/$term->id()",