diff --git a/ui/package-lock.json b/ui/package-lock.json
index 6bc1035b88..bbaf0f3bd3 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "thingsboard",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/ui/src/app/edge/edge-fieldset.tpl.html b/ui/src/app/edge/edge-fieldset.tpl.html
index bf0f09d972..2ef04b16ac 100644
--- a/ui/src/app/edge/edge-fieldset.tpl.html
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
@@ -48,6 +48,20 @@
         <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
         <span translate>edge.copy-id</span>
     </md-button>
+    <md-button ngclipboard data-clipboard-action="copy"
+               ngclipboard-success="onEdgeInfoCopied('key')"
+               data-clipboard-text="{{edge.routingKey}}" ng-show="!isEdit"
+               class="md-raised">
+        <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
+        <span translate>edge.copy-edge-key</span>
+    </md-button>
+    <md-button ngclipboard data-clipboard-action="copy"
+               ngclipboard-success="onEdgeInfoCopied('secret')"
+               data-clipboard-text="{{edge.secret}}" ng-show="!isEdit"
+               class="md-raised">
+        <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">
@@ -103,35 +117,13 @@
                 <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>
-        <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>
+    </fieldset>
 </md-content>