diff --git a/app/src/main/res/drawable/button_primary_background_selector.xml b/app/src/main/res/drawable/button_primary_background_selector.xml
index ee21a1543..09a259bf2 100644
--- a/app/src/main/res/drawable/button_primary_background_selector.xml
+++ b/app/src/main/res/drawable/button_primary_background_selector.xml
@@ -2,25 +2,25 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
+            <corners android:radius="24dp" />
             <solid android:color="@color/fdroid_blue_dark" />
         </shape>
     </item>
     <item android:state_checked="true">
         <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
+            <corners android:radius="24dp" />
             <solid android:color="@color/fdroid_blue_dark" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
+            <corners android:radius="24dp" />
             <solid android:color="@color/fdroid_blue_dark" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
+            <corners android:radius="24dp" />
             <solid android:color="@color/fdroid_blue" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/button_secondary_background_selector.xml b/app/src/main/res/drawable/button_secondary_background_selector.xml
index 2cb0d8ebb..49b527351 100644
--- a/app/src/main/res/drawable/button_secondary_background_selector.xml
+++ b/app/src/main/res/drawable/button_secondary_background_selector.xml
@@ -2,25 +2,25 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
+            <corners android:radius="24dp" />
             <solid android:color="@color/fdroid_blue" />
         </shape>
     </item>
     <item android:state_checked="true">
         <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
+            <corners android:radius="24dp" />
             <solid android:color="@color/fdroid_blue" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
+            <corners android:radius="24dp" />
             <solid android:color="@color/fdroid_blue" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
+            <corners android:radius="24dp" />
             <solid android:color="@android:color/white" />
             <stroke android:color="@color/fdroid_blue" android:width="2dp" />
         </shape>
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index 5cba0bfe9..823d69ec7 100755
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -114,6 +114,7 @@
                 android:layout_toRightOf="@id/icon"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
+                android:clipToPadding="false"
                 android:visibility="gone"
                 >
 
@@ -125,7 +126,8 @@
                     android:layout_weight="1"
                     android:maxLines="1"
                     android:ellipsize="marquee"
-                    android:text="THIS IS BUTTON 1" />
+                    android:padding="12dp"
+                    tools:text="THIS IS BUTTON 1" />
 
                 <Button
                     android:id="@+id/primaryButtonView"
@@ -137,7 +139,8 @@
                     android:layout_weight="1"
                     android:maxLines="1"
                     android:ellipsize="marquee"
-                    android:text="THIS IS 2" />
+                    android:padding="12dp"
+                    tools:text="THIS IS 2" />
             </LinearLayout>
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/updateable_app_status_item.xml b/app/src/main/res/layout/updateable_app_status_item.xml
index 3d06c0beb..2272c480b 100644
--- a/app/src/main/res/layout/updateable_app_status_item.xml
+++ b/app/src/main/res/layout/updateable_app_status_item.xml
@@ -32,14 +32,13 @@
         android:ellipsize="end"
         app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintEnd_toStartOf="@+id/action_button"
-        app:layout_constraintTop_toTopOf="@+id/icon"
-        app:layout_constraintBottom_toBottomOf="@+id/icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginEnd="8dp"
-        tools:layout_editor_absoluteX="72dp" />
+        android:layout_marginTop="8dp"
+        app:layout_constraintVertical_bias="0.333" />
 
     <ProgressBar
         android:id="@+id/progress_bar"
@@ -73,15 +72,16 @@
 
     <Button
         android:id="@+id/action_button"
+        style="@style/DetailsPrimaryButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/icon"
-        app:layout_constraintBottom_toBottomOf="@+id/icon"
-        style="@style/DetailsPrimaryButtonStyle"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="Update" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_detail.xml b/app/src/main/res/values/styles_detail.xml
index 6030e0548..19fa91439 100644
--- a/app/src/main/res/values/styles_detail.xml
+++ b/app/src/main/res/values/styles_detail.xml
@@ -14,11 +14,17 @@
     <style name="DetailsPrimaryButtonStyle" parent="DetailsButtonStyle">
         <item name="android:textColor">#ffffff</item>
         <item name="android:background">@drawable/button_primary_background_selector</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:minHeight">32dp</item>
+        <item name="android:minWidth">0dp</item>
     </style>
 
     <style name="DetailsSecondaryButtonStyle" parent="DetailsButtonStyle">
         <item name="android:textColor">@color/fdroid_blue</item>
         <item name="android:background">@drawable/button_secondary_background_selector</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:minHeight">32dp</item>
+        <item name="android:minWidth">0dp</item>
     </style>
 
     <style name="DetailsMoreButtonStyle">