diff --git a/token.css b/token.css
index 5432f0f..729f87e 100644
--- a/token.css
+++ b/token.css
@@ -1,7 +1,6 @@
 
 .token-tree {
   font-size: 0.85em;
-  margin-left: 19px;
 }
 
 .ui-dialog-content .token-tree {
@@ -13,6 +12,10 @@
   padding-bottom: 0;
 }
 
+.token-tree tr .token-name {
+  padding-left: 25px;
+}
+
 .token-group {
   font-weight: bold;
 }
diff --git a/token.pages.inc b/token.pages.inc
index 85b8fe3..5a735bb 100644
--- a/token.pages.inc
+++ b/token.pages.inc
@@ -197,8 +197,8 @@ function _token_token_tree_format_row($token, array $token_info, $is_group = FAL
   );
 
   $row = $defaults;
-  $row['id'] = _token_clean_css_identifier($token);
-  $row['data']['name'] = $token_info['name'];
+  $row['data']['name']['data'] = $token_info['name'];
+  $row['data']['name']['class'] = array('token-name');
   $row['data']['description'] = isset($token_info['description']) ? $token_info['description'] : '';
 
   if ($is_group) {