diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
index 1fe91ae975..a4c64994c3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
@@ -32,7 +32,7 @@ angular.module("umbraco.directives")
       activetree:'@'
     },
 
-    template: '<li ng-swipe-right="options(this, node, $event)"><div ng-style="setTreePadding(node)" ng-class="{\'loading\': node.loading}">' +
+    template: '<li ng-swipe-right="options(this, node, $event)"><div ng-style="setTreePadding(node)" class="{{node.stateCssClass}}" ng-class="{\'loading\': node.loading}">' +
         '<ins ng-hide="node.hasChildren" style="background:none;width:18px;"></ins>' +        
         '<ins ng-show="node.hasChildren" ng-class="{\'icon-navigation-right\': !node.expanded, \'icon-navigation-down\': node.expanded}" ng-click="load(this, node)"></ins>' +
         '<i title="#{{node.routePath}}" class="{{node.cssClass}}" style="{{node.style}}"></i>' +
@@ -139,6 +139,10 @@ angular.module("umbraco.directives")
                   scope.loadChildren(null, scope.node, true);
               }else if( !node.metaData.treeAlias && activePath.indexOf(node.id) >= 0){
                   scope.loadChildren(null, scope.node, true);
+
+                  scope.path = activePath.filter( function(element) {
+                                    return listToDelete.indexOf(obj.id) === -1;
+                                });
               }
             }
         };
@@ -146,6 +150,7 @@ angular.module("umbraco.directives")
         //if the current path contains the node id, we will auto-expand the tree item children
         
         scope.expandActivePath(scope.node, scope.activetree, scope.path);
+        scope.node.stateCssClass = scope.node.cssClasses.join(" ");
 
         var template = '<ul ng-class="{collapsed: !node.expanded}"><umb-tree-item  ng-repeat="child in node.children" eventhandler="eventhandler" activetree="{{activetree}}" path="{{path}}" node="child" section="{{section}}" ng-animate="animation()"></umb-tree-item></ul>';
         var newElement = angular.element(template);
diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index 78aca06998..b162bb34bb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -208,6 +208,20 @@ li.root > div > a.umb-options {
 	float: left
 }
 
+
+// Tree item states
+// -------------------------
+div.not-published > i.icon,div.not-published > a{
+	color: @grayLight;
+}
+div.protected:before{
+	content:"\e256";
+	font-family: 'icomoon';
+	color: red;
+	position: absolute;
+}
+
+
 // Tree context menu
 // -------------------------
 .umb-actions {
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7591222b9d..17315299ba 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -623,7 +623,6 @@
     <Content Include="Config\appSettings.Release.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\appSettings.config" />
     <None Include="Config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -635,7 +634,6 @@
       <DependentUpon>BaseRestExtensions.config</DependentUpon>
     </None>
     <Content Include="Config\connectionStrings.Release.config" />
-    <Content Include="Config\connectionStrings.config" />
     <None Include="Config\log4net.Release.config">
       <DependentUpon>log4net.config</DependentUpon>
     </None>