diff --git a/src/ui/TreeView.js b/src/ui/TreeView.js
index 8e52e1e789..680d3b4939 100644
--- a/src/ui/TreeView.js
+++ b/src/ui/TreeView.js
@@ -45,7 +45,7 @@ class TreeView {
   }
 
   formatData (key, data, children, expand, keyPath) {
-    var label = yo`<span style=${this.cssLabel}><label style=${ui.formatCss(style.caret)}></label><span style=${ui.formatCss(style.data)}>${this.formatSelf(key, data)}</span></span>`
+    var label = yo`<div style=${this.cssLabel}><div class="fa fa-caret-right" style=${ui.formatCss(style.caret)}></div><span style=${ui.formatCss(style.data)}>${this.formatSelf(key, data)}</span></div>`
     var renderedChildren = ''
     if (children.length) {
       renderedChildren = yo`<ul style=${this.cssUl}>${children}</ul>`
@@ -59,7 +59,7 @@ class TreeView {
         self.nodeIsExpanded[keyPath] = list.style.display === 'block'
       }
     } else {
-      label.firstElementChild.style.display = 'none'
+      label.firstElementChild.style.visibility = 'hidden'
     }
     return yo`<li style=${this.cssLi}>${label}${renderedChildren}</li>`
   }
diff --git a/src/ui/styles/treeView.js b/src/ui/styles/treeView.js
index 1c526ca1d9..b50bacd24f 100644
--- a/src/ui/styles/treeView.js
+++ b/src/ui/styles/treeView.js
@@ -22,9 +22,9 @@ module.exports = {
     'font-family': 'arial,sans-serif'
   },
   caret: {
-    'margin-top': '3px'
+    'margin-top': '3px',
+    'width': '10px'
   },
   data: {
-    'margin-left': '10px'
   }
 }