diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
index 5e5b6a971..beebd062d 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
@@ -69,16 +69,16 @@ public class UpdateableAppsHeader extends AppUpdateData {
         private UpdateableAppsHeader header;
 
         private final TextView updatesAvailable;
-        private final ImageView downloadAll;
         private final TextView appsToUpdate;
+        private final Button downloadAll;
         private final Button toggleAppsToUpdate;
 
         public ViewHolder(View itemView) {
             super(itemView);
 
             updatesAvailable = (TextView) itemView.findViewById(R.id.text_updates_available);
-            downloadAll = (ImageView) itemView.findViewById(R.id.button_download_all);
             appsToUpdate = (TextView) itemView.findViewById(R.id.text_apps_to_update);
+            downloadAll = (Button) itemView.findViewById(R.id.button_download_all);
             toggleAppsToUpdate = (Button) itemView.findViewById(R.id.button_toggle_apps_to_update);
 
             toggleAppsToUpdate.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/layout/updateable_app_list_item.xml b/app/src/main/res/layout/updateable_app_list_item.xml
index 4e7c1c59e..618ede394 100644
--- a/app/src/main/res/layout/updateable_app_list_item.xml
+++ b/app/src/main/res/layout/updateable_app_list_item.xml
@@ -5,25 +5,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="24dp"
-    android:paddingLeft="24dp"
     tools:ignore="RtlSymmetry">
 
     <!-- Ignore ContentDescription because it is kind of meaningless to have TTS read out "App icon"
          when it will inevitably read out the name of the app straight after (via the @+id/app_name). -->
     <ImageView
         android:id="@+id/icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="32dp"
         android:layout_height="32dp"
         tools:src="@drawable/ic_launcher"
         android:scaleType="fitCenter"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        tools:ignore="ContentDescription" />
+        android:layout_margin="16dp"
+        tools:ignore="ContentDescription"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/app_name"
@@ -34,10 +29,7 @@
         android:textColor="?attr/installedApps"
         android:lines="1"
         android:ellipsize="end"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_margin="8dp"
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintEnd_toStartOf="@+id/install"
         app:layout_constraintTop_toTopOf="@+id/icon"
@@ -46,15 +38,11 @@
     <ImageView
         android:id="@+id/install"
         tools:src="@drawable/ic_download"
-        android:scaleType="fitXY"
+        android:scaleType="fitCenter"
         android:contentDescription="@string/updates__tts__download_app"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:elevation="2dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_margin="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/icon"
         app:layout_constraintBottom_toBottomOf="@+id/icon" />
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 4cff7123f..88edde404 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -1,35 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:background="?appDetailsCardBackground">
 
     <TextView
         android:id="@+id/text_updates_available"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/button_download_all"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        tools:text="Download updates for 3 apps" />
-
-    <ImageView
-        android:id="@+id/button_download_all"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_download_progress_0"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:contentDescription="@string/updates__tts__download_updates_for_all_apps"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/text_updates_available" />
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        tools:text="Download updates for 3 apps"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/button_download_all"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/text_apps_to_update"
@@ -40,24 +30,36 @@
         android:ellipsize="end"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/button_download_all"
         app:layout_constraintTop_toBottomOf="@+id/text_updates_available" />
 
+    <Button
+        android:id="@+id/button_download_all"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:text="Update all"
+        android:textAllCaps="true"
+        android:contentDescription="@string/updates__tts__download_updates_for_all_apps"
+        style="@style/DetailsPrimaryButtonStyle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/text_updates_available"
+        app:layout_constraintBottom_toBottomOf="@+id/text_apps_to_update" />
+
     <Button
         android:id="@+id/button_toggle_apps_to_update"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_apps_to_update"
         android:background="?attr/selectableItemBackground"
-        android:textColor="@color/fdroid_blue"
-        android:padding="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
+        android:padding="10dp"
         tools:text="Show apps"
-        android:textAllCaps="true" />
-
+        android:textColor="@color/fdroid_blue"
+        android:textAllCaps="true"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_apps_to_update" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file