diff --git a/core/modules/forum/src/Form/ForumForm.php b/core/modules/forum/src/Form/ForumForm.php
index 4641781..d9ae373 100644
--- a/core/modules/forum/src/Form/ForumForm.php
+++ b/core/modules/forum/src/Form/ForumForm.php
@@ -154,7 +154,7 @@ protected function forumParentSelect($tid, $title) {
     if ($tree) {
       foreach ($tree as $term) {
         if (!in_array($term->id(), $exclude)) {
-          $options[$term->id()] = str_repeat(' -- ', $term->depth) . $term->getName();
+          $options[$term->id()] = str_repeat('—', $term->depth) . ($term->depth ? ' ' : '') . $term->getName();
         }
       }
     }
diff --git a/core/modules/taxonomy/src/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php b/core/modules/taxonomy/src/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
index 83d9780..7547b1f 100644
--- a/core/modules/taxonomy/src/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
+++ b/core/modules/taxonomy/src/Plugin/Field/FieldType/TaxonomyTermReferenceItem.php
@@ -85,7 +85,7 @@ public function getSettableOptions(AccountInterface $account = NULL) {
         if ($vocabulary = entity_load('taxonomy_vocabulary', $tree['vocabulary'])) {
           if ($terms = taxonomy_get_tree($vocabulary->id(), $tree['parent'], NULL, TRUE)) {
             foreach ($terms as $term) {
-              $options[$term->id()] = str_repeat('-', $term->depth) . $term->getName();
+              $options[$term->id()] = str_repeat('—', $term->depth) . ($term->depth ? ' ' : '') . $term->getName();
             }
           }
         }
diff --git a/core/modules/taxonomy/src/Plugin/entity_reference/selection/TermSelection.php b/core/modules/taxonomy/src/Plugin/entity_reference/selection/TermSelection.php
index 50f3bc1..3877015 100644
--- a/core/modules/taxonomy/src/Plugin/entity_reference/selection/TermSelection.php
+++ b/core/modules/taxonomy/src/Plugin/entity_reference/selection/TermSelection.php
@@ -66,7 +66,7 @@ public function getReferenceableEntities($match = NULL, $match_operator = 'CONTA
       if ($vocabulary = entity_load('taxonomy_vocabulary', $bundle)) {
         if ($terms = taxonomy_get_tree($vocabulary->id(), 0, NULL, TRUE)) {
           foreach ($terms as $term) {
-            $options[$vocabulary->id()][$term->id()] = str_repeat('-', $term->depth) . String::checkPlain($term->getName());
+            $options[$vocabulary->id()][$term->id()] = str_repeat('—', $term->depth) . ($term->depth ? ' ' : '') . String::checkPlain($term->getName());
           }
         }
       }
diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 071b2f8..3a76e8f 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -138,7 +138,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
         if ($tree) {
           foreach ($tree as $term) {
             $choice = new \stdClass();
-            $choice->option = array($term->id() => str_repeat('-', $term->depth) . String::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label()));
+            $choice->option = array($term->id() => str_repeat('—', $term->depth) . ($term->depth ? ' ' : '') . String::checkPlain(\Drupal::entityManager()->getTranslationFromContext($term)->label()));
             $options[] = $choice;
           }
         }
diff --git a/core/modules/taxonomy/src/TermForm.php b/core/modules/taxonomy/src/TermForm.php
index 2136b0f..e396e74 100644
--- a/core/modules/taxonomy/src/TermForm.php
+++ b/core/modules/taxonomy/src/TermForm.php
@@ -66,7 +66,7 @@ public function form(array $form, FormStateInterface $form_state) {
 
       foreach ($tree as $item) {
         if (!in_array($item->tid, $exclude)) {
-          $options[$item->tid] = str_repeat('-', $item->depth) . $item->name;
+          $options[$item->tid] = str_repeat('—', $item->depth) . ($item->depth ? ' ' : '') . $item->name;
         }
       }
 
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
index fb4cad2..7cbeb13 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
@@ -78,7 +78,7 @@ public function testFilterUI() {
     for ($i = 0; $i < 3; $i++) {
       for ($j = 0; $j <= $i; $j++) {
         $option = $result[$counter++];
-        $prefix = $terms[$i][$j]->parent->target_id ? '-' : '';
+        $prefix = $terms[$i][$j]->parent->target_id ? '— ' : '';
         $attributes = $option->attributes();
         $tid = (string) $attributes->value;