diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.html b/meteor/client/views/dashboard/apps/dashboard-single-app.html
index baa2df2470..f0e34d0991 100755
--- a/meteor/client/views/dashboard/apps/dashboard-single-app.html
+++ b/meteor/client/views/dashboard/apps/dashboard-single-app.html
@@ -19,7 +19,7 @@
         {{/if}}
       {{/if}}
       <a onclick="trackLink('app detail')" href="/apps/{{name}}" class="name">{{name}}</a>
-      <small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{image.meta.name}}</a></small>
+      <small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{displayTags image.tags}}</a></small>
     </h5>
     <div class="options">
       {{#if $eq status 'READY'}}
diff --git a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
index 67465a1e9b..0ac0bd2745 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
@@ -16,7 +16,9 @@
                     <a onclick="trackLink('view app')" href="{{url}}" class="btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App" data-container="body"><span class="typcn typcn-eye-outline"></span></a>
                   {{/if}}
                   <a onclick="trackLink('terminal into app')" href="#" class="btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal" data-container="body"><span class="typcn typcn-device-laptop"></span></a>
-                  <a onclick="trackLink('go to app image')" href="/images/{{image._id}}" class="btn-image" data-toggle="tooltip" data-placement="bottom" title="Image" data-container="body"><span class="typcn typcn-camera-outline"></span></a>
+                  {{#if image}}
+                    <a onclick="trackLink('go to app image')" href="/images/{{image._id}}" class="btn-image" data-toggle="tooltip" data-placement="bottom" title="Image" data-container="body"><span class="typcn typcn-camera-outline"></span></a>
+                  {{/if}}
                 {{/if}}
                 <a onclick="trackLink('open app folder')" href="#" class="btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
                 {{#if $eq status 'READY'}}
diff --git a/meteor/collections/apps.js b/meteor/collections/apps.js
index f59b617715..00cd62c731 100755
--- a/meteor/collections/apps.js
+++ b/meteor/collections/apps.js
@@ -24,7 +24,11 @@ Apps.allow({
 
 Apps.helpers({
   image: function () {
-    return Images.findOne(this.imageId);
+    if (this.docker && this.docker.Image) {
+      return Images.findOne({'docker.Id': this.docker.Image});
+    } else {
+      return Images.findOne(this.imageId);
+    }
   },
   hostUrl: function () {
     return this.name + '.kite';