diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index 08ebc6421..810005d2d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
@@ -41,12 +41,8 @@ public class DownloadAuthenticationActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTheme(UserPreferences.getTheme());
+        setTheme(UserPreferences.getNoTitleTheme());
         super.onCreate(savedInstanceState);
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.hide();
-        }
 
         setContentView(R.layout.download_authentication_activity);
         TextView txtvDescription = findViewById(R.id.txtvDescription);
diff --git a/app/src/main/res/layout/download_authentication_activity.xml b/app/src/main/res/layout/download_authentication_activity.xml
index 3414a5e00..58c2c10e6 100644
--- a/app/src/main/res/layout/download_authentication_activity.xml
+++ b/app/src/main/res/layout/download_authentication_activity.xml
@@ -1,102 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="16dp">
 
     <TextView
-        android:id="@+id/txtvTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/authentication_notification_title"
-        android:layout_alignParentTop="true"
-        android:textSize="@dimen/text_size_large"
-        android:layout_margin="16dp"
-        android:textColor="@color/holo_blue_light"
-        android:textStyle="italic"/>
-
-    <TextView
-        android:id="@+id/txtvDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/authentication_notification_msg"
-        android:layout_below="@id/txtvTitle"
-        android:textSize="@dimen/text_size_medium"
-        android:textColor="?android:attr/textColorSecondary"
-        android:layout_margin="16dp"/>
-
-    <EditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:id="@+id/etxtUsername"
-        android:hint="@string/username_label"
-        android:layout_below="@id/txtvDescription"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:cursorVisible="true"/>
-
-    <EditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:id="@+id/etxtPassword"
-        android:hint="@string/password_label"
-        android:inputType="textPassword"
-        android:layout_below="@id/etxtUsername"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:cursorVisible="true"/>
-
-    <RelativeLayout
-        android:id="@+id/footer"
-        android:layout_width="fill_parent"
-        android:layout_height="48dp"
-        android:focusableInTouchMode="true"
-        android:layout_alignParentBottom="true">
-
-        <View
+            android:id="@+id/txtvTitle"
             android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:layout_alignParentTop="true"
-            android:background="?android:attr/dividerVertical"/>
+            android:layout_height="wrap_content"
+            android:text="@string/authentication_notification_title"
+            android:textSize="@dimen/text_size_large"
+            android:textColor="?android:attr/textColorPrimary"/>
 
-        <View
-            android:id="@+id/horizontal_divider"
-            android:layout_width="1dip"
-            android:layout_height="fill_parent"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:background="?android:attr/dividerVertical"/>
+    <TextView
+            android:id="@+id/txtvDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/authentication_notification_msg"
+            android:textColor="?android:attr/textColorSecondary"/>
+
+    <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/etxtUsername"
+            android:hint="@string/username_label"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:cursorVisible="true"/>
+
+    <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/etxtPassword"
+            android:hint="@string/password_label"
+            android:inputType="textPassword"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:cursorVisible="true"/>
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="48dp"
+            android:orientation="horizontal"
+            android:gravity="end">
 
         <Button
-            android:id="@+id/butCancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@id/horizontal_divider"
-            android:layout_toStartOf="@id/horizontal_divider"
-            android:background="?android:attr/selectableItemBackground"
-            android:text="@string/cancel_label"/>
+                android:id="@+id/butCancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/selectableItemBackground"
+                android:textColor="?attr/colorAccent"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@string/cancel_label"/>
 
         <Button
-            android:id="@+id/butConfirm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentTop="true"
-            android:layout_toRightOf="@id/horizontal_divider"
-            android:layout_toEndOf="@id/horizontal_divider"
-            android:background="?android:attr/selectableItemBackground"
-            android:text="@string/confirm_label"/>
-    </RelativeLayout>
+                android:id="@+id/butConfirm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/selectableItemBackground"
+                android:textColor="?attr/colorAccent"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:text="@string/confirm_label"/>
+    </LinearLayout>
 
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file