diff --git a/app/src/main/res/drawable-v21/button_primary_background_selector.xml b/app/src/main/res/drawable-v21/button_primary_background_selector.xml
new file mode 100644
index 000000000..917098b3a
--- /dev/null
+++ b/app/src/main/res/drawable-v21/button_primary_background_selector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#fff">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="24dp" />
+            <solid android:color="@color/fdroid_blue" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable-v21/button_secondary_background_selector.xml b/app/src/main/res/drawable-v21/button_secondary_background_selector.xml
new file mode 100644
index 000000000..9d107c80f
--- /dev/null
+++ b/app/src/main/res/drawable-v21/button_secondary_background_selector.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/fdroid_blue">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="24dp" />
+            <solid android:color="#fff" />
+            <stroke android:color="@color/fdroid_blue" android:width="2dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index 9045c010b..9cd78862e 100644
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -29,7 +29,7 @@
                 android:id="@+id/icon_and_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="8dp">
+                android:paddingBottom="12dp">
 
                 <ImageView
                     android:id="@+id/icon"
@@ -136,7 +136,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/icon_and_name"
-                android:paddingBottom="2dp"
+                android:paddingBottom="4dp"
                 android:clipToPadding="false"
                 android:visibility="visible"
                 android:gravity="end">
@@ -148,7 +148,6 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
                     android:ellipsize="marquee"
-                    app:textAllCaps="true"
                     tools:text="Uninstall"/>
 
                 <android.support.v7.widget.AppCompatButton
@@ -160,7 +159,6 @@
                     android:layout_marginStart="8dp"
                     android:layout_weight="0"
                     android:ellipsize="marquee"
-                    app:textAllCaps="true"
                     tools:text="Open"/>
             </LinearLayout>
         </RelativeLayout>
@@ -246,8 +244,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="4dp"
-            android:text="@string/more"
-            android:textAllCaps="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+            android:text="@string/more" />
     </LinearLayout>
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index 2e97fff14..881289be4 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -135,19 +135,18 @@
                     tools:text="Android 4.1 or later" />
             </LinearLayout>
 
-            <android.support.v7.widget.AppCompatButton android:id="@+id/button_install_upgrade"
-                style="@style/DetailsButtonStyle"
+            <Button
+                android:id="@+id/button_install_upgrade"
+                style="@style/DetailsSecondaryButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginEnd="4dp"
-                app:textAllCaps="true"
-                tools:text="@string/menu_install"
-                android:textColor="@color/fdroid_blue"
-                android:background="@drawable/app_version_button_bg_selector_install_upgrade" />
+                tools:text="@string/menu_install"/>
 
-            <android.support.v7.widget.AppCompatButton android:id="@+id/button_downgrade"
+            <Button
+                android:id="@+id/button_downgrade"
                 style="@style/DetailsButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -157,8 +156,7 @@
                 app:textAllCaps="true"
                 android:text="@string/menu_downgrade"
                 android:textColor="#b87032"
-                android:background="@drawable/app_version_button_bg_selector_downgrade"
-                tools:visibility="gone" />
+                android:background="@drawable/app_version_button_bg_selector_downgrade" />
 
             <ProgressBar android:id="@+id/busy_indicator"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 788db5f76..58b655ffa 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -42,7 +42,6 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
-        android:textAllCaps="true"
         android:text="@string/update_all"
         style="@style/DetailsPrimaryButtonStyle"
         app:layout_constraintEnd_toEndOf="parent"
@@ -51,13 +50,11 @@
 
     <Button
         android:id="@+id/button_toggle_apps_to_update"
+        style="@style/DetailsMoreButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
-        android:background="?attr/selectableItemBackground"
         tools:text="Show apps"
-        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" />
diff --git a/app/src/main/res/values-v21/styles_detail.xml b/app/src/main/res/values-v21/styles_detail.xml
new file mode 100644
index 000000000..113503a48
--- /dev/null
+++ b/app/src/main/res/values-v21/styles_detail.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase">
+        <item name="android:stateListAnimator">@null</item>  <!-- no elevation change on hover -->
+        <item name="android:letterSpacing">0.05</item>
+    </style>
+</resources>
\ 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 41d339cb7..b202e7f51 100644
--- a/app/src/main/res/values/styles_detail.xml
+++ b/app/src/main/res/values/styles_detail.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="DetailsButtonStyleBase">
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">14sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:minHeight">32dp</item>
         <item name="android:minWidth">0dp</item>
-        <item name="android:padding">12dp</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingLeft">18dp</item>
+        <item name="android:paddingRight">18dp</item>
+        <item name="android:textAllCaps">true</item>
     </style>
 
     <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase"/>
@@ -16,7 +20,11 @@
     </style>
 
     <style name="DetailsPrimaryButtonStyleSmall" parent="DetailsPrimaryButtonStyle">
-        <item name="android:padding">8dp</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
     </style>
 
     <style name="DetailsSecondaryButtonStyle" parent="DetailsButtonStyle">
@@ -25,14 +33,19 @@
     </style>
 
     <style name="DetailsSecondaryButtonStyleSmall" parent="DetailsSecondaryButtonStyle">
-        <item name="android:padding">8dp</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
     </style>
 
-    <style name="DetailsMoreButtonStyle">
+    <style name="DetailsMoreButtonStyle" parent="DetailsButtonStyle">
         <item name="android:padding">8dp</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">@color/fdroid_blue</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
     </style>
 
     <style name="DetailsAppTitleStyle" parent="TextAppearance.AppCompat.Title">