diff --git a/ui-modules/utils/icon-generator/icon-generator.js b/ui-modules/utils/icon-generator/icon-generator.js
index 4839d88..0a20e94 100644
--- a/ui-modules/utils/icon-generator/icon-generator.js
+++ b/ui-modules/utils/icon-generator/icon-generator.js
@@ -141,9 +141,9 @@
                 return deferred.promise;
             }
             if (entityOrTypeId.catalogItemId) {
-                id = entity.catalogItemId;
+                id = entityOrTypeId.catalogItemId;
             } else if (entityOrTypeId.symbolicName) {
-                id = entity.symbolicName;
+                id = entityOrTypeId.symbolicName;
             } else if (entityOrTypeId.type) {
                 let entity = entityOrTypeId;
                 id = entity.type;