diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 1dd360c9f..f5ca4a844 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -38,8 +38,7 @@
           android:layout_height="2dp"
           android:layout_gravity="bottom"
           android:background="@drawable/compose_divider_background"
-          android:alpha="1"
-          android:visibility="invisible" />
+          android:alpha="1" />
 
     <ImageButton
             android:id="@+id/scroll_to_bottom_button"
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index 43df1f5dd..e14bfcc51 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -9,8 +9,8 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:clickable="true"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
         android:paddingTop="6dp"
         android:paddingBottom="6dp"
         android:clipChildren="false"
@@ -27,7 +27,6 @@
             android:id="@+id/compose_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/conversation_input_background"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:orientation="vertical">
@@ -62,8 +61,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="14dp"
-                        android:layout_marginStart="14dp"
                         android:background="@drawable/touch_highlight_background"
                         android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
 
@@ -72,12 +69,10 @@
                         android:id="@+id/embedded_text_editor"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="6dp"
-                        android:layout_marginStart="6dp"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginStart="8dp"
                         android:layout_marginRight="6dp"
                         android:layout_marginEnd="6dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginBottom="8dp"
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:nextFocusForward="@+id/send_button"
@@ -100,8 +95,10 @@
                             android:layout_height="match_parent"
                             android:layout_gravity="center_vertical"
                             android:src="?quick_camera_icon"
-                            android:paddingLeft="6dp"
-                            android:paddingRight="6dp"
+                            android:paddingLeft="11dp"
+                            android:paddingRight="11dp"
+                            android:paddingTop="6dp"
+                            android:paddingBottom="6dp"
                             android:background="@drawable/touch_highlight_background"
                             android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description" />
 
@@ -120,7 +117,10 @@
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginRight="2dp"
                                 android:layout_marginEnd="2dp"
-                                android:padding="6dp"
+                                android:paddingLeft="11dp"
+                                android:paddingRight="11dp"
+                                android:paddingTop="6dp"
+                                android:paddingBottom="6dp"
                                 android:src="?quick_mic_icon"
                                 android:background="@null"
                                 android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description" />
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index e43b3af49..17f4ee731 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -110,7 +110,6 @@ public class ConversationFragment extends Fragment
   private Locale                      locale;
   private RecyclerView                list;
   private RecyclerView.ItemDecoration lastSeenDecoration;
-  private View                        composeDivider;
   private View                        scrollToBottomButton;
   private TextView                    scrollDateHeader;
 
@@ -133,7 +132,6 @@ public class ConversationFragment extends Fragment
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle bundle) {
     final View view = inflater.inflate(R.layout.conversation_fragment, container, false);
     list                 = ViewUtil.findById(view, android.R.id.list);
-    composeDivider       = ViewUtil.findById(view, R.id.compose_divider);
     scrollToBottomButton = ViewUtil.findById(view, R.id.scroll_to_bottom_button);
     scrollDateHeader     = ViewUtil.findById(view, R.id.scroll_date_header);
 
@@ -603,10 +601,7 @@ public class ConversationFragment extends Fragment
       int     positionId                  = getHeaderPositionId();
 
       if (currentlyAtBottom && !wasAtBottom) {
-        ViewUtil.fadeOut(composeDivider, 50, View.INVISIBLE);
         ViewUtil.animateOut(scrollToBottomButton, scrollButtonOutAnimation, View.INVISIBLE);
-      } else if (!currentlyAtBottom && wasAtBottom) {
-        ViewUtil.fadeIn(composeDivider, 500);
       }
 
       if (currentlyAtZoomScrollHeight && !wasAtZoomScrollHeight) {