diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 952f75d79..b67a37f2b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2069,7 +2069,7 @@ public class ConversationFragment extends XmppFragment
         conversation.setReplyTo(message);
         if (message == null) {
             binding.contextPreview.setVisibility(View.GONE);
-            binding.textsend.setBackgroundResource(R.drawable.textsend);
+            //binding.textsend.setBackgroundResource(R.drawable.textsend);
             return;
         }
 
@@ -3794,7 +3794,7 @@ public class ConversationFragment extends XmppFragment
             final var colors = MaterialColors.getColorRoles(activity, accountColor);
             final var accent = activity.isDark() ? ColorUtils.blendARGB(colors.getAccentContainer(), bg, 1.0f - Math.max(0.25f, Color.alpha(accountColor) / 255.0f)) : colors.getAccentContainer();
             cursord.setTintList(ColorStateList.valueOf(colors.getOnAccentContainer()));
-            binding.inputLayout.setBackgroundTintList(ColorStateList.valueOf(accent));
+            //binding.inputLayout.setBackgroundTintList(ColorStateList.valueOf(accent));
 
             binding.textinputSubject.setTextColor(colors.getOnAccentContainer());
             binding.textinput.setTextColor(colors.getOnAccentContainer());
@@ -3803,7 +3803,7 @@ public class ConversationFragment extends XmppFragment
             binding.textInputHint.setTextColor(colors.getOnAccentContainer());
         } else {
             cursord.setTintList(ColorStateList.valueOf(MaterialColors.getColor(binding.textinput, com.google.android.material.R.attr.colorOnTertiaryContainer)));
-            binding.inputLayout.setBackgroundTintList(ColorStateList.valueOf(MaterialColors.getColor(binding.inputLayout, com.google.android.material.R.attr.colorTertiaryContainer)));
+            //binding.inputLayout.setBackgroundTintList(ColorStateList.valueOf(MaterialColors.getColor(binding.inputLayout, com.google.android.material.R.attr.colorTertiaryContainer)));
 
             binding.textinputSubject.setTextColor(MaterialColors.getColor(binding.textinputSubject, com.google.android.material.R.attr.colorOnTertiaryContainer));
             binding.textinput.setTextColor(MaterialColors.getColor(binding.textinput, com.google.android.material.R.attr.colorOnTertiaryContainer));
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 47a108f95..e4ea7f604 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -92,7 +92,12 @@
                         android:layout_alignParentStart="true"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentBottom="true"
-                        android:background="@drawable/textsend"
+                        android:layout_marginBottom="4dp"
+                        android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginLeft="8dp"
+                        android:background="@drawable/background_message_bubble"
                         android:alpha="0.88"
                         android:orientation="vertical"
                         android:animateLayoutChanges="true" >
@@ -248,8 +253,7 @@
                             android:layout_centerVertical="true"
                             android:layout_toStartOf="@+id/textSendButton"
                             android:layout_toEndOf="@+id/thread_identicon_layout"
-                            android:paddingHorizontal="16dp"
-                            android:paddingVertical="8dp"
+                            android:paddingVertical="6dp"
                             android:animateLayoutChanges="true" >
 
                             <androidx.recyclerview.widget.RecyclerView