diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 53b178f38..c7949f793 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -49,7 +49,8 @@ public class NavigationBaseActivity extends BaseActivity
     public void initDrawer() {
         navigationView.setNavigationItemSelectedListener(this);
         username = CommonsApplication.getInstance().getCurrentAccount().name;
-        usernameTextView = ((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText));
+        usernameTextView = ((TextView) navigationView.getHeaderView(0)
+                .findViewById(R.id.userNameText));
         usernameTextView.setText(username != null ? username : "");
 
         setSupportActionBar(toolbar);
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 2a1747c0f..4b2232d90 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="match_parent"
+    android:background="@android:color/darker_gray"
     android:layout_height="172dp">
 
     <ImageView
         android:id="@+id/pictureOfTheDay"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/darker_gray"
-        android:padding="20dp"
+        android:layout_height="0dp"
+        android:layout_weight="0.8"
+        android:paddingTop="5dp"
         android:src="@drawable/commons_logo_large" />
 
     <TextView
         android:id="@+id/userNameText"
         style="?android:textAppearanceLargeInverse"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:ellipsize="none"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.2"
         android:maxLines="1"
+        android:textAlignment="center"
         android:text="@string/placeholder_place_name"
         android:textColor="@android:color/white" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file