diff --git a/app/src/main/res/layouts/peertube/layout/drawer_account_peertube.xml b/app/src/main/res/layouts/peertube/layout/drawer_account_peertube.xml
index 1ad54bb2..cd8d8656 100644
--- a/app/src/main/res/layouts/peertube/layout/drawer_account_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/drawer_account_peertube.xml
@@ -61,8 +61,8 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/account_action"
         style="@style/Widget.Material3.Button.OutlinedButton.Icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="10dp"
         android:contentDescription="@string/action_follow"
diff --git a/app/src/main/res/layouts/peertube/layout/drawer_channel_peertube.xml b/app/src/main/res/layouts/peertube/layout/drawer_channel_peertube.xml
index 6e1282b0..a3f91604 100644
--- a/app/src/main/res/layouts/peertube/layout/drawer_channel_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/drawer_channel_peertube.xml
@@ -15,6 +15,7 @@
     see <http://www.gnu.org/licenses>.
 -->
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -59,10 +60,10 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/more_actions"
         style="@style/Widget.Material3.Button.OutlinedButton.Icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_gravity="center"
         android:contentDescription="@string/display_more"
-        android:src="@drawable/ic_baseline_more_vert_24" />
+        app:icon="@drawable/ic_baseline_more_vert_24" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/peertube/layout/drawer_comment_peertube.xml b/app/src/main/res/layouts/peertube/layout/drawer_comment_peertube.xml
index daff3e49..ec759a09 100644
--- a/app/src/main/res/layouts/peertube/layout/drawer_comment_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/drawer_comment_peertube.xml
@@ -87,14 +87,13 @@
             app:layout_constraintEnd_toStartOf="@id/more_actions"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/more_actions"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/Widget.Material3.Button.OutlinedButton.Icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_gravity="center_horizontal"
-            android:gravity="end"
-            android:text=""
-            app:drawableTopCompat="@drawable/ic_baseline_more_vert_24"
+            app:icon="@drawable/ic_baseline_more_vert_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/comment_date" />
 
diff --git a/app/src/main/res/layouts/peertube/layout/drawer_menu_item.xml b/app/src/main/res/layouts/peertube/layout/drawer_menu_item.xml
index 8fc2df1d..3e2c2e03 100644
--- a/app/src/main/res/layouts/peertube/layout/drawer_menu_item.xml
+++ b/app/src/main/res/layouts/peertube/layout/drawer_menu_item.xml
@@ -9,7 +9,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <RadioButton
+    <com.google.android.material.radiobutton.MaterialRadioButton
         android:id="@+id/radio"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layouts/peertube/layout/drawer_menu_peertube.xml b/app/src/main/res/layouts/peertube/layout/drawer_menu_peertube.xml
index 2151cc40..54ff75a8 100644
--- a/app/src/main/res/layouts/peertube/layout/drawer_menu_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/drawer_menu_peertube.xml
@@ -9,7 +9,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/menu_icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
@@ -19,7 +19,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layouts/peertube/layout/drawer_playlist_peertube.xml b/app/src/main/res/layouts/peertube/layout/drawer_playlist_peertube.xml
index ee014b65..ad63cd46 100644
--- a/app/src/main/res/layouts/peertube/layout/drawer_playlist_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/drawer_playlist_peertube.xml
@@ -74,14 +74,14 @@
             app:layout_constraintStart_toStartOf="@+id/preview_title"
             app:layout_constraintTop_toBottomOf="@+id/preview_visibility" />
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/playlist_more"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center"
+            style="@style/Widget.Material3.Button.OutlinedButton.Icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="10dp"
             android:contentDescription="@string/display_more"
-            android:src="@drawable/ic_baseline_more_vert_24"
+            app:icon="@drawable/ic_baseline_more_vert_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/peertube/layout/drawer_status_compact_peertube.xml b/app/src/main/res/layouts/peertube/layout/drawer_status_compact_peertube.xml
index 63546282..ec803094 100644
--- a/app/src/main/res/layouts/peertube/layout/drawer_status_compact_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/drawer_status_compact_peertube.xml
@@ -122,7 +122,7 @@
         android:drawablePadding="2dp"
         android:gravity="center_vertical"
         android:text="@string/delete"
-        android:textColor="?colorAccent"
+        android:textColor="?colorPrimary"
         android:visibility="gone" />
 
 
diff --git a/app/src/main/res/layouts/peertube/layout/save_button_peertube.xml b/app/src/main/res/layouts/peertube/layout/save_button_peertube.xml
index cbf0833f..2e669ec8 100644
--- a/app/src/main/res/layouts/peertube/layout/save_button_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/save_button_peertube.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/set_preview"
-    style="@style/Widget.AppCompat.Button.Colored"
+    style="@style/Widget.Material3.Button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"