diff --git a/app/src/main/res/values-night/theme_dark_grey.xml b/app/src/main/res/values-night/theme_dark_grey.xml
index 598242f8c..17c7707db 100644
--- a/app/src/main/res/values-night/theme_dark_grey.xml
+++ b/app/src/main/res/values-night/theme_dark_grey.xml
@@ -5,10 +5,6 @@
     <item name="buttonBarPositiveButtonStyle">@style/AlertButtonStyle</item>
     <item name="buttonBarNegativeButtonStyle">@style/AlertButtonStyle</item>
     <item name="buttonBarNeutralButtonStyle">@style/AlertButtonStyle</item>
-    <item name="materialButtonText">@color/button_accent_text</item>
-    <item name="materialButtonBackground">@color/button_accent_background</item>
-    <item name="materialButtonRipple">@color/button_accent_ripple</item>
-    <item name="materialButtonStroke">@color/button_accent_stroke</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 59baa4bba..cebc15995 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -9,10 +9,6 @@
   <attr format="reference" name="overlay_theme"/>
   <attr format="boolean" name="dark_status_bar"/>
   <attr format="dimension" name="card_elevation"/>
-  <attr format="reference" name="materialButtonText"/>
-  <attr format="reference" name="materialButtonBackground"/>
-  <attr format="reference" name="materialButtonRipple"/>
-  <attr format="reference" name="materialButtonStroke"/>
   <attr format="integer" name="horizontal_divider"/>
   <attr format="color" name="colorOnPrimaryHint"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4fd257e76..69a66b517 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -169,16 +169,16 @@
   </style>
 
   <style name="OutlineButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
-    <item name="android:textColor">?attr/materialButtonText</item>
-    <item name="backgroundTint">?attr/materialButtonBackground</item>
-    <item name="rippleColor">?attr/materialButtonRipple</item>
-    <item name="strokeColor">?attr/materialButtonStroke</item>
+    <item name="android:textColor">@color/button_accent_text</item>
+    <item name="backgroundTint">@color/button_accent_background</item>
+    <item name="rippleColor">@color/button_accent_ripple</item>
+    <item name="strokeColor">@color/button_accent_stroke</item>
   </style>
 
   <style name="TextButton" parent="Widget.MaterialComponents.Button.TextButton">
-    <item name="android:textColor">?attr/materialButtonText</item>
-    <item name="backgroundTint">?attr/materialButtonBackground</item>
-    <item name="rippleColor">?attr/materialButtonRipple</item>
+    <item name="android:textColor">@color/button_accent_text</item>
+    <item name="backgroundTint">@color/button_accent_background</item>
+    <item name="rippleColor">@color/button_accent_ripple</item>
   </style>
 
   <style name="AlertButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog.Flush">
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index fff4f4d91..2b5674db0 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -23,10 +23,6 @@
     <item name="nnf_save_icon_color">?attr/colorAccent</item>
     <item name="nnf_dir_icon_color">?attr/colorAccent</item>
     <item name="card_elevation">2dp</item>
-    <item name="materialButtonText">@color/mtrl_text_btn_text_color_selector</item>
-    <item name="materialButtonBackground">@color/mtrl_btn_text_btn_bg_color_selector</item>
-    <item name="materialButtonRipple">@color/mtrl_btn_text_btn_ripple_color</item>
-    <item name="materialButtonStroke">@color/mtrl_btn_stroke_color_selector</item>
     <item name="horizontal_divider">2</item> <!-- View.GONE -->
     <item name="preferenceTheme">@style/PreferenceTheme</item>
   </style>
diff --git a/app/src/main/res/values/theme_white.xml b/app/src/main/res/values/theme_white.xml
index 8f3f8f596..fe7b47e8b 100644
--- a/app/src/main/res/values/theme_white.xml
+++ b/app/src/main/res/values/theme_white.xml
@@ -10,10 +10,6 @@
     <item name="buttonBarPositiveButtonStyle">@style/AlertButtonStyle</item>
     <item name="buttonBarNegativeButtonStyle">@style/AlertButtonStyle</item>
     <item name="buttonBarNeutralButtonStyle">@style/AlertButtonStyle</item>
-    <item name="materialButtonText">@color/button_accent_text</item>
-    <item name="materialButtonBackground">@color/button_accent_background</item>
-    <item name="materialButtonRipple">@color/button_accent_ripple</item>
-    <item name="materialButtonStroke">@color/button_accent_stroke</item>
   </style>
 
 </resources>
\ No newline at end of file