diff --git a/package.json b/package.json
index f2b6caf..c73c240 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "author": "Florian Hartwich <hardi@noarch.de>",
   "private": true,
   "scripts": {
diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html
index 18a5d41..19a09f7 100644
--- a/static/src/app/app.component.html
+++ b/static/src/app/app.component.html
@@ -98,15 +98,15 @@
           <li *ngIf="!loginService.isLoggedIn()" routerLinkActive="active">
             <a routerLink='{{config.loginPath}}' class="link">{{'navigation.top.login' | translate}}</a>
           </li>
-          <li class="dropdown" *ngIf="FEATURE_LOCALIZATION_ENABLED">
+          <li class="dropdown" *ngIf="features.localization">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
                aria-expanded="false" style="padding: 12px 12px 10px 12px;">
-              <mat-icon svgIcon="{{(language === 'de') ? 'flag-de' : 'flag-gb'}}"></mat-icon>
+              <mat-icon svgIcon="flag-{{language}}"></mat-icon>
               <span class="caret"></span>
             </a>
             <ul class="dropdown-menu">
               <li *ngFor="let lang of languages" style="cursor: pointer">
-                <a (click)="setLanguage(lang)"><mat-icon svgIcon="{{(lang === 'de') ? 'flag-de' : 'flag-gb'}}"></mat-icon></a>
+                <a (click)="setLanguage(lang)"><mat-icon svgIcon="flag-{{lang}}"></mat-icon></a>
               </li>
             </ul>
           </li>
diff --git a/static/src/app/app.component.ts b/static/src/app/app.component.ts
index 9aa9dc7..005051c 100644
--- a/static/src/app/app.component.ts
+++ b/static/src/app/app.component.ts
@@ -10,6 +10,7 @@ import {MatIconRegistry} from '@angular/material';
 import {SpinnerService} from './services/user-interface/spinner/spinner.service';
 import {TranslateService} from '@ngx-translate/core';
 import {SettingsService} from './services/settings.service';
+import {environment} from '../environments/environment';
 
 declare function require(url: string);
 
@@ -20,7 +21,7 @@ declare function require(url: string);
 })
 export class AppComponent implements OnInit {
 
-  readonly FEATURE_LOCALIZATION_ENABLED = false;
+  readonly features = environment.features;
 
   config = RouteConfig;
 
@@ -59,7 +60,7 @@ export class AppComponent implements OnInit {
     'vehicleLight': 'stats/scoreboard/vehicleLight',
     // --------LOCALE---------
     'flag-de': 'locale/de',
-    'flag-gb': 'locale/gb',
+    'flag-en': 'locale/en',
   };
 
   language;
diff --git a/static/src/assets/icon/locale/gb.svg b/static/src/assets/icon/locale/en.svg
similarity index 100%
rename from static/src/assets/icon/locale/gb.svg
rename to static/src/assets/icon/locale/en.svg
diff --git a/static/src/environments/environment.prod.ts b/static/src/environments/environment.prod.ts
index 8e7fa22..54f0e79 100644
--- a/static/src/environments/environment.prod.ts
+++ b/static/src/environments/environment.prod.ts
@@ -1,4 +1,7 @@
 export const environment = {
   production: true,
-  e2eMode: false
+  e2eMode: false,
+  features: {
+    localization: false
+  }
 };
diff --git a/static/src/environments/environment.ts b/static/src/environments/environment.ts
index d9693c6..8a6759d 100644
--- a/static/src/environments/environment.ts
+++ b/static/src/environments/environment.ts
@@ -5,5 +5,8 @@
 
 export const environment = {
   production: false,
-  e2eMode: false
+  e2eMode: false,
+  features: {
+    localization: true
+  }
 };