diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json
index 4db62bb56b..281357dc65 100644
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -60,7 +60,7 @@
             {
                 "key": "TreeNodeController",
                 "implementation": "controllers/TreeNodeController.js",
-                "depends": [ "$scope", "$timeout", "agentService" ]
+                "depends": [ "$scope", "$timeout" ]
             },
             {
                 "key": "ActionGroupController",
diff --git a/platform/commonUI/general/res/templates/tree-node.html b/platform/commonUI/general/res/templates/tree-node.html
index cd77d001a2..518f7980f5 100644
--- a/platform/commonUI/general/res/templates/tree-node.html
+++ b/platform/commonUI/general/res/templates/tree-node.html
@@ -22,27 +22,38 @@
 <span ng-controller="ToggleController as toggle">
     <span ng-controller="TreeNodeController as treeNode">
         <span
-	        class="tree-item menus-to-left"
-	        ng-class="{selected: treeNode.isSelected()}"
-	        >
-            <mct-representation
-                key="'label'"
-				mct-object="domainObject"
-				ng-model="ngModel"
-				ng-click="!treeNode.checkMobile() || model.composition == undefined ||
-                          model.composition.length == 0 ? treeNode.setObject(ngModel, domainObject) : toggle.toggle();
-                          treeNode.trackExpansion()"
-				>
-            </mct-representation>
+            class="tree-item menus-to-left"
+            ng-class="{selected: treeNode.isSelected()}"
+            >
             <span
-	            class='ui-symbol view-control'
+                class='ui-symbol view-control mobile-hide'
+                ng-click="toggle.toggle(); treeNode.trackExpansion()"
+                ng-if="model.composition !== undefined"
+                >
+                {{toggle.isActive() ? "v" : ">"}}
+            </span>
+
+            <mct-representation
+                class="mobile-hide"
+                key="'label'"
                 mct-object="domainObject"
+                ng-click="ngModel.selectedObject = domainObject"
+                >
+            </mct-representation>
+            <mct-representation
+                class="desktop-hide"
+                key="'label'"
+                mct-object="domainObject"
+                ng-click="toggle.toggle(); treeNode.trackExpansion()"
+                >
+            </mct-representation>
+
+            <span
+                class='ui-symbol view-control desktop-hide'
                 ng-model="ngModel"
-				ng-click="treeNode.checkMobile() ? treeNode.setObject(ngModel, domainObject) :
-                          toggle.toggle(); treeNode.trackExpansion()"
-				ng-if="model.composition !== undefined || treeNode.checkMobile()"
-				>
-                {{treeNode.checkMobile() ? "}" : toggle.isActive() ? "v" : ">"}}
+                ng-click="ngModel.selectedObject = domainObject"
+                >
+                }
             </span>
         </span>
         <span
@@ -58,4 +69,4 @@
 
         </span>
     </span>
-</span>
\ No newline at end of file
+</span>
diff --git a/platform/commonUI/general/src/controllers/TreeNodeController.js b/platform/commonUI/general/src/controllers/TreeNodeController.js
index 518ae4f99f..7c21ee46aa 100644
--- a/platform/commonUI/general/src/controllers/TreeNodeController.js
+++ b/platform/commonUI/general/src/controllers/TreeNodeController.js
@@ -51,7 +51,7 @@ define(
          * @memberof platform/commonUI/general
          * @constructor
          */
-        function TreeNodeController($scope, $timeout, agentService) {
+        function TreeNodeController($scope, $timeout) {
             var self = this,
                 selectedObject = ($scope.ngModel || {}).selectedObject,
                 isSelected = false,
@@ -133,7 +133,6 @@ define(
             this.isSelectedFlag = false;
             this.hasBeenExpandedFlag = false;
             this.$timeout = $timeout;
-            this.agentService = agentService;
             this.$scope = $scope;
 
             // Listen for changes which will effect display parameters
@@ -177,20 +176,6 @@ define(
             return this.isSelectedFlag;
         };
 
-        // Sets the selected object in the tree, to be the
-        // currently represented object. If the user is on phone
-        // and in portrait mode, than, hide the tree menu
-        TreeNodeController.prototype.setObject = function (ngModel, domainObject) {
-            ngModel.selectedObject = domainObject;
-            if (this.agentService.isPhone() && this.agentService.isPortrait()) {
-                this.$scope.$emit('select-obj');
-            }
-        };
-
-        TreeNodeController.prototype.checkMobile = function () {
-            return this.agentService.isMobile();
-        };
-
         return TreeNodeController;
     }
 );