diff --git a/frontend/user/vue-components/ApplicationLabel.vue b/frontend/user/vue-components/ApplicationLabel.vue
index 35977e2d6..1d332abe4 100644
--- a/frontend/user/vue-components/ApplicationLabel.vue
+++ b/frontend/user/vue-components/ApplicationLabel.vue
@@ -16,7 +16,7 @@
             <li>
               <a href="#"
               id="share-button"
-              :class="{ 'disabled-entry': !currentApp.isRunning() }"
+              :class="{ 'disabled-entry': !currentApp.isRunning() || currentApp.appData.image.type == 'webapp' }"
               @click="shareDialog.visible = true">
                 <i class="fa fa-clipboard text-light-blue"></i>
                 Share session
diff --git a/frontend/user/vue-components/ApplicationView.vue b/frontend/user/vue-components/ApplicationView.vue
index a79a195c3..d05d3f59c 100644
--- a/frontend/user/vue-components/ApplicationView.vue
+++ b/frontend/user/vue-components/ApplicationView.vue
@@ -12,6 +12,9 @@
             <div class="box-tools pull-right"></div>
           </div>
           <div class="box-body">
+            <h4>Type</h4>
+            <span>{{ currentApp.appData.image.type == "webapp" ? "Web": "VNC" }} application</span>
+
             <h4>Description</h4>
             <span id="app-description">{{ currentApp.appData.image.description }}</span>
 
diff --git a/remoteappmanager/webapi/application.py b/remoteappmanager/webapi/application.py
index 41ea75e56..dccc30c48 100644
--- a/remoteappmanager/webapi/application.py
+++ b/remoteappmanager/webapi/application.py
@@ -26,6 +26,7 @@ class Image(ResourceFragment):
     ui_name = Unicode()
     icon_128 = Unicode()
     description = Unicode()
+    type = Unicode()
     policy = OneOf(Policy)
     configurables = List(Unicode)
 
@@ -71,11 +72,12 @@ def retrieve(self, resource, **kwargs):
         resource.mapping_id = identifier
         resource.image = Image()
         resource.image.fill({
-                "name": image.name,
-                "ui_name": image.ui_name,
-                "icon_128": image.icon_128,
-                "description": image.description,
-                "configurables": [conf.tag for conf in image.configurables]
+            "name": image.name,
+            "ui_name": image.ui_name,
+            "icon_128": image.icon_128,
+            "description": image.description,
+            "type": image.type,
+            "configurables": [conf.tag for conf in image.configurables]
         })
         resource.image.policy = Policy()
         resource.image.policy.fill(policy)
diff --git a/remoteappmanager/webapi/tests/test_application.py b/remoteappmanager/webapi/tests/test_application.py
index 56fb72a91..a884b18b5 100644
--- a/remoteappmanager/webapi/tests/test_application.py
+++ b/remoteappmanager/webapi/tests/test_application.py
@@ -79,6 +79,7 @@ def test_items(self):
                         },
                         'name': 'boo',
                         'icon_128': '',
+                        'type': '',
                         'ui_name': 'foo_ui',
                         'description': '',
                         'configurables': []
@@ -94,6 +95,7 @@ def test_items(self):
                             'volume_target': 'bar'
                         },
                         'name': 'boo',
+                        'type': '',
                         'icon_128': '',
                         'ui_name': 'foo_ui',
                         'description': '',
@@ -128,17 +130,18 @@ def test_retrieve(self):
                          {
                              'mapping_id': "one",
                              'image': {
-                              'configurables': [],
-                              'description': '',
-                              'icon_128': '',
-                              'name': 'boo',
-                              'policy': {
-                                    "allow_home": True,
-                                    "volume_mode": 'ro',
-                                    "volume_source": "foo",
-                                    "volume_target": "bar",
-                              },
-                              'ui_name': 'foo_ui'}})
+                                 'configurables': [],
+                                 'description': '',
+                                 'type': '',
+                                 'icon_128': '',
+                                 'name': 'boo',
+                                 'policy': {
+                                     "allow_home": True,
+                                     "volume_mode": 'ro',
+                                     "volume_source": "foo",
+                                     "volume_target": "bar",
+                                 },
+                                 'ui_name': 'foo_ui'}})
 
         self._app.container_manager.find_containers = \
             mock_coro_factory(return_value=[Container(
@@ -159,6 +162,7 @@ def test_retrieve(self):
                              'image': {
                                  'description': '',
                                  'icon_128': '',
+                                 'type': '',
                                  'name': 'boo',
                                  'ui_name': 'foo_ui',
                                  'policy': {