diff --git a/client/res/templates/admin/field-manager/list.tpl b/client/res/templates/admin/field-manager/list.tpl
index b9e019d5c4..4c5285663a 100644
--- a/client/res/templates/admin/field-manager/list.tpl
+++ b/client/res/templates/admin/field-manager/list.tpl
@@ -26,7 +26,7 @@
         <th style="width: 35%">{{translate 'Name' scope='FieldManager'}}</th>
         <th style="width: 35%">{{translate 'Label' scope='FieldManager'}}</th>
         <th style="width: 20%">{{translate 'Type' scope='FieldManager'}}</th>
-        <th style="width: 10%; text-align: right;"></th>
+        <th style="width: 8%; text-align: right;"></th>
     </thead>
     <tbody>
     {{#each fieldDefsArray}}
@@ -47,7 +47,22 @@
         <td>{{translate type category='fieldTypes' scope='Admin'}}</td>
         <td style="text-align: right">
             {{#if isCustom}}
-            <a role="button" tabindex="0" data-action="removeField" data-name="{{name}}">{{translate 'Remove'}}</a>
+                <div class="btn-group row-dropdown-group">
+                    <button
+                        class="btn btn-link btn-sm dropdown-toggle"
+                        data-toggle="dropdown"
+                    ><span class="caret"></span></button>
+                    <ul class="dropdown-menu pull-right">
+                        <li>
+                            <a
+                                role="button"
+                                tabindex="0"
+                                data-action="removeField"
+                                data-name="{{name}}"
+                            >{{translate 'Remove'}}</a>
+                        </li>
+                    </ul>
+                </div>
             {{/if}}
         </td>
     </tr>
diff --git a/client/res/templates/admin/link-manager/index.tpl b/client/res/templates/admin/link-manager/index.tpl
index 01c70017e9..7a0b1aa140 100644
--- a/client/res/templates/admin/link-manager/index.tpl
+++ b/client/res/templates/admin/link-manager/index.tpl
@@ -88,11 +88,24 @@
                 </a>
             {{/if}}
         </td>
-        <td style="width: 10%; ; text-align: right">
+        <td style="width: 10%; ; text-align: right" class="">
             {{#if isRemovable}}
-            <a role="button" tabindex="0" data-action="removeLink" data-link="{{link}}">
-                {{translate 'Remove'}}
-            </a>
+                <div class="btn-group row-dropdown-group">
+                    <button
+                        class="btn btn-link btn-sm dropdown-toggle"
+                        data-toggle="dropdown"
+                    ><span class="caret"></span></button>
+                    <ul class="dropdown-menu pull-right">
+                        <li>
+                            <a
+                                role="button"
+                                tabindex="0"
+                                data-action="removeLink"
+                                data-link="{{link}}"
+                            >{{translate 'Remove'}}</a>
+                        </li>
+                    </ul>
+                </div>
             {{/if}}
         </td>
     </tr>
diff --git a/frontend/less/espo/elements/table.less b/frontend/less/espo/elements/table.less
index 394842cd63..68957cf0ee 100644
--- a/frontend/less/espo/elements/table.less
+++ b/frontend/less/espo/elements/table.less
@@ -136,3 +136,17 @@ table th.cell-nowrap {
     text-overflow: ellipsis;
     overflow: hidden;
 }
+
+table td {
+    > .btn-group.row-dropdown-group {
+        > .btn.dropdown-toggle {
+            margin-top: -6px;
+            margin-bottom: -6px;
+
+            > .caret {
+                top: -1px;
+                position: relative;
+            }
+        }
+    }
+}