diff --git a/res/drawable-v21/touch_highlight_background.xml b/res/drawable-v21/touch_highlight_background.xml
new file mode 100644
index 0000000000..80e27edf3d
--- /dev/null
+++ b/res/drawable-v21/touch_highlight_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/touch_highlight">
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+</ripple>
\ No newline at end of file
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 0d469465f4..9a4afe1ba5 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -70,8 +70,8 @@
                 <org.thoughtcrime.securesms.components.emoji.EmojiToggle
                         android:id="@+id/emoji_toggle"
                         android:layout_width="wrap_content"
-                        android:layout_height="fill_parent"
-                        android:layout_gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
                         android:background="@drawable/touch_highlight_background"
                         android:contentDescription="@string/conversation_activity__emoji_toggle_description"
                         android:padding="10dp"/>
@@ -100,11 +100,12 @@
                 <org.thoughtcrime.securesms.components.AnimatingToggle
                         android:id="@+id/button_toggle"
                         android:layout_width="46dp"
-                        android:layout_height="44dp">
+                        android:layout_height="44dp"
+                        android:layout_gravity="bottom">
                     <ImageButton
                             android:id="@+id/attach_button"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:background="@drawable/touch_highlight_background"
                             android:src="?conversation_attach"
@@ -114,8 +115,7 @@
                     <org.thoughtcrime.securesms.components.SendButton
                             android:id="@+id/send_button"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center"
+                            android:layout_height="wrap_content"
                             android:background="@drawable/touch_highlight_background"
                             android:contentDescription="@string/conversation_activity__send"
                             android:nextFocusLeft="@+id/embedded_text_editor"