diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index c6f598ebba..5c9d512f27 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -41,7 +41,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/overlay_loading_skip_button"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3Expressive.Button.OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="45dp"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index e025e72bd2..c3c9c9d906 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -601,9 +601,9 @@
                                             app:trackColor="@color/skipOpTransparent"
                                             tools:progress="50" />
                                     </FrameLayout>
-                                    <TextView
+                                    <com.google.android.material.button.MaterialButton
                                         android:id="@+id/result_resume_series_title"
-                                        style="@style/Widget.MaterialComponents.Button.TextButton"
+                                        style="@style/Widget.Material3Expressive.Button.TextButton"
                                         android:layout_width="wrap_content"
                                         android:layout_height="match_parent"
                                         android:gravity="center_vertical"
@@ -620,9 +620,9 @@
                                         android:ellipsize="end"
                                         android:clickable="false"
                                         android:focusable="false" />
-                                    <TextView
+                                    <com.google.android.material.button.MaterialButton
                                         android:id="@+id/result_resume_series_progress_text"
-                                        style="@style/Widget.MaterialComponents.Button.TextButton"
+                                        style="@style/Widget.Material3Expressive.Button.TextButton"
                                         android:layout_width="wrap_content"
                                         android:layout_height="match_parent"
                                         android:gravity="center"
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 6d83d5f1d1..d529084f19 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -942,7 +942,7 @@
     </FrameLayout>
     <com.google.android.material.button.MaterialButton
         android:id="@+id/player_speedup_button"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3Expressive.Button.OutlinedButton"
         android:layout_width="45dp"
         android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index 9024c010ca..42cd2b9c2d 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -974,7 +974,7 @@
     </FrameLayout>
     <com.google.android.material.button.MaterialButton
         android:id="@+id/player_speedup_button"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3Expressive.Button.OutlinedButton"
         android:layout_width="45dp"
         android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index f3dcf09d2c..c57a42671b 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -914,7 +914,7 @@
     </LinearLayout>
     <com.google.android.material.button.MaterialButton
         android:id="@+id/player_speedup_button"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3Expressive.Button.OutlinedButton"
         android:layout_width="45dp"
         android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index eb5a57c03d..4e10e23a8a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. Material3 -->
-    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
+    <!-- Base application theme. Material3Expressive -->
+    <style name="AppTheme" parent="Theme.Material3Expressive.Dark.NoActionBar">
         <item name="android:windowBackground">@drawable/splash_background</item>
         <item name="android:colorEdgeEffect">?attr/textColor</item>
 
@@ -447,7 +447,7 @@
         <item name="android:paddingStart">-10dp</item>
     </style>
 
-    <style name="AppSearchViewStyle" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="AppSearchViewStyle" parent="Theme.Material3Expressive.Dark.NoActionBar">
         <item name="android:searchIcon">@drawable/search_icon</item>
         <item name="android:queryHint">@string/search_hint</item>
         <item name="android:background">@color/transparent</item>
@@ -476,7 +476,7 @@
 
     <style name="PreferenceTheme" parent="@style/AppTheme" />
 
-    <style name="Theme.AlertDialog" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+    <style name="Theme.AlertDialog" parent="ThemeOverlay.Material3Expressive.Dialog.Alert">
         <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
         <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
         <item name="android:windowBackground">@drawable/dialog__window_background</item>
@@ -518,12 +518,12 @@
            <item name="android:paddingEnd">5dp</item>-->
     </style>
 
-    <style name="AppMaterialButtonStyle" parent="Widget.MaterialComponents.Button">
+    <style name="AppMaterialButtonStyle" parent="Widget.Material3Expressive.Button">
         <item name="android:fontFamily">@font/google_sans</item>
     </style>
 
-    <style name="Theme.Widget.Tabs" parent="Widget.MaterialComponents.TabLayout.Colored">
-        <!--<item name="tabGravity">center</item>
+    <style name="Theme.Widget.Tabs" parent="Widget.Material3.TabLayout">
+        <item name="tabGravity">center</item>
         <item name="backgroundTint">@color/transparent</item>
         <item name="tabIndicator">@drawable/tab_selector</item>
         <item name="tabIndicatorColor">?attr/colorPrimary</item>
@@ -532,7 +532,7 @@
         <item name="tabIndicatorHeight">3dp</item>
         <item name="tabInlineLabel">true</item>
         <item name="tabMinWidth">75dp</item>
-        <item name="tabMode">scrollable</item>-->
+        <item name="tabMode">scrollable</item>
     </style>
 
     <style name="DarkFragment" parent="AppTheme">
@@ -713,7 +713,7 @@
         <item name="android:insetBottom">@dimen/dialog_buttons_inset</item>
     </style>
 
-    <style name="BlackLabel" parent="@style/Widget.MaterialComponents.Tooltip">
+    <style name="BlackLabel" parent="@style/Widget.Material3.Tooltip">
         <item name="backgroundTint">?attr/iconGrayBackground</item>
         <item name="android:textColor">?attr/textColor</item>
     </style>
@@ -888,7 +888,7 @@
         <item name="strokeColor">@color/toggle_button_outline</item>
     </style>
 
-    <style name="Tag" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Tag" parent="Widget.Material3Expressive.Button.OutlinedButton">
         <item name="strokeColor">@color/tag_stroke_color</item>
     </style>