diff --git a/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/AdminConsolePanel.java b/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/AdminConsolePanel.java
index 1c706bf363e..227dcdfc474 100755
--- a/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/AdminConsolePanel.java
+++ b/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/AdminConsolePanel.java
@@ -12,9 +12,9 @@ import com.google.gwt.event.logical.shared.SelectionEvent;
 import com.google.gwt.event.logical.shared.SelectionHandler;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.user.client.ui.Anchor;
-import com.google.gwt.user.client.ui.DockLayoutPanel;
 import com.google.gwt.user.client.ui.DockPanel;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HeaderPanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.TabLayoutPanel;
 import com.google.gwt.user.client.ui.Widget;
@@ -22,6 +22,7 @@ import com.sap.sse.common.Util.Triple;
 import com.sap.sse.gwt.client.AbstractEntryPoint;
 import com.sap.sse.gwt.client.ErrorReporter;
 import com.sap.sse.gwt.client.ServerInfoRetriever;
+import com.sap.sse.gwt.client.controls.languageselect.LanguageSelector;
 import com.sap.sse.gwt.client.panels.AbstractTabLayoutPanel;
 import com.sap.sse.gwt.client.panels.HorizontalTabLayoutPanel;
 import com.sap.sse.gwt.client.panels.VerticalTabLayoutPanel;
@@ -67,7 +68,7 @@ import com.sap.sse.security.ui.shared.UserDTO;
  * @author Axel Uhl (D043530)
  *
  */
-public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelectable{
+public class AdminConsolePanel extends HeaderPanel implements HandleTabSelectable {
     private final UserService userService;
     
     /**
@@ -153,7 +154,6 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
     public AdminConsolePanel(UserService userService, PermissionsForRoleProvider permissionsForRoleProvider,
             ServerInfoRetriever buildVersionRetriever, String releaseNotesAnchorLabel,
             String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss, StringMessages stringMessages) {
-        super(Unit.EM);
         this.permissionsForRoleProvider = permissionsForRoleProvider;
         this.permissionsAnyOfWhichIsRequiredToSeeWidget = new HashMap<>();
         this.userService = userService;
@@ -203,17 +203,21 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
             }
         };
         final DockPanel informationPanel = new DockPanel();
-        informationPanel.setSize("100%", "95%");
+        informationPanel.setWidth("100%");
         informationPanel.setSpacing(10);
         informationPanel.add(errorReporter.getPersistentInformationWidget(), DockPanel.CENTER);
         SystemInformationPanel sysinfoPanel = new SystemInformationPanel(buildVersionRetriever, errorReporter, stringMessages);
         sysinfoPanel.ensureDebugId("SystemInformation");
         final Anchor releaseNotesLink = new Anchor(new SafeHtmlBuilder().appendEscaped(releaseNotesAnchorLabel).toSafeHtml(), releaseNotesURL);
         sysinfoPanel.add(releaseNotesLink);
+        final LanguageSelector languageSelector = new LanguageSelector();
+        languageSelector.getElement().getStyle().setMarginLeft(1, Unit.EM);
+        sysinfoPanel.add(languageSelector);
         informationPanel.add(sysinfoPanel, DockPanel.EAST);
-        informationPanel.setCellHorizontalAlignment(sysinfoPanel, HasHorizontalAlignment.ALIGN_RIGHT);
-        this.addSouth(informationPanel, 2.5);
-        this.add(topLevelTabPanel);
+         informationPanel.setCellHorizontalAlignment(sysinfoPanel, HasHorizontalAlignment.ALIGN_RIGHT);
+        this.setFooterWidget(informationPanel);
+        topLevelTabPanel.setSize("100%", "100%");
+        this.setContentWidget(topLevelTabPanel);
     }
 
     /**
diff --git a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
index 8080e3ab6eb..bb01fe1da50 100644
--- a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
@@ -29,6 +29,7 @@ Export-Package: com.google.gwt.user.client.rpc.core.java.util,
  com.sap.sse.gwt.client.controls.busyindicator,
  com.sap.sse.gwt.client.controls.carousel,
  com.sap.sse.gwt.client.controls.filestorage,
+ com.sap.sse.gwt.client.controls.languageselect,
  com.sap.sse.gwt.client.controls.listedit,
  com.sap.sse.gwt.client.controls.slider,
  com.sap.sse.gwt.client.dialog,
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/VerticalTabLayoutPanel.css b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/VerticalTabLayoutPanel.css
index 61eb9fbfb93..b65a4ca0954 100644
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/VerticalTabLayoutPanel.css
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/VerticalTabLayoutPanel.css
@@ -1,7 +1,4 @@
 @external gwt-VerticalTabLayoutPanel;
-.gwt-VerticalTabLayoutPanel {
-	margin-left: 5px;
-}
 .gwt-VerticalTabLayoutPanel>div {
     position: static !important;
 }