address PR comments
diff --git a/ui-modules/app-inspector/app/components/entity-tree/entity-node.less b/ui-modules/app-inspector/app/components/entity-tree/entity-node.less
index ac4f717..6b7e3c4 100644
--- a/ui-modules/app-inspector/app/components/entity-tree/entity-node.less
+++ b/ui-modules/app-inspector/app/components/entity-tree/entity-node.less
@@ -86,7 +86,6 @@
     }
   }
   .node-icon {
-    .pull-right();
     flex-grow: 0 !important;
     max-height: 20px; //let it extend above and below span's boundaries
     overflow: visible !important;
diff --git a/ui-modules/app-inspector/app/components/entity-tree/entity-tree.directive.js b/ui-modules/app-inspector/app/components/entity-tree/entity-tree.directive.js
index 9f6d596..76183e7 100644
--- a/ui-modules/app-inspector/app/components/entity-tree/entity-tree.directive.js
+++ b/ui-modules/app-inspector/app/components/entity-tree/entity-tree.directive.js
@@ -97,7 +97,7 @@
     }
 }
 
-export function entityNodeDirective($log, iconService) {
+export function entityNodeDirective() {
     return {
         restrict: 'E',
         template: entityNodeTemplate,
@@ -188,4 +188,3 @@
 
     }
 }
-entityNodeDirective.$inject = ['$log', 'iconService'];
diff --git a/ui-modules/utils/icon-generator/icon-generator.js b/ui-modules/utils/icon-generator/icon-generator.js
index a2695b5..4839d88 100644
--- a/ui-modules/utils/icon-generator/icon-generator.js
+++ b/ui-modules/utils/icon-generator/icon-generator.js
@@ -147,7 +147,7 @@
             } else if (entityOrTypeId.type) {
                 let entity = entityOrTypeId;
                 id = entity.type;
-                    if (id === 'org.apache.brooklyn.entity.stock.BasicApplication' && entity.children.length === 1) {
+                if (id === 'org.apache.brooklyn.entity.stock.BasicApplication' && entity.children && entity.children.length === 1) {
                     id = entity.children[0].catalogItemId || entity.children[0].type;
                 }
             }