diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3131ad1bd11c7b3d514b57ac39befb4beeb1ad43..fe29c920ce94dc7e902289804c3031f5660e94f5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,6 +53,10 @@
         <item name="android:includeFontPadding">false</item>
         <item name="android:padding">0dp</item>
         <item name="android:textSize">@dimen/button_textsize</item>
+        <item name="android:autoSizeTextType">uniform</item>
+        <item name="android:autoSizeMinTextSize">10sp</item>
+        <item name="android:autoSizeMaxTextSize">@dimen/button_textsize</item>
+        <item name="android:lineHeight">0sp</item>
         <item name="android:onClick">onButtonClick</item>
         <item name="android:fontFeatureSettings">tnum, cv03, cv04</item>
         <item name="android:layout_marginHorizontal">@dimen/button_horizontal_margin</item>
@@ -71,11 +75,13 @@
     <style name="PadButtonStyle.SmallCaps">
         <item name="textAllCaps">true</item>
         <item name="android:textSize">@dimen/button_smallcaps_textsize</item>
+        <item name="android:autoSizeMaxTextSize">@dimen/button_smallcaps_textsize</item>
         <item name="android:layout_marginHorizontal">@dimen/button_small_horizontal_margin</item>
     </style>
 
     <style name="PadButtonStyle.SmallText">
         <item name="android:textSize">@dimen/button_small_textsize</item>
+        <item name="android:autoSizeMaxTextSize">@dimen/button_small_textsize</item>
         <item name="android:layout_marginHorizontal">@dimen/button_small_horizontal_margin</item>
     </style>