diff --git a/core/modules/system/system.base-rtl.css b/core/modules/system/system.base-rtl.css
index d01792e..0f24fa6 100644
--- a/core/modules/system/system.base-rtl.css
+++ b/core/modules/system/system.base-rtl.css
@@ -40,10 +40,17 @@ a.tabledrag-handle .handle {
   margin: -0.4em 0.5em;
   padding: 0.42em 0.5em;
 }
-div.indentation {
-  float: right;
-  margin: -0.4em -0.4em -0.4em 0.2em;
-  padding: 0.42em 0.6em 0.42em 0;
+.is-indented {
+  padding: 0 1em 0 0;
+}
+.is-indented--2 {
+  padding: 0 2em 0 0;
+}
+.is-indented--3 {
+  padding: 0 3em 0 0;
+}
+.is-indented--4 {
+  padding: 0 4em 0 0;
 }
 div.tree-child,
 div.tree-child-last {
diff --git a/core/modules/system/system.base.css b/core/modules/system/system.base.css
index 08ff66c..a2c316c 100644
--- a/core/modules/system/system.base.css
+++ b/core/modules/system/system.base.css
@@ -123,12 +123,17 @@ a.tabledrag-handle .handle {
 .no-touch a.tabledrag-handle:focus .handle {
   background-position: 6px -11px;
 }
-div.indentation {
-  float: left; /* LTR */
-  height: 1.7em;
-  margin: -0.4em 0.2em -0.4em -0.4em; /* LTR */
-  padding: 0.42em 0 0.42em 0.6em; /* LTR */
-  width: 20px;
+.is-indented {
+  padding-left: 1em; /* LTR */
+}
+.is-indented--2 {
+  padding-left: 2em; /* LTR */
+}
+.is-indented--3 {
+  padding-left: 3em; /* LTR */
+}
+.is-indented--4 {
+  padding-left: 4em; /* LTR */
 }
 div.tree-child {
   background: url(../../misc/tree.png) no-repeat 11px center; /* LTR */
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 5ca2345..1b44f8a 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -242,7 +242,9 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
   foreach ($current_page as $key => $term) {
     $form['terms'][$key]['#term'] = $term;
     $form['terms'][$key]['term'] = array(
-      '#prefix' => isset($term->depth->value) && $term->depth->value > 0 ? theme('indentation', array('size' => $term->depth->value)) : '',
+       '#attributes' => array(
+          'class' => isset($term->depth->value) && $term->depth->value > 0 ? 'is-indented is-indented--' . $term->depth->value : '',
+        ),
       '#type' => 'link',
       '#title' => $term->label(),
       '#href' => "taxonomy/term/" . $term->id(),