diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js
index 5d5e85ab9e..998e2b612e 100644
--- a/ui/src/app/common/types.constant.js
+++ b/ui/src/app/common/types.constant.js
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { grey300, grey900 } from 'material-ui/styles/colors';
+
 export default angular.module('thingsboard.types', [])
     .constant('types',
         {
@@ -403,6 +405,16 @@ export default angular.module('thingsboard.types', [])
                 widgetType: "WIDGET_TYPE",
                 adminSettings: "ADMIN_SETTINGS"
             },
+            edgeEventStatus: {
+                "DEPLOYED": {
+                    name: "edge.deployed",
+                    color: grey900
+                },
+                "PENDING": {
+                    name: "edge.pending",
+                    color: grey300
+                }
+            },
             edgeAttributeKeys: {
                 active: "active",
                 lastConnectTime: "lastConnectTime",
diff --git a/ui/src/app/customer/customer-fieldset.tpl.html b/ui/src/app/customer/customer-fieldset.tpl.html
index a23959ef96..a67a4391df 100644
--- a/ui/src/app/customer/customer-fieldset.tpl.html
+++ b/ui/src/app/customer/customer-fieldset.tpl.html
@@ -16,10 +16,10 @@
 
 -->
 <md-button ng-click="onManageUsers({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.manage-users' | translate }}</md-button>
-<md-button ng-click="onManageAssets({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.manage-assets' | translate }}</md-button>
+<md-button ng-click="onManageAssets({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-assets' | translate }}</md-button>
 <md-button ng-click="onManageDevices({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-devices' | translate }}</md-button>
 <md-button ng-click="onManageDashboards({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-dashboards' | translate }}</md-button>
-<md-button ng-click="onManageEdges({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.manage-edges' | translate }}</md-button>
+<md-button ng-click="onManageEdges({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-edges' | translate }}</md-button>
 <md-button ng-click="onDeleteCustomer({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.delete' | translate }}</md-button>
 
 <div layout="row">
diff --git a/ui/src/app/edge/edge-fieldset.tpl.html b/ui/src/app/edge/edge-fieldset.tpl.html
index b7e52d5bbe..ddc109a2cc 100644
--- a/ui/src/app/edge/edge-fieldset.tpl.html
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
@@ -48,12 +48,6 @@
         <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
         <span translate>edge.copy-id</span>
     </md-button>
-    <md-button ng-click="onEdgeSync(edge.id)"
-               ng-show="!isEdit"
-               class="md-raised">
-        <md-icon md-svg-icon="mdi:sync"></md-icon>
-        <span translate>edge.sync</span>
-    </md-button>
     <md-button ngclipboard data-clipboard-action="copy"
                ngclipboard-success="onEdgeInfoCopied('key')"
                data-clipboard-text="{{edge.routingKey}}" ng-show="!isEdit"
@@ -68,6 +62,12 @@
         <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
         <span translate>edge.copy-edge-secret</span>
     </md-button>
+    <md-button ng-click="onEdgeSync(edge.id)"
+               ng-show="!isEdit"
+               class="md-raised">
+        <md-icon md-svg-icon="mdi:sync"></md-icon>
+        <span translate>edge.sync</span>
+    </md-button>
 </div>
 
 <md-content class="md-padding" layout="column">
@@ -119,6 +119,7 @@
         </md-input-container>
     </fieldset>
     <div layout="row">
+
         <md-input-container class="md-block" flex>
             <label translate>edge.edge-key</label>
             <input ng-model="edge.routingKey" disabled>
diff --git a/ui/src/app/event/event-row-edge-event.tpl.html b/ui/src/app/event/event-row-edge-event.tpl.html
index 6cc06d0cc3..01b6c6e261 100644
--- a/ui/src/app/event/event-row-edge-event.tpl.html
+++ b/ui/src/app/event/event-row-edge-event.tpl.html
@@ -19,7 +19,7 @@
 <div class="tb-cell" flex="20">{{ event.type }}</div>
 <div class="tb-cell" flex="40">{{ event.action }}</div>
 <div class="tb-cell" flex="20">{{ event.entityId }}</div>
-<div class="tb-cell" flex="15" ng-style="isPending ? {'color': 'rgba(0, 0, 0, .38)'} : {'color': '#000'}">{{ updateStatus(event.createdTime) | translate }}</div>
+<div class="tb-cell" flex="15" ng-style="{'color': statusColor}">{{ updateStatus(event.createdTime) }}</div>
 <div class="tb-cell" flex="10">
     <md-button ng-if="checkEdgeEventType(event.type)" class="md-icon-button md-primary"
                ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')"
diff --git a/ui/src/app/event/event-row.directive.js b/ui/src/app/event/event-row.directive.js
index 39f3f46622..77718a5968 100644
--- a/ui/src/app/event/event-row.directive.js
+++ b/ui/src/app/event/event-row.directive.js
@@ -167,17 +167,15 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $
         $compile(element.contents())(scope);
 
         scope.updateStatus = function(eventCreatedTime) {
-            if (scope.queueStartTs) {
-                var status;
-                if (eventCreatedTime < scope.queueStartTs) {
-                    status = $translate.instant('edge.success');
-                    scope.isPending = false;
-                } else {
-                    status = $translate.instant('edge.failed');
-                    scope.isPending = true;
-                }
-                return status;
+            var status;
+            if (eventCreatedTime < scope.queueStartTs) {
+                status = $translate.instant(types.edgeEventStatus.DEPLOYED.name);
+                scope.statusColor = types.edgeEventStatus.DEPLOYED.color;
+            } else {
+                status = $translate.instant(types.edgeEventStatus.PENDING.name);
+                scope.statusColor = types.edgeEventStatus.PENDING.color;
             }
+            return status;
         }
     }
 
diff --git a/ui/src/app/event/event-table.directive.js b/ui/src/app/event/event-table.directive.js
index b706a80f67..746f82c405 100644
--- a/ui/src/app/event/event-table.directive.js
+++ b/ui/src/app/event/event-table.directive.js
@@ -142,7 +142,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
 
         scope.$watch("entityId", function(newVal, prevVal) {
             if (newVal && !angular.equals(newVal, prevVal)) {
-                scope.loadEdgeInfo();
                 scope.resetFilter();
                 scope.reload();
             }
@@ -221,7 +220,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
         }
 
         scope.subscriptionId = null;
-        scope.queueStartTs = 0;
 
         scope.loadEdgeInfo = function() {
             attributeService.getEntityAttributesValues(
@@ -229,11 +227,10 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
                 scope.entityId,
                 types.attributesScope.server.value,
                 types.edgeAttributeKeys.queueStartTs,
-                {})
-                .then(function success(attributes) {
-                    scope.onEdgeAttributesUpdate(attributes);
-                });
-
+                null).then(
+                    function success(attributes) {
+                        attributes.length > 0 ? scope.onEdgeAttributesUpdate(attributes) : scope.queueStartTs = 0;
+                    });
             scope.checkSubscription();
         }
 
diff --git a/ui/src/app/locale/locale.constant-de_DE.json b/ui/src/app/locale/locale.constant-de_DE.json
index 582b7b72c2..81558e7ab2 100644
--- a/ui/src/app/locale/locale.constant-de_DE.json
+++ b/ui/src/app/locale/locale.constant-de_DE.json
@@ -805,8 +805,8 @@
     "set-root-rule-chain-to-edges": "Regelkette zur Wurzel machen für die Rand",
     "set-root-rule-chain-to-edges-text": "Die Regelkette zur Wurzel für { count, plural, 1 {1 Rand} other {# Rand} } machen",
     "status": "Von Rand empfangen",
-    "success": "Bereitgestellt",
-    "failed": "Steht aus",
+    "deployed": "Bereitgestellt",
+    "pending": "Steht aus",
     "entity-id": "Entität ID",
     "entity-info": "Entitätsinfo",
     "event-action": "Ereignisaktion",
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index d46f3d78d8..ef6449d167 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -819,7 +819,7 @@
         "make-private-edge-text": "After the confirmation the edge and all its data will be made private and won't be accessible by others.",
         "import": "Import edge",
         "label": "Label",
-        "load-entity-error": "Entity not found. Failed to load info",
+        "load-entity-error": "Failed to load data. Entity not found or has been deleted.",
         "assign-new-edge": "Assign new edge",
         "manage-edge-dashboards": "Manage edge dashboards",
         "unassign-from-edge": "Unassign from edge",
@@ -843,8 +843,8 @@
         "set-root-rule-chain-to-edges": "Set root rule chain for Edge(s)",
         "set-root-rule-chain-to-edges-text": "Set root rule chain for { count, plural, 1 {1 edge} other {# edges} }",
         "status": "Received by edge",
-        "success": "Deployed",
-        "failed": "Pending"
+        "deployed": "Deployed",
+        "pending": "Pending"
     },
     "error": {
         "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",
diff --git a/ui/src/app/locale/locale.constant-es_ES.json b/ui/src/app/locale/locale.constant-es_ES.json
index 3eea48845f..060c762fec 100644
--- a/ui/src/app/locale/locale.constant-es_ES.json
+++ b/ui/src/app/locale/locale.constant-es_ES.json
@@ -818,8 +818,8 @@
         "set-root-rule-chain-to-edges": "Establecer la cadena de reglas raíz para Edge (s)",
         "set-root-rule-chain-to-edges-text": "Establecer la cadena de la regla raíz para {count, plural, 1 {1 borde} other {# bordes}}",
         "status": "Recibido por borde",
-        "success": "Desplegada",
-        "failed": "Pendiente",
+        "deployed": "Desplegada",
+        "pending": "Pendiente",
         "entity-id": "ID de entidad",
         "entity-info": "Entity info",
         "event-action": "Información de la entidad",
diff --git a/ui/src/app/locale/locale.constant-fr_FR.json b/ui/src/app/locale/locale.constant-fr_FR.json
index ffd4e05896..fcd2bc4d22 100644
--- a/ui/src/app/locale/locale.constant-fr_FR.json
+++ b/ui/src/app/locale/locale.constant-fr_FR.json
@@ -823,8 +823,8 @@
         "set-root-rule-chain-to-edges": "Définir la chaîne de règles racine pour bordure(s)",
         "set-root-rule-chain-to-edges-text": "Définir la chaîne de règles racine pour {count, plural, 1 {1 bordure} other {# bordures} }",
         "status": "Reçu par bord",
-        "success": "Déployée",
-        "failed": "En attente",
+        "deployed": "Déployée",
+        "pending": "En attente",
         "entity-id": "ID d'entité",
         "entity-info": "Informations sur l'entité",
         "event-action": "Action d'événement",