diff --git a/client/res/templates/admin/entity-manager/formula.tpl b/client/res/templates/admin/entity-manager/formula.tpl
index b566701c42..d33593e704 100644
--- a/client/res/templates/admin/entity-manager/formula.tpl
+++ b/client/res/templates/admin/entity-manager/formula.tpl
@@ -12,10 +12,10 @@
 
 <div class="button-container">
     <div class="btn-group actions-btn-group" role="group">
-        <button class="btn btn-danger action action" data-action="save">
+        <button class="btn btn-danger btn-xs-wide action"  data-action="save">
             {{translate 'Save'}}
         </button>
-        <button class="btn btn-default action action" data-action="close">
+        <button class="btn btn-default btn-xs-wide action" data-action="close">
             {{translate 'Close'}}
         </button>
     </div>
diff --git a/client/res/templates/admin/field-manager/edit.tpl b/client/res/templates/admin/field-manager/edit.tpl
index a60651401a..ca71fcd02d 100644
--- a/client/res/templates/admin/field-manager/edit.tpl
+++ b/client/res/templates/admin/field-manager/edit.tpl
@@ -1,7 +1,7 @@
 <div class="button-container">
     <div class="btn-group">
-    <button class="btn btn-primary" data-action="save">{{translate 'Save'}}</button>
-    <button class="btn btn-default" data-action="close">{{translate 'Close'}}</button>
+    <button class="btn btn-primary btn-xs-wide" data-action="save">{{translate 'Save'}}</button>
+    <button class="btn btn-default btn-xs-wide" data-action="close">{{translate 'Close'}}</button>
     {{#if hasResetToDefault}}
     <button
         class="btn btn-default"
diff --git a/client/res/templates/admin/field-manager/list.tpl b/client/res/templates/admin/field-manager/list.tpl
index d1d1241b3e..0312f51bfc 100644
--- a/client/res/templates/admin/field-manager/list.tpl
+++ b/client/res/templates/admin/field-manager/list.tpl
@@ -3,7 +3,7 @@
         {{#if hasAddField}}
         <button
             type="button"
-            class="btn btn-default"
+            class="btn btn-default btn-wide"
             data-action="addField"
         ><span class="fas fa-plus"></span> {{translate 'Add Field' scope='Admin'}}</button>
         {{/if}}
diff --git a/client/res/templates/admin/label-manager/edit.tpl b/client/res/templates/admin/label-manager/edit.tpl
index 3d804cb241..04a52e5cb1 100644
--- a/client/res/templates/admin/label-manager/edit.tpl
+++ b/client/res/templates/admin/label-manager/edit.tpl
@@ -7,8 +7,8 @@
 {{else}}
     <div class="button-container">
         <div class="btn-group">
-            <button class="btn btn-primary" data-action="save">{{translate 'Save'}}</button>
-            <button class="btn btn-default" data-action="cancel">{{translate 'Cancel'}}</button>
+            <button class="btn btn-primary btn-xs-wide" data-action="save">{{translate 'Save'}}</button>
+            <button class="btn btn-default btn-xs-wide" data-action="cancel">{{translate 'Cancel'}}</button>
         </div>
     </div>
 {{/unless}}
@@ -17,8 +17,18 @@
 <div class="panel panel-default" data-name="{{./this}}">
     <div class="panel-heading clearfix">
         <div class="pull-left" style="margin-right: 10px;">
-            <a href="javascript:" data-action="showCategory" data-name="{{./this}}" class="action"><span class="fas fa-chevron-down"></span></a>
-            <a href="javascript:" data-action="hideCategory" data-name="{{./this}}" class="hidden action"><span class="fas fa-chevron-up"></span></a>
+            <a
+                href="javascript:"
+                data-action="showCategory"
+                data-name="{{./this}}"
+                class="action"
+            ><span class="fas fa-chevron-down"></span></a>
+            <a
+                href="javascript:"
+                data-action="hideCategory"
+                data-name="{{./this}}"
+                class="hidden action"
+            ><span class="fas fa-chevron-up"></span></a>
         </div>
         <h4 class="panel-title">
             <span class="action" style="cursor: pointer;" data-action="showCategory" data-name="{{./this}}">
@@ -29,4 +39,4 @@
     <div class="panel-body hidden" data-name="{{./this}}">
     </div>
 </div>
-{{/each}}
\ No newline at end of file
+{{/each}}
diff --git a/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl
index 7ac3146415..0ae697f172 100644
--- a/client/res/templates/admin/layouts/grid.tpl
+++ b/client/res/templates/admin/layouts/grid.tpl
@@ -1,7 +1,7 @@
 <div class="button-container">
     <div class="btn-group">
     {{#each buttonList}}
-        {{button name label=label scope='Admin' style=style}}
+        {{button name label=label scope='Admin' style=style className='btn-xs-wide'}}
     {{/each}}
     </div>
 </div>
diff --git a/client/res/templates/admin/layouts/index.tpl b/client/res/templates/admin/layouts/index.tpl
index 678593fcf8..b127041852 100644
--- a/client/res/templates/admin/layouts/index.tpl
+++ b/client/res/templates/admin/layouts/index.tpl
@@ -6,14 +6,22 @@
         {{#each layoutScopeDataList}}
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <a class="accordion-toggle" data-scope="{{scope}}" href="{{url}}">{{translate scope category='scopeNamesPlural'}}</a>
+                    <a
+                        class="accordion-toggle"
+                        data-scope="{{scope}}" href="{{url}}"
+                    >{{translate scope category='scopeNamesPlural'}}</a>
                 </div>
                 <div class="panel-collapse collapse{{#ifEqual scope ../scope}} in{{/ifEqual}}" data-scope="{{scope}}">
                     <div class="panel-body">
                         <ul class="list-unstyled" style="overflow-x: hidden;";>
                         {{#each typeDataList}}
                             <li>
-                                <a class="layout-link btn btn-link" data-type="{{type}}" data-scope="{{../scope}}" href="{{url}}">{{translate type scope='Admin' category='layouts'}}</a>
+                                <a
+                                    class="layout-link btn btn-link"
+                                    data-type="{{type}}"
+                                    data-scope="{{../scope}}"
+                                    href="{{url}}"
+                                >{{translate type scope='Admin' category='layouts'}}</a>
                             </li>
                         {{/each}}
                         </ul>
diff --git a/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl
index b89c71f6a3..fbf22fd220 100644
--- a/client/res/templates/admin/layouts/rows.tpl
+++ b/client/res/templates/admin/layouts/rows.tpl
@@ -1,7 +1,7 @@
 <div class="button-container">
     <div class="btn-group">
     {{#each buttonList}}
-        {{button name label=label scope='Admin' style=style}}
+        {{button name label=label scope='Admin' style=style className='btn-xs-wide'}}
     {{/each}}
     </div>
 </div>
diff --git a/client/res/templates/admin/link-manager/index.tpl b/client/res/templates/admin/link-manager/index.tpl
index 66bba51c36..2e616de0c1 100644
--- a/client/res/templates/admin/link-manager/index.tpl
+++ b/client/res/templates/admin/link-manager/index.tpl
@@ -11,7 +11,7 @@
 </div>
 
 <div class="button-container">
-    <button class="btn btn-default" data-action="createLink">
+    <button class="btn btn-default btn-wide" data-action="createLink">
         <span class="fas fa-plus"></span>
         {{translate 'Create Link' scope='Admin'}}
     </button>