diff --git a/src/cheogram/res/layout/button_grid_item.xml b/src/cheogram/res/layout/button_grid_item.xml
index b4b5e8c44cacc3c2223fbbab5f8704c511e4e33e..e0cee650034b3bee321313ce3a9b541148c2ed20 100644
--- a/src/cheogram/res/layout/button_grid_item.xml
+++ b/src/cheogram/res/layout/button_grid_item.xml
@@ -2,7 +2,8 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Material3.Button.TonalButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/src/cheogram/res/layout/command_button_grid_field.xml b/src/cheogram/res/layout/command_button_grid_field.xml
index 23f6f27809287327f48aa3267e06ba7aceedca75..b1f7b5bc63eb2ced96cf15c4ea37f67dc0ea196c 100644
--- a/src/cheogram/res/layout/command_button_grid_field.xml
+++ b/src/cheogram/res/layout/command_button_grid_field.xml
@@ -26,7 +26,8 @@
             android:gravity="center"
             android:textAppearance="?textAppearanceBodyMedium" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/Widget.Material3.Button.TonalButton"
             android:id="@+id/default_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -50,7 +51,8 @@
             android:gravity="center"
             android:numColumns="auto_fit" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/Widget.Material3.Button.TextButton"
             android:id="@+id/open_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"