diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index 3ea1314b7..0b6c0220d 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -12,7 +12,6 @@ import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.widget.TextViewCompat;
-import android.support.v7.text.AllCapsTransformationMethod;
 import android.support.v7.widget.GridLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -358,11 +357,6 @@ public class AppDetailsRecyclerViewAdapter
                     updateAntiFeaturesWarning();
                 }
             });
-            // Set ALL caps (in a way compatible with SDK 10)
-            AllCapsTransformationMethod allCapsTransformation = new AllCapsTransformationMethod(view.getContext());
-            buttonPrimaryView.setTransformationMethod(allCapsTransformation);
-            buttonSecondaryView.setTransformationMethod(allCapsTransformation);
-            descriptionMoreView.setTransformationMethod(allCapsTransformation);
         }
 
         public void setProgress(int bytesDownloaded, int totalBytes, int resIdString) {
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index a6205c616..3a20a4165 100755
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -151,17 +151,18 @@
                 android:visibility="visible"
                 >
 
-                <Button
+                <android.support.v7.widget.AppCompatButton
                     android:id="@+id/secondaryButtonView"
                     style="@style/DetailsSecondaryButtonStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:ellipsize="marquee"
+                    app:textAllCaps="true"
                     android:padding="12dp"
                     tools:text="Uninstall" />
 
-                <Button
+                <android.support.v7.widget.AppCompatButton
                     android:id="@+id/primaryButtonView"
                     style="@style/DetailsPrimaryButtonStyle"
                     android:layout_width="match_parent"
@@ -170,6 +171,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_weight="1"
                     android:ellipsize="marquee"
+                    app:textAllCaps="true"
                     tools:text="Run" />
             </LinearLayout>
 
@@ -233,7 +235,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             tools:text="\t• This app tracks and reports your activity." />
 
-        <TextView
+        <android.support.v7.widget.AppCompatTextView
             android:id="@+id/description_more"
             style="@style/DetailsMoreButtonStyle"
             android:layout_width="match_parent"
@@ -244,6 +246,7 @@
             android:layout_marginRight="8dp"
             android:gravity="end"
             android:text="@string/more"
+            android:textAllCaps="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             tools:text="more" />