diff --git a/src/cheogram/res/drawable/textsend.xml b/src/cheogram/res/drawable/textsend.xml
new file mode 100644
index 0000000000000000000000000000000000000000..701ded3a9b8981a1a83cba013a29f7868a8f89cd
--- /dev/null
+++ b/src/cheogram/res/drawable/textsend.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+	<corners
+		 	android:bottomLeftRadius="0dp"
+			android:bottomRightRadius="0dp"
+			android:topLeftRadius="30dp"
+			android:topRightRadius="30dp" />
+	<solid android:color="?color_background_primary" />
+</shape>
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 32a91b14b0c388c232b78ce77bdb875b04d9032b..afc11fc5ec45f64914cedab9cc6ed7b82c5c37b3 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -149,6 +149,7 @@ import eu.siacs.conversations.ui.util.ScrollState;
 import eu.siacs.conversations.ui.util.SendButtonAction;
 import eu.siacs.conversations.ui.util.SendButtonTool;
 import eu.siacs.conversations.ui.util.ShareUtil;
+import eu.siacs.conversations.ui.util.StyledAttributes;
 import eu.siacs.conversations.ui.util.ViewUtil;
 import eu.siacs.conversations.ui.widget.EditMessage;
 import eu.siacs.conversations.utils.AccountUtils;
@@ -1565,6 +1566,7 @@ public class ConversationFragment extends XmppFragment
         conversation.setReplyTo(message);
         if (message == null) {
             binding.contextPreview.setVisibility(View.GONE);
+            binding.textsend.setBackgroundResource(R.drawable.textsend);
             return;
         }
 
@@ -1573,6 +1575,7 @@ public class ConversationFragment extends XmppFragment
         messageListAdapter.handleTextQuotes(body, activity.isDarkTheme());
         binding.contextPreviewText.setText(body);
         binding.contextPreview.setVisibility(View.VISIBLE);
+        binding.textsend.setBackgroundColor(StyledAttributes.getColor(activity, R.attr.color_background_primary));
     }
 
     private void setThread(Element thread) {
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index d8871be5d8bbd0fa6199196f9b74d2575c212f37..a86f813e8ad235226df37b5b8d57a0f4578ab231 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -61,7 +61,7 @@
                     android:paddingLeft="8dp"
                     android:paddingRight="14dp"
                     android:orientation="horizontal"
-                    android:background="?attr/color_background_primary">
+                    android:background="@drawable/textsend">
 
                     <ImageView
                         android:src="?attr/icon_quote"
@@ -94,7 +94,8 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentBottom="true"
-                    android:background="?attr/color_background_primary">
+                    android:clipToPadding="true"
+                    android:background="@drawable/textsend">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -134,7 +135,7 @@
                             style="@style/Widget.Conversations.EditText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="?attr/color_background_primary"
+                            android:background="@android:color/transparent"
                             android:ems="10"
                             android:imeOptions="flagNoExtractUi|actionSend"
                             android:inputType="textShortMessage|textMultiLine|textCapSentences"
@@ -185,7 +186,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:background="?attr/color_background_primary"
+                        android:background="@android:color/transparent"
                         android:contentDescription="@string/send_message"
                         android:src="?attr/ic_send_text_offline" />
 
@@ -199,7 +200,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:background="?attr/color_background_primary"
+                        android:background="@android:color/transparent"
                         android:text="Request to Speak" />
                 </RelativeLayout>
                 <com.google.android.material.floatingactionbutton.FloatingActionButton