diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json
index 7355a6b69c..6e166edb02 100644
--- a/platform/commonUI/browse/bundle.json
+++ b/platform/commonUI/browse/bundle.json
@@ -69,8 +69,8 @@
             {
                 "key": "grid-item",
                 "templateUrl": "templates/items/grid-item.html",
-                "uses": [ "type", "action" ],
-                "gestures": [ "info","menu" ]
+                "uses": [ "type", "action", "location" ],
+                "gestures": [ "info", "menu" ]
             },
             {
                 "key": "object-header",
@@ -88,12 +88,12 @@
             {
                 "key": "navigationService",
                 "implementation": "navigation/NavigationService.js"
-            },        
+            },
             {
                 "key": "creationService",
                 "implementation": "creation/CreationService.js",
                 "depends": [ "persistenceService", "$q", "$log" ]
-            }        
+            }
         ],
         "actions": [
             {
diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html
index 6d041b48b9..64282a9ee1 100644
--- a/platform/commonUI/browse/res/templates/items/grid-item.html
+++ b/platform/commonUI/browse/res/templates/items/grid-item.html
@@ -34,11 +34,10 @@
         <div class='item-main abs'>
             <div class='ui-symbol icon lg item-type'>
                 {{type.getGlyph()}}
-                <!-- this will be toggled by a ng-show -->
                 <span
-	                class='ui-symbol icon l-icon-link' title="This object is a link"
-	                ng-show = "true"
-	                ></span>
+                    class="ui-symbol icon l-icon-link" title="This object is a link"
+                    ng-show="location.isLink()"
+                    ></span>
             </div>
             <div class='ui-symbol icon abs item-open'>}</div>
         </div>
@@ -51,4 +50,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html
index 61905cb7bf..7ca73bb026 100644
--- a/platform/commonUI/general/res/templates/label.html
+++ b/platform/commonUI/general/res/templates/label.html
@@ -22,11 +22,10 @@
 <span class="label s-label">
     <span class='ui-symbol icon type-icon'>
         {{type.getGlyph()}}
-        <!-- this will be toggled by a ng-show -->
         <span
-	        class='ui-symbol icon l-icon-link'
-            ng-show="true"
-	        ></span>
+            class='ui-symbol icon l-icon-link'
+            ng-show="location.isLink()"
+            ></span>
         <span class='ui-symbol icon l-icon-alert'></span>
     </span>
     <span class='title-label'>