diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index 1616dfd00..9eca03e08 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -9,8 +9,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:clickable="true"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp"
         android:paddingTop="6dp"
         android:paddingBottom="6dp"
         android:clipChildren="false"
@@ -41,6 +39,8 @@
                     android:id="@+id/recording_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="12dp"
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
@@ -97,6 +97,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_gravity="center_vertical"
+                        android:paddingLeft="12dp"
+                        android:paddingStart="12dp"
+                        android:paddingRight="2dp"
+                        android:paddingEnd="2dp"
                         android:background="@drawable/touch_highlight_background"
                         android:contentDescription="@string/menu_toggle_keyboard" />
 
@@ -105,10 +109,8 @@
                         android:id="@+id/embedded_text_editor"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginLeft="6dp"
                         android:layout_marginRight="6dp"
-                        android:layout_marginEnd="6dp"
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:nextFocusForward="@+id/send_button"
@@ -189,7 +191,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginLeft="12dp"
-        android:layout_marginStart="12dp"
+        android:layout_marginRight="12dp"
         android:background="?attr/send_button_bg"
         android:layout_gravity="center_vertical">