diff --git a/src/cheogram/res/drawable/pill.xml b/src/cheogram/res/drawable/pill.xml
index eb9c9cb3b377aef14764cc382366a36fe6a40229..d3dc2e1fb10fdcb2704d3dce2f78a6158027e467 100644
--- a/src/cheogram/res/drawable/pill.xml
+++ b/src/cheogram/res/drawable/pill.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
 	<corners android:radius="50dp" />
+	<solid android:color="?color_background_tertiary" />
 </shape>
diff --git a/src/cheogram/res/layout/command_button.xml b/src/cheogram/res/layout/command_button.xml
index 9f0df64c2386003607b1ecbd97d7b5bef749895e..b1a36b684fe909c266e58ff289138282712f78f0 100644
--- a/src/cheogram/res/layout/command_button.xml
+++ b/src/cheogram/res/layout/command_button.xml
@@ -4,5 +4,9 @@
     android:id="@+id/command"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    style="?android:attr/buttonStyleSmall" />
+    style="?android:attr/buttonStyleSmall"
+    android:background="@drawable/pill"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    />
 </layout>
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index 33ecec5c83036e52a1eef9fb69fc4fa816dc4192..d29a4960ec8dcbdbf954c5dea026e36a6ba3c619 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -4,6 +4,10 @@
     <Button
         android:id="@+id/download_button"
         style="?android:attr/buttonStyleSmall"
+        android:background="@drawable/pill"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:layout_marginBottom="5dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:longClickable="true"