diff --git a/res/layout/activity_updates.xml b/res/layout/activity_updates.xml
index 0f5739cd0001249c803353ed53a49717e13228a7..52e6aa7fe302ac0133d72bb34739c38c95d69dca 100644
--- a/res/layout/activity_updates.xml
+++ b/res/layout/activity_updates.xml
@@ -131,7 +131,7 @@
             android:paddingBottom="24dp"
             android:paddingStart="16dp"
             android:textSize="16sp"
-            android:background="?attr/colorPrimary"
+            android:background="@color/toolbar_collapsed"
             android:text="@string/e_available_updates"
             android:textColor="?android:textColorPrimary" />
         
diff --git a/res/layout/update_item_view.xml b/res/layout/update_item_view.xml
index 5c9dd4f80583046ad1383052c8a433207545a421..c35e6d53c2c09fab7f89aad30955e0cc7b488cc4 100644
--- a/res/layout/update_item_view.xml
+++ b/res/layout/update_item_view.xml
@@ -12,105 +12,56 @@
     app:contentPadding="16dp">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:weightSum="1"
-        android:baselineAligned="false">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/build_version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:alpha="0.87"
-                android:drawablePadding="8dp"
-                android:maxLines="1"
-                android:paddingBottom="8sp"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="16sp"
-                tools:text="LineageOS 15.1" />
-
-            <TextView
-                android:id="@+id/upgrade_type"
-                android:textColor="@color/theme_accent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:text="@string/e_version_upgrade_dialog_title"
-                android:textSize="14sp"
-                android:visibility="gone"
-                tools:text="@string/e_version_upgrade_dialog_title"
-                tools:visibility="visible" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:weightSum="1"
+            android:baselineAligned="false">
 
-            <TextView
-                android:id="@+id/build_date"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:textSize="14sp"
-                tools:text="29 February 2018" />
+                android:layout_weight="1"
+                android:orientation="vertical">
 
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/build_version"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/progress"
-                    android:visibility="invisible"
-                    tools:visibility="visible">
-
-                    <ProgressBar
-                        android:id="@+id/progress_bar"
-                        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="4sp"
-                        tools:progress="65" />
-
-                    <TextView
-                        android:id="@+id/progress_percent"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingStart="8dp"
-                        android:paddingEnd="8dp"
-                        tools:text="65%" />
-                </LinearLayout>
+                    android:alpha="0.87"
+                    android:drawablePadding="8dp"
+                    android:maxLines="1"
+                    android:paddingBottom="8sp"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textSize="16sp"
+                    tools:text="LineageOS 15.1" />
 
                 <TextView
-                    android:id="@+id/progress_text"
+                    android:id="@+id/upgrade_type"
+                    android:textColor="@color/theme_accent"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/progress"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:visibility="invisible"
-                    tools:text="162 of 300 MB (3 minutes left)"
+                    android:maxLines="1"
+                    android:text="@string/e_version_upgrade_dialog_title"
+                    android:textSize="14sp"
+                    android:visibility="gone"
+                    tools:text="@string/e_version_upgrade_dialog_title"
                     tools:visibility="visible" />
 
                 <TextView
-                    android:id="@+id/build_size"
+                    android:id="@+id/build_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingTop="8sp"
-                    android:singleLine="true"
-                    tools:text="300 MB"
-                    tools:visibility="invisible" />
-            </RelativeLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+                    android:maxLines="1"
+                    android:textSize="14sp"
+                    tools:text="29 February 2018" />
+            </LinearLayout>
             <ImageButton
                 android:id="@+id/update_menu"
                 style="?android:attr/actionOverflowButtonStyle"
@@ -119,13 +70,65 @@
                 android:layout_gravity="end"
                 android:padding="8dp"
                 android:contentDescription="@null" />
-            <Button
-                android:id="@id/update_action"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/progress"
+                android:visibility="invisible"
+                tools:visibility="visible">
+
+                <ProgressBar
+                    android:id="@+id/progress_bar"
+                    style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="4sp"
+                    tools:progress="65" />
+
+                <TextView
+                    android:id="@+id/progress_percent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    tools:text="65%" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/progress_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="8dp"
-                tools:text="Pause" />
-        </LinearLayout>
+                android:layout_below="@id/progress"
+                android:ellipsize="marquee"
+                android:singleLine="true"
+                android:visibility="invisible"
+                tools:text="162 of 300 MB (3 minutes left)"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/build_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="8sp"
+                android:singleLine="true"
+                tools:text="300 MB"
+                tools:visibility="invisible" />
+        </RelativeLayout>
+        <Button
+            android:id="@id/update_action"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="8dp"
+            tools:text="Pause" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>