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 2ef04b16ac..ddc109a2cc 100644
--- a/ui/src/app/edge/edge-fieldset.tpl.html
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
@@ -117,13 +117,36 @@
                 <div translate ng-message="required">edge.cloud-endpoint-required</div>
             </div>
         </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>
         </md-input-container>
+        <md-button class="md-icon-button" style="margin-top: 14px;"
+                   ngclipboard data-clipboard-action="copy"
+                   ngclipboard-success="onEdgeInfoCopied('key')"
+                   data-clipboard-text="{{edge.routingKey}}">
+            <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
+            <md-tooltip md-direction="top">
+                {{ 'edge.copy-edge-key' | translate }}
+            </md-tooltip>
+        </md-button>
+    </div>
+    <div layout="row">
         <md-input-container class="md-block" flex>
             <label translate>edge.edge-secret</label>
             <input ng-model="edge.secret" disabled>
         </md-input-container>
-    </fieldset>
+        <md-button class="md-icon-button" style="margin-top: 14px;"
+                   ngclipboard data-clipboard-action="copy"
+                   data-clipboard-text="{{edge.secret}}"
+                   ngclipboard-success="onEdgeInfoCopied('secret')">
+            <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
+            <md-tooltip md-direction="top">
+                {{ 'edge.copy-edge-secret' | translate }}
+            </md-tooltip>
+        </md-button>
+    </div>
 </md-content>