diff --git a/res/drawable-hdpi/ic_emoji_dark.png b/res/drawable-hdpi/ic_emoji_dark.png
deleted file mode 100644
index 6f4d125106..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_light.png b/res/drawable-hdpi/ic_emoji_light.png
deleted file mode 100644
index a27b2474f5..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_ime_dark.png b/res/drawable-hdpi/ic_ime_dark.png
deleted file mode 100644
index bb6a88a354..0000000000
Binary files a/res/drawable-hdpi/ic_ime_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_ime_light.png b/res/drawable-hdpi/ic_ime_light.png
deleted file mode 100644
index c55ee5574e..0000000000
Binary files a/res/drawable-hdpi/ic_ime_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_keyboard_grey600_24dp.png b/res/drawable-hdpi/ic_keyboard_grey600_24dp.png
new file mode 100644
index 0000000000..dc51f1ba8c
Binary files /dev/null and b/res/drawable-hdpi/ic_keyboard_grey600_24dp.png differ
diff --git a/res/drawable-hdpi/ic_keyboard_white_24dp.png b/res/drawable-hdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000000..d68a8edfb3
Binary files /dev/null and b/res/drawable-hdpi/ic_keyboard_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_mood_grey600_24dp.png b/res/drawable-hdpi/ic_mood_grey600_24dp.png
new file mode 100644
index 0000000000..1660ce956e
Binary files /dev/null and b/res/drawable-hdpi/ic_mood_grey600_24dp.png differ
diff --git a/res/drawable-hdpi/ic_mood_white_24dp.png b/res/drawable-hdpi/ic_mood_white_24dp.png
new file mode 100644
index 0000000000..5f5773ea70
Binary files /dev/null and b/res/drawable-hdpi/ic_mood_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_emoji_dark.png b/res/drawable-mdpi/ic_emoji_dark.png
deleted file mode 100644
index 61213b0583..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_light.png b/res/drawable-mdpi/ic_emoji_light.png
deleted file mode 100644
index d0d0c24910..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_ime_dark.png b/res/drawable-mdpi/ic_ime_dark.png
deleted file mode 100644
index 806d3a1ea5..0000000000
Binary files a/res/drawable-mdpi/ic_ime_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_ime_light.png b/res/drawable-mdpi/ic_ime_light.png
deleted file mode 100644
index 001f324557..0000000000
Binary files a/res/drawable-mdpi/ic_ime_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_keyboard_grey600_24dp.png b/res/drawable-mdpi/ic_keyboard_grey600_24dp.png
new file mode 100644
index 0000000000..660ad84c0d
Binary files /dev/null and b/res/drawable-mdpi/ic_keyboard_grey600_24dp.png differ
diff --git a/res/drawable-mdpi/ic_keyboard_white_24dp.png b/res/drawable-mdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000000..14d1b5d82c
Binary files /dev/null and b/res/drawable-mdpi/ic_keyboard_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_mood_grey600_24dp.png b/res/drawable-mdpi/ic_mood_grey600_24dp.png
new file mode 100644
index 0000000000..81eea97a7e
Binary files /dev/null and b/res/drawable-mdpi/ic_mood_grey600_24dp.png differ
diff --git a/res/drawable-mdpi/ic_mood_white_24dp.png b/res/drawable-mdpi/ic_mood_white_24dp.png
new file mode 100644
index 0000000000..34001392c5
Binary files /dev/null and b/res/drawable-mdpi/ic_mood_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_dark.png b/res/drawable-xhdpi/ic_emoji_dark.png
deleted file mode 100644
index 41197d4f60..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_light.png b/res/drawable-xhdpi/ic_emoji_light.png
deleted file mode 100644
index f873cc9855..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_ime_dark.png b/res/drawable-xhdpi/ic_ime_dark.png
deleted file mode 100644
index 8ab53d974d..0000000000
Binary files a/res/drawable-xhdpi/ic_ime_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_ime_light.png b/res/drawable-xhdpi/ic_ime_light.png
deleted file mode 100644
index 19745e4094..0000000000
Binary files a/res/drawable-xhdpi/ic_ime_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png b/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png
new file mode 100644
index 0000000000..5008dd26e0
Binary files /dev/null and b/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/res/drawable-xhdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000000..d2b42b3a73
Binary files /dev/null and b/res/drawable-xhdpi/ic_keyboard_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_mood_grey600_24dp.png b/res/drawable-xhdpi/ic_mood_grey600_24dp.png
new file mode 100644
index 0000000000..bfb47ecb9c
Binary files /dev/null and b/res/drawable-xhdpi/ic_mood_grey600_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_mood_white_24dp.png b/res/drawable-xhdpi/ic_mood_white_24dp.png
new file mode 100644
index 0000000000..75115cb79b
Binary files /dev/null and b/res/drawable-xhdpi/ic_mood_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png b/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png
new file mode 100644
index 0000000000..83f3e54e6c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_keyboard_white_24dp.png b/res/drawable-xxhdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000000..2ffbe3211b
Binary files /dev/null and b/res/drawable-xxhdpi/ic_keyboard_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_mood_grey600_24dp.png b/res/drawable-xxhdpi/ic_mood_grey600_24dp.png
new file mode 100644
index 0000000000..cce3d5797c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_mood_grey600_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_mood_white_24dp.png b/res/drawable-xxhdpi/ic_mood_white_24dp.png
new file mode 100644
index 0000000000..30b9025329
Binary files /dev/null and b/res/drawable-xxhdpi/ic_mood_white_24dp.png differ
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 2f561636bc..a8d5a685d0 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -86,9 +86,12 @@
                         android:autoText="true"
                         android:capitalize="sentences"
                         android:background="@drawable/compose_background"
+                        android:paddingTop="12dp"
+                        android:paddingBottom="12dp"
                         android:paddingRight="0dp"
+                        android:paddingLeft="0dp"
                         android:imeOptions="actionSend|flagNoEnterAction|flagNoExtractUi"
-                        android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
+                        android:inputType="textAutoCorrect|textCapSentences"
                         android:maxLength="2000"
                         android:maxLines="4"
                         android:nextFocusForward="@+id/send_button"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 84ba06936c..a759b74539 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -48,8 +48,8 @@
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
         <item name="conversation_transport_popup_background">@color/white</item>
-        <item name="conversation_emoji_toggle">@drawable/ic_emoji_dark</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_ime_dark</item>
+        <item name="conversation_emoji_toggle">@drawable/ic_mood_grey600_24dp</item>
+        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_grey600_24dp</item>
         <item name="conversation_attach_file">@drawable/ic_attach_file_light</item>
         <item name="conversation_attach_image">@drawable/ic_image_light</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_light</item>
@@ -185,8 +185,8 @@
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure_dark</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
         <item name="conversation_transport_popup_background">@color/black</item>
-        <item name="conversation_emoji_toggle">@drawable/ic_emoji_light</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_ime_light</item>
+        <item name="conversation_emoji_toggle">@drawable/ic_mood_white_24dp</item>
+        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_white_24dp</item>
         <item name="conversation_attach_file">@drawable/ic_attach_file_dark</item>
         <item name="conversation_attach_image">@drawable/ic_image_dark</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml
index 5cb1ba6c75..473d588e92 100644
--- a/res/xml/preferences_advanced.xml
+++ b/res/xml/preferences_advanced.xml
@@ -6,16 +6,10 @@
                         android:title="@string/preferences__textsecure_messages"
                         android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_textsecure_users"/>
 
-    <CheckBoxPreference android:defaultValue="false"
-                        android:key="pref_enter_key"
-                        android:title="@string/preferences__enable_enter_key_title"
-                        android:summary="@string/preferences__replace_smiley_with_enter_key"/>
-
     <CheckBoxPreference android:defaultValue="false"
                         android:key="pref_enter_sends"
                         android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
-                        android:title="@string/preferences__pref_enter_sends_title"
-                        android:dependency="pref_enter_key"/>
+                        android:title="@string/preferences__pref_enter_sends_title"/>
 
     <Preference android:key="pref_choose_identity"
                 android:title="@string/preferences__choose_identity"
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index c522ceb06b..6e96c98a5c 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -674,10 +674,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeIme() {
-    if (TextSecurePreferences.isEnterImeKeyEnabled(this)) {
-      composeText.setInputType(composeText.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
+    if (TextSecurePreferences.isEnterSendsEnabled(this)) {
+      composeText.setInputType (composeText.getInputType()  & ~InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+      composeText.setImeOptions(composeText.getImeOptions() & ~EditorInfo.IME_FLAG_NO_ENTER_ACTION);
     } else {
-      composeText.setInputType(composeText.getInputType() | (InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
+      composeText.setInputType (composeText.getInputType()  | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+      composeText.setImeOptions(composeText.getImeOptions() | EditorInfo.IME_FLAG_NO_ENTER_ACTION);
     }
   }
 
@@ -688,10 +690,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     emojiDrawer    = Optional.absent();
     emojiToggle    = (EmojiToggle) findViewById(R.id.emoji_toggle);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      emojiToggle.setVisibility(View.GONE);
-    }
-
     attachmentAdapter = new AttachmentTypeSelectorAdapter(this);
     attachmentManager = new AttachmentManager(this, this);
 
@@ -1130,7 +1128,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
       if (actionId == EditorInfo.IME_ACTION_SEND) {
         sendButton.performClick();
-        composeText.clearFocus();
         return true;
       }
       return false;