diff --git a/app/src/main/res/layout-land/about_fragment.xml b/app/src/main/res/layout-land/about_fragment.xml
index 4d78aab86..496c75218 100644
--- a/app/src/main/res/layout-land/about_fragment.xml
+++ b/app/src/main/res/layout-land/about_fragment.xml
@@ -181,7 +181,7 @@
                     android:paddingTop="20dp"
                     android:orientation="horizontal">
 
-                    <Button
+                    <TextView
                         android:onClick="@{() -> viewModel.uploadLogs()}"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -192,7 +192,7 @@
                         android:padding="10dp"
                         android:text="@string/about_send_log" />
 
-                    <Button
+                    <TextView
                         android:onClick="@{() -> viewModel.resetLogs()}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
index b28b9a0f9..a038e3ae7 100644
--- a/app/src/main/res/layout/about_fragment.xml
+++ b/app/src/main/res/layout/about_fragment.xml
@@ -183,7 +183,7 @@
                         android:paddingTop="20dp"
                         android:orientation="horizontal">
 
-                        <Button
+                        <TextView
                             android:onClick="@{() -> viewModel.uploadLogs()}"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -194,7 +194,7 @@
                             android:padding="10dp"
                             android:text="@string/about_send_log" />
 
-                        <Button
+                        <TextView
                             android:onClick="@{() -> viewModel.resetLogs()}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/chat_message_content_cell.xml b/app/src/main/res/layout/chat_message_content_cell.xml
index 1cbee357c..9e38f8958 100644
--- a/app/src/main/res/layout/chat_message_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_content_cell.xml
@@ -62,15 +62,15 @@
             android:gravity="center"
             android:textAlignment="center" />
 
-        <Button
+        <TextView
             style="@style/button_font"
             android:onClick="@{() -> data.download()}"
             android:onLongClick="@{longClickListener}"
             android:enabled="@{data.downloadEnabled}"
             android:text="@string/chat_message_download_file"
             android:visibility="@{data.downloadable ? View.VISIBLE : View.GONE}"
-            android:layout_width="137dp"
-            android:layout_height="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:textColor="@drawable/assistant_button_text_color"
             android:background="@drawable/resizable_assistant_button"
diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
index 9960c8f5e..96419e843 100644
--- a/app/src/main/res/layout/dialog.xml
+++ b/app/src/main/res/layout/dialog.xml
@@ -131,24 +131,26 @@
             android:gravity="center"
             android:orientation="horizontal">
 
-            <Button
+            <TextView
                 android:onClick="@{() -> viewModel.onCancelClicked()}"
                 style="@style/dialog_cancel_button_font"
                 android:layout_width="137dp"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
                 android:layout_margin="10dp"
+                android:gravity="center"
                 android:background="@drawable/resizable_assistant_button"
                 android:ellipsize="end"
                 android:padding="10dp"
                 android:text="@string/dialog_cancel"
                 android:visibility="@{viewModel.showCancel ? View.VISIBLE : View.GONE}" />
 
-            <Button
+            <TextView
                 android:onClick="@{() -> viewModel.onDeleteClicked()}"
                 style="@style/dialog_action_button_font"
                 android:layout_width="137dp"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
                 android:layout_margin="10dp"
+                android:gravity="center"
                 android:background="@drawable/resizable_assistant_button"
                 android:backgroundTint="@color/red_color"
                 android:ellipsize="end"
@@ -156,12 +158,13 @@
                 android:text="@{viewModel.deleteLabel ?? @string/dialog_delete, default=@string/dialog_delete}"
                 android:visibility="@{viewModel.showDelete ? View.VISIBLE : View.GONE}" />
 
-            <Button
+            <TextView
                 android:onClick="@{() -> viewModel.onOkClicked()}"
                 style="@style/dialog_action_button_font"
                 android:layout_width="137dp"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
                 android:layout_margin="10dp"
+                android:gravity="center"
                 android:background="@drawable/resizable_assistant_button"
                 android:backgroundTint="@color/green_color"
                 android:ellipsize="end"