diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
index 65c74e886c..9121f1d3a9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
@@ -258,8 +258,10 @@ function loadDevices(searchType, searchParam) {
             data: 'name',
             class: 'remove-padding icon-only content-fill',
             render: function (data, type, row, meta) {
-                return '<div class="thumbnail icon"><img class="square-element text fw " src="' + getDeviceTypeThumb(
-                        row.deviceType) + '"/></div>';
+                return '<a href="' + context + '/device/' + row.deviceType + '?id=' + row.deviceIdentifier
+                       + '"><div class="thumbnail icon"><img class="square-element text fw " src="'
+                       + getDeviceTypeThumb(
+                        row.deviceType) + '"/></div></a>';
             }
         },
         {
@@ -333,22 +335,14 @@ function loadDevices(searchType, searchParam) {
                 var deviceIdentifier = row.deviceIdentifier;
                 var html = '<span></span>';
                 if (status != 'REMOVED') {
-                    html =
-                        '<a href="device/' + deviceType + '?id=' + deviceIdentifier + '" data-click-event="remove-form"'
-                        +
-                        ' class="btn padding-reduce-on-grid-view"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>'
-                        +
-                        '<i class="fw fw-view fw-stack-1x"></i></span><span class="hidden-xs hidden-on-grid-view">View</span></a>';
+                    html = '';
 
                     if (analyticsEnabled(row.deviceType)) {
-                        html +=
-                            '<a href="device/' + deviceType + '/analytics?deviceId=' + deviceIdentifier + '&deviceName='
-                            + row.name + '" ' +
-                            'data-click-event="remove-form" class="btn padding-reduce-on-grid-view"><span class="fw-stack">'
-                            +
-                            '<i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>'
-                            +
-                            '<span class="hidden-xs hidden-on-grid-view">Analytics</span>';
+                        html += '<a href="' + context + '/device/' + deviceType + '/analytics?deviceId=' +
+                                deviceIdentifier + '&deviceName=' + row.name + '" ' + 'data-click-event="remove-form"' +
+                                ' class="btn padding-reduce-on-grid-view"><span class="fw-stack">' +
+                                '<i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>' +
+                                '<span class="hidden-xs hidden-on-grid-view">Analytics</span>';
                     }
 
                     if ((!groupName || !groupId) && groupingEnabled(row.deviceType)) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index 5ecc4e2118..b143e04d3d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -6546,21 +6546,21 @@ select > option:hover {
 }
 
 @media (min-width: 1200px){
-  table tbody tr {
-    width: 18% !important;
-  }
-  .table .fw-stack{
-    font-size: 1.2vw;
-  }
+    table tbody tr {
+        width: 14% !important;
+    }
+    .table .fw-stack{
+        font-size: 1.2vw;
+    }
 }
 
 @media (min-width: 1500px){
-  table tbody tr {
-    width: 14% !important;
-  }
-  .table .fw-stack{
-    font-size: 0.8vw;
-  }
+    table tbody tr {
+        width: 10% !important;
+    }
+    .table .fw-stack{
+        font-size: 0.8vw;
+    }
 }
 
 /** End **/