diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.scss b/src/Squidex/app/features/content/pages/contents/contents-page.component.scss
index 1a7aaac36..20c393c1f 100644
--- a/src/Squidex/app/features/content/pages/contents/contents-page.component.scss
+++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.scss
@@ -13,6 +13,10 @@
     margin-left: 1rem;
 }
 
+.icon-plus {
+    font-size: .8rem;
+}
+
 .form-control {
     width: 15rem;
 }
diff --git a/src/Squidex/app/shared/components/language-selector.component.html b/src/Squidex/app/shared/components/language-selector.component.html
index fcbfcac29..a69be023c 100644
--- a/src/Squidex/app/shared/components/language-selector.component.html
+++ b/src/Squidex/app/shared/components/language-selector.component.html
@@ -1,5 +1,5 @@
 <div class="btn-group btn-group-{{size}}" *ngIf="isSmallMode">
-    <button type="button" class="btn btn-secondary" *ngFor="let language of languages" [attr.title]="language.englishName" [class.active]="language == languageSelected" (click)="selectLanguage(language)">
+    <button type="button" class="btn btn-secondary" *ngFor="let language of languages" [attr.title]="language.englishName" [class.active]="language == selectedLanguage" (click)="selectLanguage(language)">
         <span class="iso-code">{{language.iso2Code}}</span>
     </button>
 </div>
diff --git a/src/Squidex/app/shared/components/language-selector.component.scss b/src/Squidex/app/shared/components/language-selector.component.scss
index b986a847a..eb7a3a1a8 100644
--- a/src/Squidex/app/shared/components/language-selector.component.scss
+++ b/src/Squidex/app/shared/components/language-selector.component.scss
@@ -1,10 +1,6 @@
 @import '_vars';
 @import '_mixins';
 
-.active {
-    color: $color-accent-dark;
-}
-
 .dropdown-item {
     cursor: pointer;
 }
diff --git a/src/Squidex/app/theme/_bootstrap-vars.scss b/src/Squidex/app/theme/_bootstrap-vars.scss
index 0514efea6..0945a94fc 100644
--- a/src/Squidex/app/theme/_bootstrap-vars.scss
+++ b/src/Squidex/app/theme/_bootstrap-vars.scss
@@ -5,11 +5,11 @@ $brand-primary: $color-theme-blue;
 $brand-success: $color-theme-green;
 $brand-danger: $color-theme-error;
 
-$btn-secondary-bg: #dce5e8;
-$btn-secondary-border: #dce5e8;
+$btn-secondary-bg: $color-theme-secondary;
+$btn-secondary-border: $color-theme-secondary;
 
-$input-bg-disabled: #eef1f4;
-$input-border-color: #dbe4eb;
+$input-bg-disabled: $color-disabled;
+$input-border-color: $color-input;
 
 $dropdown-border-color: $color-border;
 
diff --git a/src/Squidex/app/theme/_vars.scss b/src/Squidex/app/theme/_vars.scss
index 83047de9b..0af78a760 100644
--- a/src/Squidex/app/theme/_vars.scss
+++ b/src/Squidex/app/theme/_vars.scss
@@ -8,11 +8,14 @@ $color-text: #373a3c;
 $color-subtext: #818181;
 $color-empty: #949494;
 $color-control: rgba(0, 0, 0, .15);
+$color-input: #dbe4eb;
+$color-disabled: #eef1f4;
 
 $color-theme-blue: #438cef;
 $color-theme-blue-dark: #3d7dd5;
 $color-theme-blue-light: #9ebeea;
 $color-theme-blue-lightest: #d9e8fc;
+$color-theme-secondary: #dce5e8;
 
 $color-theme-green: #4cc159;
 $color-theme-green-dark: #47b353;