diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index f2a776659..4abf20c44 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -1,24 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/drawer_header_height"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="?colorPrimary"
     android:nextFocusDown="@+id/drawer_header_action_button">
 
     <ImageView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:scaleType="centerCrop"
         android:src="@drawable/background_header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/drawer_header_padding_top"
+        android:fitsSystemWindows="true"
+        android:gravity="bottom"
+        android:minHeight="@dimen/drawer_header_content_min_height"
         android:orientation="vertical"
-        android:paddingTop="@dimen/drawer_header_padding_top">
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -53,7 +59,8 @@
                 android:textStyle="bold"
                 app:autoSizeMaxTextSize="@dimen/drawer_header_newpipe_title_max_text_size"
                 app:autoSizeMinTextSize="@dimen/drawer_header_newpipe_title_min_text_size"
-                app:autoSizeTextType="uniform" />
+                app:autoSizeTextType="uniform"
+                tools:ignore="UnusedAttribute" />
         </LinearLayout>
 
         <LinearLayout
@@ -68,7 +75,7 @@
 
             <LinearLayout
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="32dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:orientation="horizontal">
@@ -108,7 +115,8 @@
     <Button
         android:id="@+id/drawer_header_action_button"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:background="?selectableItemBackground"
-        android:focusable="true" />
-</FrameLayout>
\ No newline at end of file
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
deleted file mode 100644
index 2217a895c..000000000
--- a/app/src/main/res/values-v21/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Menu Drawer Dimensions -->
-    <dimen name="drawer_header_height">150dp</dimen>
-    <dimen name="drawer_header_padding_top">36dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b11bb620d..599a37566 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Menu Drawer Dimensions -->
-    <dimen name="drawer_header_height">130dp</dimen>
+    <dimen name="drawer_header_content_min_height">120dp</dimen>
     <dimen name="drawer_header_padding_top">16dp</dimen>
     <dimen name="drawer_header_newpipe_icon_size">48dp</dimen>
     <dimen name="drawer_header_newpipe_icon_title_space">12dp</dimen>