1 files changed, 9 insertions, 8 deletions
diff --git a/lib/dijit/themes/claro/Tree.less b/lib/dijit/themes/claro/Tree.less
index 4e639ca4f..ff6cd5a14 100644
--- a/lib/dijit/themes/claro/Tree.less
+++ b/lib/dijit/themes/claro/Tree.less
@@ -46,24 +46,23 @@
 	background-color: none;	// IE6 doesn't understand rgba() or transparent below
 	background-color: transparent;	// IE8 doesn't understand rgba() below
 	background-color: rgba(171,214,255,0);	// rgba() instead of transparent to prevent flash on hover fade-in
-	background-image: url("images/commonHighlight.png");
 	background-position:0 0;
 	background-repeat:repeat-x;
 
 	border-color: rgba(118,157,192,0);	// rgba() instead of none to prevent flash on hover fade-in
 	border-width: 0;
 
+	color: @text-color;
+
 	.transition-property(background-color, border-color);
 	.transition-duration(.25s);
 	.transition-timing-function(ease-out);
 }
-.dj_ie6 .claro .dijitTreeRow {
-	background-image: none;
-}
 
 .claro .dijitTreeRowSelected {
 	background-repeat:repeat-x;
 	background-color:@selected-background-color;
+	background-image: url(@image-common-highlight);
 	padding: 3px 0 1px;
 	margin: 0;
 	border:solid 1px @selected-border-color;
@@ -71,6 +70,7 @@
 }
 .claro .dijitTreeRowHover {
 	background-color:@hovered-background-color;
+	background-image: url(@image-common-highlight);
 	padding: 3px 0 1px;
 	margin: 0;
 	border:solid 1px @hovered-border-color;
@@ -79,13 +79,14 @@
 }
 .claro .dijitTreeRowActive {
 	background-color:@pressed-background-color;
+	background-image: url(@image-common-highlight);
 	background-position:0 -177px;
 	padding: 3px 0 1px;
 	margin-left: 0;
 	border:solid 1px @pressed-border-color;
 	color:@selected-text-color;
 }
-.dj_ie6 .claro .dijitTreeRowActive {
+.dj_ie6 .claro .dijitTreeRow {
 	background-image: none;
 }
 .claro .dijitTreeRowFocused {
@@ -95,13 +96,13 @@
 /* expando (open/closed) icon */
 
 .claro .dijitTreeExpando {
-	background-image: url('images/treeExpandImages.png');
+	background-image: url(@image-tree-expand);
     width: 16px;
     height: 16px;
 	background-position: -35px 0;		/* for dijitTreeExpandoOpened */
 }
 .dj_ie6 .claro .dijitTreeExpando {
-	background-image: url('images/treeExpandImages8bit.png');
+	background-image: url(@image-tree-expand-ie6);
 }
 .claro .dijitTreeRowHover .dijitTreeExpandoOpened {
 	background-position: -53px 0;
@@ -117,7 +118,7 @@
 	background-image:none;
 }
 .claro .dijitTreeExpandoLoading {
-	background-image: url('images/loadingAnimation.gif');
+	background-image: url(@image-loading-animation);
 }
 
 /* Drag and Drop on TreeNodes