diff --git a/client/res/templates/admin/integrations/edit.tpl b/client/res/templates/admin/integrations/edit.tpl
index 18314cd012..7897aa9175 100644
--- a/client/res/templates/admin/integrations/edit.tpl
+++ b/client/res/templates/admin/integrations/edit.tpl
@@ -7,7 +7,7 @@
 
 <div class="row">
     <div class="col-sm-6">
-        <div class="panel">
+        <div class="panel panel-default">
             <div class="panel-body panel-body-form">
                 <div class="cell form-group" data-name="enabled">
                     <label
diff --git a/client/res/templates/admin/integrations/oauth2.tpl b/client/res/templates/admin/integrations/oauth2.tpl
index 8b45657166..179b486123 100644
--- a/client/res/templates/admin/integrations/oauth2.tpl
+++ b/client/res/templates/admin/integrations/oauth2.tpl
@@ -7,7 +7,7 @@
 
 <div class="row">
     <div class="col-sm-6">
-        <div class="panel">
+        <div class="panel panel-default">
             <div class="panel-body panel-body-form">
                 <div class="cell form-group" data-name="enabled">
                     <label
diff --git a/client/res/templates/external-account/index.tpl b/client/res/templates/external-account/index.tpl
index d92e3b86ed..51e545a4d6 100644
--- a/client/res/templates/external-account/index.tpl
+++ b/client/res/templates/external-account/index.tpl
@@ -19,4 +19,3 @@
         </div>
     </div>
 </div>
-
diff --git a/client/res/templates/external-account/oauth2.tpl b/client/res/templates/external-account/oauth2.tpl
index e58da3d6da..fa8c1a0fa9 100644
--- a/client/res/templates/external-account/oauth2.tpl
+++ b/client/res/templates/external-account/oauth2.tpl
@@ -1,13 +1,18 @@
 <div class="button-container">
-    <button class="btn btn-primary" data-action="save">{{translate 'Save'}}</button>
-    <button class="btn btn-default" data-action="cancel">{{translate 'Cancel'}}</button>
+    <div class="btn-group">
+        <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>
 
 <div class="row">
     <div class="col-sm-6">
         <div>
             <div class="cell form-group" data-name="enabled">
-                <label class="control-label" data-name="enabled">{{translate 'enabled' scope='Integration' category='fields'}}</label>
+                <label
+                    class="control-label"
+                    data-name="enabled"
+                >{{translate 'enabled' scope='Integration' category='fields'}}</label>
                 <div class="field" data-name="enabled">{{{enabled}}}</div>
             </div>
         </div>
@@ -17,7 +22,9 @@
                 class="btn btn-danger {{#if isConnected}}hidden{{/if}}"
                 data-action="connect"
             >{{translate 'Connect' scope='ExternalAccount'}}</button>
-            <span class="connected-label label label-success {{#unless isConnected}}hidden{{/unless}}">{{translate 'Connected' scope='ExternalAccount'}}</span>
+            <span
+                class="connected-label label label-success {{#unless isConnected}}hidden{{/unless}}"
+            >{{translate 'Connected' scope='ExternalAccount'}}</span>
         </div>
     </div>
     <div class="col-sm-6">