diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 4fe9ac790d..f0a01f9419 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -211,6 +211,8 @@
         "filter-type-entity-view-type": "Entity View type",
         "filter-type-entity-view-type-description": "Entity Views of type '{{entityView}}'",
         "filter-type-entity-view-type-and-name-description": "Entity Views of type '{{entityView}}' and with name starting with '{{prefix}}'",
+        "filter-type-edge-type": "Edge type",
+        "filter-type-edge-type-description": "Edges of type '{{edgeType}}'",
         "filter-type-relations-query": "Relations query",
         "filter-type-relations-query-description": "{{entities}} that have {{relationType}} relation {{direction}} {{rootEntity}}",
         "filter-type-asset-search-query": "Asset search query",
@@ -219,6 +221,8 @@
         "filter-type-device-search-query-description": "Devices with types {{deviceTypes}} that have {{relationType}} relation {{direction}} {{rootEntity}}",
         "filter-type-entity-view-search-query": "Entity view search query",
         "filter-type-entity-view-search-query-description": "Entity views with types {{entityViewTypes}} that have {{relationType}} relation {{direction}} {{rootEntity}}",
+        "filter-type-edge-search-query": "Edge search query",
+        "filter-type-edge-search-query-description": "Edges with types {{edgeTypes}} that have {{relationType}} relation {{direction}} {{rootEntity}}",
         "entity-filter": "Entity filter",
         "resolve-multiple": "Resolve as multiple entities",
         "filter-type": "Filter type",
@@ -294,11 +298,7 @@
         "unassign-asset": "Unassign asset",
         "unassign-assets-title": "Are you sure you want to unassign { count, plural, 1 {1 asset} other {# assets} }?",
         "unassign-assets-text": "After the confirmation all selected assets will be unassigned and won't be accessible by the customer.",
-        "unassign-asset-from-edge-title": "Are you sure you want to unassign the asset '{{assetName}}'?",
-        "unassign-asset-from-edge-text": "After the confirmation the asset will be unassigned and won't be accessible by the edge.",
         "unassign-assets-from-edge": "Unassign assets from edge",
-        "unassign-assets-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 asset} other {# assets} }?",
-        "unassign-assets-from-edge-text": "After the confirmation all selected assets will be unassigned and won't be accessible by the edge.",
         "copyId": "Copy asset Id",
         "idCopiedMessage": "Asset Id has been copied to clipboard",
         "select-asset": "Select asset",
@@ -307,9 +307,14 @@
         "name-starts-with": "Asset name starts with",
         "import": "Import assets",
         "asset-file": "Asset file",
-        "search": "Search assets",
-        "selected-assets": "{ count, plural, 1 {1 asset} other {# assets} } selected",
-        "label": "Label"
+        "label": "Label",
+        "assign-asset-to-edge": "Assign Asset(s) To Edge",
+        "unassign-asset-from-edge": "Unassign asset",
+        "unassign-asset-from-edge-title": "Are you sure you want to unassign the asset '{{assetName}}'?",
+        "unassign-asset-from-edge-text": "After the confirmation the asset will be unassigned and won't be accessible by the edge.",
+        "unassign-assets-from-edge-action-title": "Unassign { count, plural, 1 {1 asset} other {# assets} } from edge",
+        "unassign-assets-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 asset} other {# assets} }?",
+        "unassign-assets-from-edge-text": "After the confirmation all selected assets will be unassigned and won't be accessible by the edge."
     },
     "attribute": {
         "attributes": "Attributes",
@@ -359,6 +364,8 @@
         "type-credentials-updated": "Credentials updated",
         "type-assigned-to-customer": "Assigned to Customer",
         "type-unassigned-from-customer": "Unassigned from Customer",
+        "type-assigned-to-edge": "Assigned to Edge",
+        "type-unassigned-from-edge": "Unassigned from Edge",
         "type-activated": "Activated",
         "type-suspended": "Suspended",
         "type-credentials-read": "Credentials read",
@@ -483,7 +490,6 @@
         "assign-dashboard-to-customer": "Assign Dashboard(s) To Customer",
         "assign-dashboard-to-customer-text": "Please select the dashboards to assign to the customer",
         "assign-dashboard-to-edge-title": "Assign Dashboard(s) To Edge",
-        "assign-dashboard-to-edge-text": "Please select the dashboards to assign to the edge",
         "assign-to-customer-text": "Please select the customer to assign the dashboard(s)",
         "assign-to-customer": "Assign to customer",
         "unassign-from-customer": "Unassign from customer",
@@ -621,8 +627,11 @@
         "hide-details": "Hide details",
         "select-state": "Select target state",
         "state-controller": "State controller",
-        "search": "Search dashboards",
-        "selected-dashboards": "{ count, plural, 1 {1 dashboard} other {# dashboards} } selected"
+        "unassign-dashboard-from-edge-text": "After the confirmation the dashboard will be unassigned and won't be accessible by the edge.",
+        "unassign-dashboards-from-edge-action-title": "Unassign { count, plural, 1 {1 dashboard} other {# dashboards} } from edge",
+        "unassign-dashboards-from-edge-text": "After the confirmation all selected dashboards will be unassigned and won't be accessible by the edge.",
+        "assign-dashboard-to-edge": "Assign Dashboard(s) To Edge",
+        "assign-dashboard-to-edge-text": "Please select the dashboards to assign to the edge"
     },
     "datakey": {
         "settings": "Settings",
@@ -774,7 +783,13 @@
         "search": "Search devices",
         "selected-devices": "{ count, plural, 1 {1 device} other {# devices} } selected",
         "device-configuration": "Device configuration",
-        "transport-configuration": "Transport configuration"
+        "transport-configuration": "Transport configuration",
+        "assign-device-to-edge": "Assign Device(s) To Edge",
+        "unassign-devices-from-edge-action-title": "Unassign { count, plural, 1 {1 device} other {# devices} } from edge",
+        "unassign-device-from-edge": "Unassign device",
+        "unassign-devices-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 device} other {# devices} }?",
+        "unassign-devices-from-edge-text": "After the confirmation all selected devices will be unassigned and won't be accessible by the edge."
+
     },
     "device-profile": {
         "device-profile": "Device profile",
@@ -1157,7 +1172,6 @@
         "assign-entity-view-to-customer": "Assign Entity View(s) To Customer",
         "assign-entity-view-to-customer-text": "Please select the entity views to assign to the customer",
         "assign-entity-view-to-edge-title": "Assign Entity View(s) To Edge",
-        "assign-entity-view-to-edge-text":"Please select the entity views to assign to the edge",
         "no-entity-views-text": "No entity views found",
         "assign-to-customer-text": "Please select the customer to assign the entity view(s)",
         "entity-view-details": "Entity view details",
@@ -1169,8 +1183,6 @@
         "unassign-from-customer": "Unassign from customer",
         "unassign-entity-views": "Unassign entity views",
         "unassign-entity-views-action-title": "Unassign { count, plural, 1 {1 entity view} other {# entity views} } from customer",
-        "unassign-entity-view-from-edge-title": "Are you sure you want to unassign the entity view '{{entityViewName}}'?",
-        "unassign-entity-view-from-edge-text": "After the confirmation the entity view will be unassigned and won't be accessible by the edge.",
         "assign-new-entity-view": "Assign new entity view",
         "delete-entity-view-title": "Are you sure you want to delete the entity view '{{entityViewName}}'?",
         "delete-entity-view-text": "Be careful, after the confirmation the entity view and all related data will become unrecoverable.",
@@ -1226,8 +1238,14 @@
         "make-public-entity-view-text": "After the confirmation the entity view and all its data will be made public and accessible by others.",
         "make-private-entity-view-title": "Are you sure you want to make the entity view '{{entityViewName}}' private?",
         "make-private-entity-view-text": "After the confirmation the entity view and all its data will be made private and won't be accessible by others.",
-        "search": "Search entity views",
-        "selected-entity-views": "{ count, plural, 1 {1 entity view} other {# entity views} } selected"
+        "assign-entity-view-to-edge": "Assign Entity View(s) To Edge",
+        "assign-entity-view-to-edge-text":"Please select the entity views to assign to the edge",
+        "unassign-entity-view-from-edge-title": "Are you sure you want to unassign the entity view '{{entityViewName}}'?",
+        "unassign-entity-view-from-edge-text": "After the confirmation the entity view will be unassigned and won't be accessible by the edge.",
+        "unassign-entity-views-from-edge-action-title": "Unassign { count, plural, 1 {1 entity view} other {# entity views} } from edge",
+        "unassign-entity-view-from-edge": "Unassign entity view",
+        "unassign-entity-views-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 entity view} other {# entity views} }?",
+        "unassign-entity-views-from-edge-text": "After the confirmation all selected entity views will be unassigned and won't be accessible by the edge."
     },
     "event": {
         "event-type": "Event type",