6 files changed, 22 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item.png b/WebContent/VAADIN/themes/base/tree/img/connector-item.png
new file mode 100644
index 0000000000..a64c209cb1
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/tree/img/connector-item.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector.png b/WebContent/VAADIN/themes/base/tree/img/connector.png
new file mode 100644
index 0000000000..c56b8f4244
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/tree/img/connector.png
diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css
index 9e056dc4d6..37af1d11a8 100644
--- a/WebContent/VAADIN/themes/base/tree/tree.css
+++ b/WebContent/VAADIN/themes/base/tree/tree.css
@@ -4,17 +4,29 @@
 	padding: 1px 0;
 	outline: none;
 }
-.v-tree-node {
+.v-tree .v-tree-node {
 	background: transparent url(../common/img/sprites.png) no-repeat 5px -37px;
 	padding: 1px 0;
 }
 .v-tree-node-caption:focus {
 	outline: none;
 }
-.v-tree-node-expanded {
-	background-position: -5px -10px;
+.v-tree div.v-tree-node-leaf {
+	background: transparent;
+}
+.v-tree-connectors div.v-tree-node-leaf {
+	background: transparent url(img/connector-item.png) no-repeat 8px 0;
+}
+.v-tree-connectors div.v-tree-node-leaf-last {
+	background: transparent url(img/connector-item.png) no-repeat 8px bottom;
+}
+.v-tree .v-tree-node-expanded {
+	background: transparent url(../common/img/sprites.png) no-repeat -5px -10px;
+}
+.v-tree-connectors .v-tree-node-children {
+	background: transparent url(img/connector.png) repeat-y 8px bottom;
 }
-div.v-tree-node-leaf {
+.v-tree-connectors .v-tree-node-children-last {
 	background: transparent;
 }
 .v-tree-node-caption {
diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.css b/WebContent/VAADIN/themes/liferay/tree/tree.css
index 23fe10f52e..3c3c6abdfe 100644
--- a/WebContent/VAADIN/themes/liferay/tree/tree.css
+++ b/WebContent/VAADIN/themes/liferay/tree/tree.css
@@ -1,4 +1,4 @@
-.v-tree-node {
+.v-tree .v-tree-node {
 	background: transparent url(arrows_sprites.png) no-repeat -42px 1px;
 	-background: transparent url(arrows_sprites-ie6.png) no-repeat -42px 1px;
 }
@@ -13,7 +13,7 @@
 	background-position: -14px -30px;
 }
 
-.v-tree-node-expanded {
+.v-tree .v-tree-node-expanded {
 	background-position: -28px -14px;
 }
 
diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css
index 3f77bd991d..4f31d43960 100644
--- a/WebContent/VAADIN/themes/reindeer/tree/tree.css
+++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css
@@ -1,4 +1,4 @@
-.v-tree-node {
+.v-tree .v-tree-node {
 	background: transparent url(img/arrows.png) no-repeat 6px -10px;
 }
 .v-ie6 .v-tree-node {
@@ -8,7 +8,7 @@
 .v-ie6 div.v-tree-node-leaf {
 	background: transparent;
 }
-.v-tree-node-expanded {
+.v-tree .v-tree-node-expanded {
 	background-position: -7px 5px;
 }
 .v-tree-node-caption {
diff --git a/WebContent/VAADIN/themes/runo/tree/tree.css b/WebContent/VAADIN/themes/runo/tree/tree.css
index bec3b318dd..c2458bc0b8 100644
--- a/WebContent/VAADIN/themes/runo/tree/tree.css
+++ b/WebContent/VAADIN/themes/runo/tree/tree.css
@@ -1,7 +1,7 @@
-.v-tree-node {
+.v-tree .v-tree-node {
 	background: transparent url(img/collapsed.png) no-repeat 2px 1px;
 }
-.v-tree-node-expanded {
+.v-tree .v-tree-node-expanded {
 	background: transparent url(img/expanded.png) no-repeat 2px 1px;
 }
 .v-tree-node-caption {