diff --git a/res/drawable-hdpi/ic_attach_grey600_24dp.png b/res/drawable-hdpi/ic_attach_grey600_24dp.png
new file mode 100644
index 0000000000..13c7f0c28d
Binary files /dev/null and b/res/drawable-hdpi/ic_attach_grey600_24dp.png differ
diff --git a/res/drawable-hdpi/ic_attach_white_24dp.png b/res/drawable-hdpi/ic_attach_white_24dp.png
new file mode 100644
index 0000000000..a176ce207d
Binary files /dev/null and b/res/drawable-hdpi/ic_attach_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_attach_grey600_24dp.png b/res/drawable-mdpi/ic_attach_grey600_24dp.png
new file mode 100644
index 0000000000..0ea546b1f9
Binary files /dev/null and b/res/drawable-mdpi/ic_attach_grey600_24dp.png differ
diff --git a/res/drawable-mdpi/ic_attach_white_24dp.png b/res/drawable-mdpi/ic_attach_white_24dp.png
new file mode 100644
index 0000000000..bfe8b2891d
Binary files /dev/null and b/res/drawable-mdpi/ic_attach_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_attach_grey600_24dp.png b/res/drawable-xhdpi/ic_attach_grey600_24dp.png
new file mode 100644
index 0000000000..28aef9e9b1
Binary files /dev/null and b/res/drawable-xhdpi/ic_attach_grey600_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_attach_white_24dp.png b/res/drawable-xhdpi/ic_attach_white_24dp.png
new file mode 100644
index 0000000000..ff96fffc29
Binary files /dev/null and b/res/drawable-xhdpi/ic_attach_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_attach_grey600_24dp.png b/res/drawable-xxhdpi/ic_attach_grey600_24dp.png
new file mode 100644
index 0000000000..7b0785e116
Binary files /dev/null and b/res/drawable-xxhdpi/ic_attach_grey600_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_attach_white_24dp.png b/res/drawable-xxhdpi/ic_attach_white_24dp.png
new file mode 100644
index 0000000000..fbc2d2d905
Binary files /dev/null and b/res/drawable-xxhdpi/ic_attach_white_24dp.png differ
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 897560ed06..0d469465f4 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -99,29 +99,26 @@
 
                 <org.thoughtcrime.securesms.components.AnimatingToggle
                         android:id="@+id/button_toggle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-
+                        android:layout_width="46dp"
+                        android:layout_height="44dp">
                     <ImageButton
                             android:id="@+id/attach_button"
-                            android:layout_gravity="center_vertical"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
                             android:background="@drawable/touch_highlight_background"
-                            android:padding="12dp"
-                            android:src="?conversation_attach_file"
+                            android:src="?conversation_attach"
                             android:contentDescription="@string/ConversationActivity_add_attachment"
-                            android:nextFocusLeft="@+id/embedded_text_editor"
-                            android:layout_width="wrap_content"
-                            android:layout_height="fill_parent"/>
+                            android:nextFocusLeft="@+id/embedded_text_editor" />
 
                     <org.thoughtcrime.securesms.components.SendButton
                             android:id="@+id/send_button"
-                            android:layout_width="wrap_content"
-                            android:layout_height="fill_parent"
-                            android:layout_gravity="center_vertical"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
                             android:background="@drawable/touch_highlight_background"
                             android:contentDescription="@string/conversation_activity__send"
                             android:nextFocusLeft="@+id/embedded_text_editor"
-                            android:padding="12dp"
                             android:src="?conversation_transport_sms_indicator"
                             android:focusable="true"
                             android:clickable="false"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0d81e30bc2..fba2a92c8d 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -38,6 +38,7 @@
     <attr name="conversation_attach_sound" format="reference"/>
     <attr name="conversation_attach_contact_info" format="reference"/>
     <attr name="conversation_attach_photo" format="reference"/>
+    <attr name="conversation_attach" format="reference"/>
 
     <attr name="conversation_item_background" format="reference"/>
     <attr name="conversation_item_received_background" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index aa6eb50b24..70672c03e9 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -54,6 +54,7 @@
         <item name="conversation_attach_sound">@drawable/ic_volume_up_light</item>
         <item name="conversation_attach_contact_info">@drawable/ic_account_box_light</item>
         <item name="conversation_attach_photo">@drawable/ic_photo_camera_light</item>
+        <item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
 
         <item name="conversation_item_background">@drawable/conversation_item_background</item>
         <item name="conversation_item_received_background">@color/conversation_item_received_background_light</item>
@@ -190,6 +191,7 @@
         <item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
         <item name="conversation_attach_contact_info">@drawable/ic_account_box_dark</item>
         <item name="conversation_attach_photo">@drawable/ic_photo_camera_dark</item>
+        <item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
 
         <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
diff --git a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
index e88808ef8d..55b82e8046 100644
--- a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
+++ b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -54,6 +55,7 @@ public class AnimatingToggle extends FrameLayout {
   private void animateOut(int viewIndex, TranslateAnimation animation) {
     final View view = getChildAt(viewIndex);
 
+    animation.setInterpolator(new FastOutSlowInInterpolator());
     animation.setAnimationListener(new Animation.AnimationListener() {
       @Override
       public void onAnimationStart(Animation animation) {
@@ -73,6 +75,7 @@ public class AnimatingToggle extends FrameLayout {
   }
 
   private void animateIn(int viewIndex, TranslateAnimation animation) {
+    animation.setInterpolator(new FastOutSlowInInterpolator());
     final View view = getChildAt(viewIndex);
     view.setVisibility(View.VISIBLE);
     view.startAnimation(animation);