diff --git a/ui/src/app/asset/asset-fieldset.tpl.html b/ui/src/app/asset/asset-fieldset.tpl.html
index cc08b40f0a..d4eecf9627 100644
--- a/ui/src/app/asset/asset-fieldset.tpl.html
+++ b/ui/src/app/asset/asset-fieldset.tpl.html
@@ -27,6 +27,9 @@
 <md-button ng-click="onDeleteAsset({event: $event})"
            ng-show="!isEdit && assetScope === 'tenant'"
            class="md-raised md-primary">{{ 'asset.delete' | translate }}</md-button>
+<md-button ng-click="onUnassignFromEdge({event: $event})"
+           ng-show="!isEdit && assetScope === 'edge'"
+           class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
 
 <div layout="row">
     <md-button ngclipboard data-clipboard-action="copy"
diff --git a/ui/src/app/asset/asset.controller.js b/ui/src/app/asset/asset.controller.js
index 84c8334bb2..105ef17dbd 100644
--- a/ui/src/app/asset/asset.controller.js
+++ b/ui/src/app/asset/asset.controller.js
@@ -130,6 +130,7 @@ export function AssetController($rootScope, userService, assetService, customerS
     vm.assignToCustomer = assignToCustomer;
     vm.makePublic = makePublic;
     vm.unassignFromCustomer = unassignFromCustomer;
+    vm.unassignFromEdge = unassignFromEdge;
 
     initController();
 
diff --git a/ui/src/app/asset/asset.directive.js b/ui/src/app/asset/asset.directive.js
index 2c2bd1f673..b51ddeb005 100644
--- a/ui/src/app/asset/asset.directive.js
+++ b/ui/src/app/asset/asset.directive.js
@@ -66,7 +66,8 @@ export default function AssetDirective($compile, $templateCache, toast, $transla
             onAssignToCustomer: '&',
             onMakePublic: '&',
             onUnassignFromCustomer: '&',
-            onDeleteAsset: '&'
+            onDeleteAsset: '&',
+            onUnassignFromEdge: '&'
         }
     };
 }
diff --git a/ui/src/app/asset/assets.tpl.html b/ui/src/app/asset/assets.tpl.html
index 7023c1104d..e8d166ef68 100644
--- a/ui/src/app/asset/assets.tpl.html
+++ b/ui/src/app/asset/assets.tpl.html
@@ -29,6 +29,7 @@
                        on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])"
                        on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)"
                        on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)"
+                       on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)"
                        on-delete-asset="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-asset>
         </md-tab>
         <md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'attribute.attributes' | translate }}">
diff --git a/ui/src/app/device/device-fieldset.tpl.html b/ui/src/app/device/device-fieldset.tpl.html
index 76b85a60e4..1755e62646 100644
--- a/ui/src/app/device/device-fieldset.tpl.html
+++ b/ui/src/app/device/device-fieldset.tpl.html
@@ -24,6 +24,9 @@
 <md-button ng-click="onUnassignFromCustomer({event: $event, isPublic: isPublic})"
            ng-show="!isEdit && (deviceScope === 'customer' || deviceScope === 'tenant') && isAssignedToCustomer"
            class="md-raised md-primary">{{ isPublic ? 'device.make-private' : 'device.unassign-from-customer' | translate }}</md-button>
+<md-button ng-click="onUnassignFromEdge({event: $event})"
+           ng-show="!isEdit && deviceScope === 'edge'"
+           class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
 <md-button ng-click="onManageCredentials({event: $event})"
            ng-show="!isEdit"
            class="md-raised md-primary">{{ (deviceScope === 'customer_user' ? 'device.view-credentials' : 'device.manage-credentials') | translate }}</md-button>
diff --git a/ui/src/app/device/device.controller.js b/ui/src/app/device/device.controller.js
index dc71090d76..e15dd14678 100644
--- a/ui/src/app/device/device.controller.js
+++ b/ui/src/app/device/device.controller.js
@@ -131,6 +131,7 @@ export function DeviceController($rootScope, userService, deviceService, custome
     vm.makePublic = makePublic;
     vm.unassignFromCustomer = unassignFromCustomer;
     vm.manageCredentials = manageCredentials;
+    vm.unassignFromEdge = unassignFromEdge;
 
     initController();
 
diff --git a/ui/src/app/device/device.directive.js b/ui/src/app/device/device.directive.js
index 03874e5ca5..45a849c4fd 100644
--- a/ui/src/app/device/device.directive.js
+++ b/ui/src/app/device/device.directive.js
@@ -82,7 +82,8 @@ export default function DeviceDirective($compile, $templateCache, toast, $transl
             onMakePublic: '&',
             onUnassignFromCustomer: '&',
             onManageCredentials: '&',
-            onDeleteDevice: '&'
+            onDeleteDevice: '&',
+            onUnassignFromEdge: '&',
         }
     };
 }
diff --git a/ui/src/app/device/devices.tpl.html b/ui/src/app/device/devices.tpl.html
index 14b4f90df3..0f403ba1be 100644
--- a/ui/src/app/device/devices.tpl.html
+++ b/ui/src/app/device/devices.tpl.html
@@ -29,6 +29,7 @@
                        on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])"
                        on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)"
                        on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)"
+                       on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)"
                        on-manage-credentials="vm.manageCredentials(event, vm.grid.detailsConfig.currentItem)"
                        on-delete-device="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-device>
         </md-tab>
diff --git a/ui/src/app/entity-view/entity-view-fieldset.tpl.html b/ui/src/app/entity-view/entity-view-fieldset.tpl.html
index 6e6f5dc2cb..4beac8a231 100644
--- a/ui/src/app/entity-view/entity-view-fieldset.tpl.html
+++ b/ui/src/app/entity-view/entity-view-fieldset.tpl.html
@@ -27,6 +27,9 @@
 <md-button ng-click="onDeleteEntityView({event: $event})"
            ng-show="!isEdit && entityViewScope === 'tenant'"
            class="md-raised md-primary">{{ 'entity-view.delete' | translate }}</md-button>
+<md-button ng-click="onUnassignFromEdge({event: $event})"
+           ng-show="!isEdit && entityViewScope === 'edge'"
+           class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
 
 <div layout="row">
 	<md-button ngclipboard data-clipboard-action="copy"
diff --git a/ui/src/app/entity-view/entity-view.controller.js b/ui/src/app/entity-view/entity-view.controller.js
index 63dbaa2a47..d1ce45dc96 100644
--- a/ui/src/app/entity-view/entity-view.controller.js
+++ b/ui/src/app/entity-view/entity-view.controller.js
@@ -106,6 +106,7 @@ export function EntityViewController($rootScope, userService, entityViewService,
     vm.assignToCustomer = assignToCustomer;
     vm.makePublic = makePublic;
     vm.unassignFromCustomer = unassignFromCustomer;
+    vm.unassignFromEdge = unassignFromEdge;
 
     initController();
 
diff --git a/ui/src/app/entity-view/entity-view.directive.js b/ui/src/app/entity-view/entity-view.directive.js
index cf77489674..9f92fdfb2a 100644
--- a/ui/src/app/entity-view/entity-view.directive.js
+++ b/ui/src/app/entity-view/entity-view.directive.js
@@ -144,7 +144,8 @@ export default function EntityViewDirective($q, $compile, $templateCache, $filte
             onAssignToCustomer: '&',
             onMakePublic: '&',
             onUnassignFromCustomer: '&',
-            onDeleteEntityView: '&'
+            onDeleteEntityView: '&',
+            onUnassignFromEdge: '&'
         }
     };
 }
diff --git a/ui/src/app/entity-view/entity-views.tpl.html b/ui/src/app/entity-view/entity-views.tpl.html
index 8aecf26de8..f975445344 100644
--- a/ui/src/app/entity-view/entity-views.tpl.html
+++ b/ui/src/app/entity-view/entity-views.tpl.html
@@ -29,6 +29,7 @@
                        on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])"
                        on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)"
                        on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)"
+                       on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)"
                        on-delete-entity-view="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-entity-view>
         </md-tab>
         <md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'attribute.attributes' | translate }}">