diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html
index 5148d4653..b5b3c0ab0 100644
--- a/src/Squidex/app/features/settings/pages/clients/client.component.html
+++ b/src/Squidex/app/features/settings/pages/clients/client.component.html
@@ -26,7 +26,7 @@
             </div>
         </div>
         <div class="col-auto">
-            <button class="btn btn-secondary" (click)="createToken(client)">Connect</button>
+            <button class="btn btn-primary" (click)="createToken(client)">Connect</button>
         </div>
         <div class="col-auto cell-actions">
             <button type="button" class="btn btn-text-danger"
@@ -104,7 +104,7 @@
                 Use the following token for testing
 
                 <ng-container *ngIf="connectToken">
-                    <textarea class="form-control access-token" readonly>{{connectToken.tokenType}} {{connectToken.accessToken}}</textarea>
+                    <textarea class="form-control access-token" readonly>{{connectToken.accessToken}}</textarea>
                 </ng-container>
             </div>
     
diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.html b/src/Squidex/app/features/settings/pages/languages/language.component.html
index 31d00e55e..ab6c8ce8b 100644
--- a/src/Squidex/app/features/settings/pages/languages/language.component.html
+++ b/src/Squidex/app/features/settings/pages/languages/language.component.html
@@ -9,7 +9,7 @@
             </div>
             <div class="col-auto">
                 <div class="float-right">
-                    <button type="button" class="btn btn-secondary table-items-edit-button" [class.active]="isEditing" (click)="toggleEditing()" *ngIf="!language.isMaster">
+                    <button type="button" class="btn btn-secondary table-items-edit-button mr-1" [class.active]="isEditing" (click)="toggleEditing()" *ngIf="!language.isMaster">
                         <i class="icon-settings"></i>
                     </button>
 
diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.html b/src/Squidex/app/features/settings/pages/patterns/pattern.component.html
index 7a9c80719..8ba33c1cf 100644
--- a/src/Squidex/app/features/settings/pages/patterns/pattern.component.html
+++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.html
@@ -20,7 +20,7 @@
         </div>
 
         <div class="col-auto pl-1 col-options" *ngIf="pattern">
-            <button type="submit" class="btn btn-primary" [class.disabled]="!editForm.form.dirty">
+            <button type="submit" class="btn btn-primary mr-1" [class.disabled]="!editForm.form.dirty">
                 <i class="icon-checkmark"></i>
             </button>
 
@@ -33,7 +33,7 @@
         </div>
         
         <div class="col-auto pl-1 col-options" *ngIf="!pattern">
-            <button type="submit" class="btn btn-success">
+            <button type="submit" class="btn btn-success mr-1">
                 <i class="icon-add"></i>
             </button>
 
diff --git a/src/Squidex/app/features/settings/pages/roles/role.component.html b/src/Squidex/app/features/settings/pages/roles/role.component.html
index 262d41f85..b54fdfcce 100644
--- a/src/Squidex/app/features/settings/pages/roles/role.component.html
+++ b/src/Squidex/app/features/settings/pages/roles/role.component.html
@@ -12,7 +12,7 @@
             </div>
             <div class="col-auto">
                 <div class="float-right">
-                    <button type="button" class="btn btn-secondary table-items-edit-button" [class.active]="isEditing" (click)="toggleEditing()">
+                    <button type="button" class="btn btn-secondary table-items-edit-button mr-1" [class.active]="isEditing" (click)="toggleEditing()">
                         <i class="icon-settings"></i>
                     </button>
 
diff --git a/src/Squidex/app/theme/_common.scss b/src/Squidex/app/theme/_common.scss
index 6b51764e6..13be82170 100644
--- a/src/Squidex/app/theme/_common.scss
+++ b/src/Squidex/app/theme/_common.scss
@@ -85,7 +85,7 @@ pre {
     }
 
     h3 {
-        margin-top: 2rem;
+        margin-top: 1.5rem;
         margin-bottom: .25rem;
         font-size: 1.1rem;
     }