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/event/event-row-edge-event.tpl.html b/ui/src/app/event/event-row-edge-event.tpl.html
index e8773d34ca..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="{'color': statusColor}">{{ 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 817b2456ab..77718a5968 100644
--- a/ui/src/app/event/event-row.directive.js
+++ b/ui/src/app/event/event-row.directive.js
@@ -169,11 +169,11 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $
         scope.updateStatus = function(eventCreatedTime) {
             var status;
             if (eventCreatedTime < scope.queueStartTs) {
-                status = $translate.instant('edge.success');
-                scope.statusColor = '#000';
+                status = $translate.instant(types.edgeEventStatus.DEPLOYED.name);
+                scope.statusColor = types.edgeEventStatus.DEPLOYED.color;
             } else {
-                status = $translate.instant('edge.failed');
-                scope.statusColor = 'rgba(0, 0, 0, .38)';
+                status = $translate.instant(types.edgeEventStatus.PENDING.name);
+                scope.statusColor = types.edgeEventStatus.PENDING.color;
             }
             return status;
         }
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 412280603c..bb8661a841 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -817,7 +817,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",
@@ -841,8 +841,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",