diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index 537d5f9818..2cbdd7a3bc 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -24,6 +24,8 @@
         <LinearLayout android:id="@+id/compose_bubble"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
+                      android:paddingTop="8dp"
+                      android:paddingBottom="8dp"
                       android:background="@drawable/sent_bubble"
                       android:clipChildren="false"
                       android:clipToPadding="false">
@@ -103,7 +105,8 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_gravity="center_vertical"
-                      android:orientation="horizontal">
+                      android:orientation="horizontal"
+                      tools:visibility="gone">
 
             <TextView android:id="@+id/record_time"
                       android:layout_width="wrap_content"
@@ -148,6 +151,7 @@
             android:id="@+id/button_toggle"
             android:layout_width="50dp"
             android:layout_height="50dp"
+            android:layout_marginBottom="1dp"
             android:background="@drawable/circle_tintable"
             android:layout_gravity="bottom">
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 66ac43b736..2a94312ea0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -745,9 +745,9 @@
     <string name="conversation_title_view__conversation_muted">Conversation muted</string>
 
     <!-- conversation_activity -->
-    <string name="conversation_activity__type_message_push">Send Signal message</string>
-    <string name="conversation_activity__type_message_sms_insecure">Send unsecured SMS</string>
-    <string name="conversation_activity__type_message_mms_insecure">Send unsecured MMS</string>
+    <string name="conversation_activity__type_message_push">Signal message</string>
+    <string name="conversation_activity__type_message_sms_insecure">Unsecured SMS</string>
+    <string name="conversation_activity__type_message_mms_insecure">Unsecured MMS</string>
     <string name="conversation_activity__from_sim_name">From %1$s</string>
     <string name="conversation_activity__send">Send</string>
     <string name="conversation_activity__remove">Remove</string>
diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java
index 1f678f5e38..e8fd4d0883 100644
--- a/src/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/src/org/thoughtcrime/securesms/components/ComposeText.java
@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 public class ComposeText extends EmojiEditText {
 
-  private SpannableString hint;
+  private CharSequence    hint;
   private SpannableString subHint;
 
   @Nullable private InputPanel.MediaListener mediaListener;
@@ -70,12 +70,11 @@ public class ComposeText extends EmojiEditText {
   }
 
   public void setHint(@NonNull String hint, @Nullable CharSequence subHint) {
-    this.hint = new SpannableString(hint);
-    this.hint.setSpan(new RelativeSizeSpan(0.8f), 0, hint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+    this.hint = hint;
 
     if (subHint != null) {
       this.subHint = new SpannableString(subHint);
-      this.subHint.setSpan(new RelativeSizeSpan(0.8f), 0, subHint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+      this.subHint.setSpan(new RelativeSizeSpan(0.5f), 0, subHint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
     } else {
       this.subHint = null;
     }