diff --git a/res/drawable-hdpi/ic_menu_lock_holo_light.png b/res/drawable-hdpi/ic_menu_lock_holo_light.png
new file mode 100644
index 000000000..9577af4f2
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_lock_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_lock_holo_light.png b/res/drawable-mdpi/ic_menu_lock_holo_light.png
new file mode 100644
index 000000000..9bd67488e
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_lock_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_lock_holo_light.png b/res/drawable-xhdpi/ic_menu_lock_holo_light.png
new file mode 100644
index 000000000..c4db3cb39
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_lock_holo_light.png differ
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 4d225e0ae..077375d7b 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -149,53 +149,14 @@
                             android:maxLength="1000"
                         />
 
-<!--                     <RelativeLayout -->
-<!--                         android:id="@+id/editor_with_counter" -->
-<!--                         android:layout_width="0dip" -->
-<!--                         android:layout_height="wrap_content" -->
-<!--                         android:layout_weight="1.0" -->
-<!--                         android:addStatesFromChildren="true" -->
-<!--                         android:background="@android:drawable/edit_text"> -->
-
-<!--                         <EditText -->
-<!--                             android:id="@+id/embedded_text_editor" -->
-<!--                             android:layout_width="fill_parent" -->
-<!--                             android:layout_height="wrap_content" -->
-<!--                             android:autoText="true" -->
-<!--                             android:capitalize="sentences" -->
-<!--                             android:nextFocusRight="@+id/send_button" -->
-<!--                             android:hint="Type to compose" -->
-<!--                             android:maxLines="4" -->
-<!--                             android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine" -->
-<!--                             android:imeOptions="actionSend|flagNoEnterAction" -->
-<!--                             android:background="@null" -->
-<!--                             android:maxLength="1000" -->
-<!--                         /> -->
-
-<!--                         <TextView -->
-<!--                             android:id="@+id/text_counter" -->
-<!--                             android:layout_width="wrap_content" -->
-<!--                             android:layout_height="wrap_content" -->
-<!--                             android:background="#88000000" -->
-<!--                             android:textColor="#ffffffff" -->
-<!--                             android:textSize="11sp" -->
-<!--                             android:textStyle="bold" -->
-<!--                             android:paddingLeft="3dip" -->
-<!--                             android:paddingRight="3dip" -->
-<!--                             android:layout_alignParentRight="true" -->
-<!--                             android:layout_alignParentTop="true" -->
-<!--                             android:visibility="gone" -->
-<!--                         /> -->
-<!--                     </RelativeLayout> -->
-
                     <Button android:id="@+id/send_button"
                         android:layout_marginLeft="5dip"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
-                        style="?android:attr/buttonStyle"
                         android:layout_gravity="center_vertical"
                         android:nextFocusLeft="@+id/embedded_text_editor"
                         android:text="Send"
+                        android:padding="8dip"
                     />
                 </LinearLayout>
                        <TextView android:id="@+id/space_left"
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index bd679fdbb..a3bd43ab7 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -123,7 +123,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_lock_message_sms"
+                android:src="@drawable/ic_menu_lock_holo_light"
                 android:visibility="gone" />
 
             <ImageView
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index fd293e506..28bb7dee0 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -32,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_lock_message_sms"
+                android:src="@drawable/ic_menu_lock_holo_light"
                 android:visibility="gone" />
 
             <ImageView
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 189fac64c..e43331c97 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -365,8 +365,8 @@ public class ConversationActivity extends SherlockFragmentActivity {
     if (isSingleExistingConversation() &&
         KeyUtil.isSessionFor(this, recipients.getPrimaryRecipient()))
     {
-      sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_small, 0);
-      sendButton.setCompoundDrawablePadding(10);
+      sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_menu_lock_holo_light, 0);
+      sendButton.setCompoundDrawablePadding(15);
       this.sendEncrypted       = true;
       this.characterCalculator = new EncryptedCharacterCalculator();
     } else {