diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 8c23990..d37176a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -20,6 +20,7 @@
             android:insetTop="0dp"
             style="@style/Widget.Material3.Button.TextButton"
             android:text="@string/logs"
+            android:background="@null"
             android:textColor="@color/colorNavPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -179,6 +180,7 @@
             android:layout_height="wrap_content"
             android:text="@string/check_url"
             android:visibility="visible"
+            android:background="@null"
             app:layout_constraintEnd_toEndOf="@+id/gotify_url"
             app:layout_constraintTop_toTopOf="@+id/checkurl"
             app:srcCompat="@drawable/ic_settings" />
diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml
index 7e64bad..4bf611b 100644
--- a/app/src/main/res/layout/message_item.xml
+++ b/app/src/main/res/layout/message_item.xml
@@ -56,9 +56,10 @@
 
     <ImageButton
         android:id="@+id/message_delete"
-        style="@style/Widget.AppCompat.Button.Borderless"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="30dp"
         android:layout_height="30dp"
+        android:background="@null"
         android:contentDescription="@string/delete_message"
         app:layout_constraintBottom_toBottomOf="@+id/message_date"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/message_item_compact.xml b/app/src/main/res/layout/message_item_compact.xml
index 448ad62..fbdca72 100644
--- a/app/src/main/res/layout/message_item_compact.xml
+++ b/app/src/main/res/layout/message_item_compact.xml
@@ -57,9 +57,10 @@
 
     <ImageButton
         android:id="@+id/message_delete"
-        style="@style/Widget.AppCompat.Button.Borderless"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="30dp"
         android:layout_height="30dp"
+        android:background="@null"
         android:contentDescription="@string/delete_message"
         app:layout_constraintBottom_toBottomOf="@+id/message_date"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/nav_header_drawer.xml b/app/src/main/res/layout/nav_header_drawer.xml
index bb70ce6..bc6db01 100644
--- a/app/src/main/res/layout/nav_header_drawer.xml
+++ b/app/src/main/res/layout/nav_header_drawer.xml
@@ -69,6 +69,7 @@
         android:adjustViewBounds="true"
         android:contentDescription="@string/refresh_all"
         android:scaleType="fitEnd"
+        android:background="@null"
         app:tint="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/imageView"