diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html
index 920d9baef..4a6d7cc55 100644
--- a/src/Squidex/app/features/assets/pages/assets-page.component.html
+++ b/src/Squidex/app/features/assets/pages/assets-page.component.html
@@ -53,9 +53,11 @@
 
     <ng-container sidebar>    
         <div class="sidebar-section">
-            <a class="row sidebar-item" (click)="resetTags()" [class.active]="assetsState.isTagSelectionEmpty()">
-                <div class="col">
-                    All tags
+            <a class="sidebar-item" (click)="resetTags()" [class.active]="assetsState.isTagSelectionEmpty()">
+                <div class="row">
+                    <div class="col">
+                        All tags
+                    </div>
                 </div>
             </a>
         </div>
@@ -63,12 +65,14 @@
         <div class="sidebar-section">
             <h3>Tags</h3>
     
-            <a class="row sidebar-item" *ngFor="let tag of assetsState.tags | async" (click)="toggleTag(tag.name)" [class.active]="assetsState.isTagSelected(tag.name)">
-                <div class="col">
-                    {{tag.name}}
-                </div>
-                <div class="col col-auto">
-                    {{tag.count}}
+            <a class="sidebar-item" *ngFor="let tag of assetsState.tags | async" (click)="toggleTag(tag.name)" [class.active]="assetsState.isTagSelected(tag.name)">
+                <div class="row">
+                    <div class="col">
+                        {{tag.name}}
+                    </div>
+                    <div class="col col-auto">
+                        {{tag.count}}
+                    </div>
                 </div>
             </a>
         </div>
@@ -76,14 +80,16 @@
         <div class="sidebar-section">
             <h3>Saved queries</h3>
 
-            <a class="row sidebar-item" *ngFor="let query of queries.queries | async" (click)="search(query.filter)" [class.active]="isSelectedQuery(query.filter)">
-                <div class="col truncate">
-                    {{query.name}}
-                </div>
-                <div class="col col-auto">
-                    <a class="sidebar-item-remove" (click)="queries.remove(query.name)">
-                        <i class="icon-close"></i>
-                    </a>
+            <a class="sidebar-item" *ngFor="let query of queries.queries | async" (click)="search(query.filter)" [class.active]="isSelectedQuery(query.filter)">
+                <div class="row">
+                    <div class="col truncate">
+                        {{query.name}}
+                    </div>
+                    <div class="col col-auto">
+                        <a class="sidebar-item-remove" (click)="queries.remove(query.name)">
+                            <i class="icon-close"></i>
+                        </a>
+                    </div>
                 </div>
             </a>
         </div>
diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.html b/src/Squidex/app/features/content/pages/content/content-page.component.html
index 415781eb6..a4946cba7 100644
--- a/src/Squidex/app/features/content/pages/content/content-page.component.html
+++ b/src/Squidex/app/features/content/pages/content/content-page.component.html
@@ -34,7 +34,8 @@
                 <div class="dropdown dropdown-options ml-1" *ngIf="content">
                     <button type="button" class="btn btn-outline-secondary" (click)="dropdown.toggle()" [disabled]="schema.isSingleton && !content.isPending" 
                         [class.active]="dropdown.isOpen | async" #optionsButton>
-                        <sqx-content-status 
+                        <sqx-content-status
+                            [alignMiddle]="false"
                             [status]="content.status"
                             [scheduledTo]="content.scheduleJob?.status"
                             [scheduledAt]="content.scheduleJob?.dueTime"
diff --git a/src/Squidex/app/features/content/shared/array-editor.component.html b/src/Squidex/app/features/content/shared/array-editor.component.html
index 784aed591..f1df6fcf0 100644
--- a/src/Squidex/app/features/content/shared/array-editor.component.html
+++ b/src/Squidex/app/features/content/shared/array-editor.component.html
@@ -1,4 +1,4 @@
-<div class="container" *ngIf="arrayControl.controls.length > 0">
+<div class="array-container" *ngIf="arrayControl.controls.length > 0">
     <div class="item" *ngFor="let itemForm of arrayControl.controls; let i = index">
         <sqx-array-item
             [form]="form"
diff --git a/src/Squidex/app/features/content/shared/array-editor.component.scss b/src/Squidex/app/features/content/shared/array-editor.component.scss
index 33a1c1ebe..09b48507c 100644
--- a/src/Squidex/app/features/content/shared/array-editor.component.scss
+++ b/src/Squidex/app/features/content/shared/array-editor.component.scss
@@ -1,7 +1,7 @@
 @import '_vars';
 @import '_mixins';
 
-.container {
+.array-container {
     background: $color-border;
     padding: 1rem;
     position: relative;
diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.scss b/src/Squidex/app/features/content/shared/assets-editor.component.scss
index 4f208dcc6..6685719ff 100644
--- a/src/Squidex/app/features/content/shared/assets-editor.component.scss
+++ b/src/Squidex/app/features/content/shared/assets-editor.component.scss
@@ -45,12 +45,10 @@
         @include border-radius;
         @include flex-box;
         @include truncate;
-        border: 2px dashed $color-border;
-        height: 2.5rem;
-        font-size: 1.2rem;
+        border: 2px dashed darken($color-border, 10%);
         font-weight: normal;
         text-align: center;
-        padding: 0 2rem;
+        padding: 5px 2rem;
         color: darken($color-border, 30%);
         cursor: pointer;
     }
diff --git a/src/Squidex/app/features/content/shared/content-status.component.html b/src/Squidex/app/features/content/shared/content-status.component.html
index 7166be180..33e7cff46 100644
--- a/src/Squidex/app/features/content/shared/content-status.component.html
+++ b/src/Squidex/app/features/content/shared/content-status.component.html
@@ -1,17 +1,17 @@
-<span *ngIf="!scheduledTo">
-    <span class="content-status content-status-{{displayStatus | lowercase}} mr-1" #statusIcon>
+<ng-container *ngIf="!scheduledTo">
+    <span class="content-status content-status-{{displayStatus | lowercase}} mr-1" [class.middle]="alignMiddle" #statusIcon>
         <i class="icon-circle"></i>
     </span>
 
     <sqx-tooltip [target]="statusIcon">{{displayStatus}}</sqx-tooltip>
-</span>
+</ng-container>
 
-<span *ngIf="scheduledTo">
-    <span class="content-status content-status-{{scheduledTo | lowercase}} mr-1" #statusIcon>
+<ng-container *ngIf="scheduledTo">
+    <span class="content-status content-status-{{scheduledTo | lowercase}} mr-1" [class.middle]="alignMiddle" #statusIcon>
         <i class="icon-clock"></i>
     </span>
 
     <sqx-tooltip position="topRight" [target]="statusIcon">Will be set to '{{scheduledTo}}' at {{scheduledAt | sqxFullDateTime}}</sqx-tooltip>
-</span>
+</ng-container>
 
 <span class="content-status-label" *ngIf="showLabel">{{displayStatus}}</span>
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/content-status.component.scss b/src/Squidex/app/features/content/shared/content-status.component.scss
index 36696d04b..d91da46c4 100644
--- a/src/Squidex/app/features/content/shared/content-status.component.scss
+++ b/src/Squidex/app/features/content/shared/content-status.component.scss
@@ -2,10 +2,6 @@
 @import '_mixins';
 
 .content-status {
-    & {
-        vertical-align: middle;
-    }
-
     &-published {
         color: $color-theme-green;
     }
@@ -35,4 +31,8 @@
         color: $color-dark-foreground;
         padding: .75rem;
     }
+}
+
+.middle {
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/content-status.component.ts b/src/Squidex/app/features/content/shared/content-status.component.ts
index 1f7c463a5..918a9f3e4 100644
--- a/src/Squidex/app/features/content/shared/content-status.component.ts
+++ b/src/Squidex/app/features/content/shared/content-status.component.ts
@@ -31,6 +31,9 @@ export class ContentStatusComponent {
     @Input()
     public showLabel = false;
 
+    @Input()
+    public alignMiddle = true;
+
     public get displayStatus() {
         return !!this.isPending ? 'Pending' : this.status;
     }
diff --git a/src/Squidex/app/features/content/shared/references-editor.component.scss b/src/Squidex/app/features/content/shared/references-editor.component.scss
index 1ff195b24..c7ed7fd10 100644
--- a/src/Squidex/app/features/content/shared/references-editor.component.scss
+++ b/src/Squidex/app/features/content/shared/references-editor.component.scss
@@ -26,7 +26,7 @@
     & {
         @include transition(border-color .4s ease);
         @include border-radius;
-        border: 2px dashed $color-border;
+        border: 2px dashed darken($color-border, 10%);
         font-size: 1.2rem;
         font-weight: normal;
         text-align: center;
diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html
index e27a1108d..d2cc2b567 100644
--- a/src/Squidex/app/shared/components/asset.component.html
+++ b/src/Squidex/app/shared/components/asset.component.html
@@ -86,12 +86,12 @@
 
 <ng-template #listTemplate>
     <div class="table-items-row" [class.selectable]="isSelectable" (click)="selected.emit(asset)" (sqxFileDrop)="updateFile($event)">
-        <div class="left-border" [class.selected]="isSelected" ></div>
+        <div class="left-border" [class.hidden]="!isSelectable" [class.selected]="isSelected" ></div>
 
-        <div *ngIf="asset && asset.isImage && progress === 0" class="image" @fade>
+        <div *ngIf="asset && asset.isImage && progress === 0" class="image" [class.image-left]="!isSelectable" @fade>
             <img [sqxImageSource]="asset | sqxAssetPreviewUrl" class="bg2" layoutKey="asset-small">
         </div>
-        <div *ngIf="asset && !asset.isImage && progress === 0" class="image image-padded" @fade>
+        <div *ngIf="asset && !asset.isImage && progress === 0" class="image image-padded" [class.image-left]="!isSelectable" @fade>
             <img class="icon" [attr.src]="asset | sqxFileIcon">
         </div>
 
diff --git a/src/Squidex/app/shared/components/asset.component.scss b/src/Squidex/app/shared/components/asset.component.scss
index 0ccea99d0..78d880e2e 100644
--- a/src/Squidex/app/shared/components/asset.component.scss
+++ b/src/Squidex/app/shared/components/asset.component.scss
@@ -216,6 +216,10 @@ $list-height: 2.375rem;
         padding: 1rem;
     }
 
+    .image-left {
+        left: 0;
+    }
+
     .icon {
         max-width: 100%;
     }
diff --git a/src/Squidex/app/shared/components/assets-selector.component.scss b/src/Squidex/app/shared/components/assets-selector.component.scss
index ba605503d..4a020bd99 100644
--- a/src/Squidex/app/shared/components/assets-selector.component.scss
+++ b/src/Squidex/app/shared/components/assets-selector.component.scss
@@ -8,8 +8,10 @@
         }
 
         .tags {
-            @include border-radius-left;
-            border-right: 0;
+            & {
+                @include border-radius-left;
+                border-right: 0;
+            }
 
             &:focus,
             &.focus {
diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss
index 028944ef9..e2032a4cc 100644
--- a/src/Squidex/app/theme/_bootstrap.scss
+++ b/src/Squidex/app/theme/_bootstrap.scss
@@ -373,7 +373,7 @@ a {
     &-group {
         .btn-toggle {
             & {
-                border: 1px solid $color-border;
+                border: 1px solid $color-theme-secondary;
                 background: $color-dark-foreground;
             }
 
diff --git a/src/Squidex/app/theme/_panels.scss b/src/Squidex/app/theme/_panels.scss
index 9631aed47..4371e9430 100644
--- a/src/Squidex/app/theme/_panels.scss
+++ b/src/Squidex/app/theme/_panels.scss
@@ -283,7 +283,7 @@
 
     &-section {
         border-top: 1px solid $color-border;
-        padding: 1rem;
+        padding: 15px;
     }
 
     &-item {