diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..47f6d98b40
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.ai binary
diff --git a/artwork/ic_check.ai b/artwork/ic_check.ai
new file mode 100644
index 0000000000..318ca4a2ed
Binary files /dev/null and b/artwork/ic_check.ai differ
diff --git a/artwork/ic_check_black_18dp.psd b/artwork/ic_check_black_18dp.psd
new file mode 100644
index 0000000000..12d0cb5c5d
Binary files /dev/null and b/artwork/ic_check_black_18dp.psd differ
diff --git a/artwork/ic_check_white_18dp.psd b/artwork/ic_check_white_18dp.psd
new file mode 100644
index 0000000000..abb706742e
Binary files /dev/null and b/artwork/ic_check_white_18dp.psd differ
diff --git a/artwork/ic_lock_black_18dp.psd b/artwork/ic_lock_black_18dp.psd
new file mode 100644
index 0000000000..963c69c664
Binary files /dev/null and b/artwork/ic_lock_black_18dp.psd differ
diff --git a/artwork/ic_lock_white_18dp.psd b/artwork/ic_lock_white_18dp.psd
new file mode 100644
index 0000000000..0f0b851f52
Binary files /dev/null and b/artwork/ic_lock_white_18dp.psd differ
diff --git a/res/drawable-hdpi/ic_check_black_18dp.png b/res/drawable-hdpi/ic_check_black_18dp.png
new file mode 100644
index 0000000000..59903f385b
Binary files /dev/null and b/res/drawable-hdpi/ic_check_black_18dp.png differ
diff --git a/res/drawable-hdpi/ic_check_white_18dp.png b/res/drawable-hdpi/ic_check_white_18dp.png
new file mode 100644
index 0000000000..0cb933852b
Binary files /dev/null and b/res/drawable-hdpi/ic_check_white_18dp.png differ
diff --git a/res/drawable-hdpi/ic_lock_black_18dp.png b/res/drawable-hdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000000..b9aa802f25
Binary files /dev/null and b/res/drawable-hdpi/ic_lock_black_18dp.png differ
diff --git a/res/drawable-hdpi/ic_lock_white_18dp.png b/res/drawable-hdpi/ic_lock_white_18dp.png
new file mode 100644
index 0000000000..db11143dcd
Binary files /dev/null and b/res/drawable-hdpi/ic_lock_white_18dp.png differ
diff --git a/res/drawable-mdpi/ic_check_black_18dp.png b/res/drawable-mdpi/ic_check_black_18dp.png
new file mode 100644
index 0000000000..f35e13ea77
Binary files /dev/null and b/res/drawable-mdpi/ic_check_black_18dp.png differ
diff --git a/res/drawable-mdpi/ic_check_white_18dp.png b/res/drawable-mdpi/ic_check_white_18dp.png
new file mode 100644
index 0000000000..6f97eb2c5b
Binary files /dev/null and b/res/drawable-mdpi/ic_check_white_18dp.png differ
diff --git a/res/drawable-mdpi/ic_lock_black_18dp.png b/res/drawable-mdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000000..01092578de
Binary files /dev/null and b/res/drawable-mdpi/ic_lock_black_18dp.png differ
diff --git a/res/drawable-mdpi/ic_lock_white_18dp.png b/res/drawable-mdpi/ic_lock_white_18dp.png
new file mode 100644
index 0000000000..771bee950a
Binary files /dev/null and b/res/drawable-mdpi/ic_lock_white_18dp.png differ
diff --git a/res/drawable-xhdpi/ic_check_black_18dp.png b/res/drawable-xhdpi/ic_check_black_18dp.png
new file mode 100644
index 0000000000..9f6dfa45a8
Binary files /dev/null and b/res/drawable-xhdpi/ic_check_black_18dp.png differ
diff --git a/res/drawable-xhdpi/ic_check_white_18dp.png b/res/drawable-xhdpi/ic_check_white_18dp.png
new file mode 100644
index 0000000000..4d27bd82b3
Binary files /dev/null and b/res/drawable-xhdpi/ic_check_white_18dp.png differ
diff --git a/res/drawable-xhdpi/ic_lock_black_18dp.png b/res/drawable-xhdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000000..53dbb846da
Binary files /dev/null and b/res/drawable-xhdpi/ic_lock_black_18dp.png differ
diff --git a/res/drawable-xhdpi/ic_lock_white_18dp.png b/res/drawable-xhdpi/ic_lock_white_18dp.png
new file mode 100644
index 0000000000..19ebe171a3
Binary files /dev/null and b/res/drawable-xhdpi/ic_lock_white_18dp.png differ
diff --git a/res/drawable-xxhdpi/ic_check_black_18dp.png b/res/drawable-xxhdpi/ic_check_black_18dp.png
new file mode 100644
index 0000000000..9ed1ebfb19
Binary files /dev/null and b/res/drawable-xxhdpi/ic_check_black_18dp.png differ
diff --git a/res/drawable-xxhdpi/ic_check_white_18dp.png b/res/drawable-xxhdpi/ic_check_white_18dp.png
new file mode 100644
index 0000000000..45f7f39204
Binary files /dev/null and b/res/drawable-xxhdpi/ic_check_white_18dp.png differ
diff --git a/res/drawable-xxhdpi/ic_lock_black_18dp.png b/res/drawable-xxhdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000000..41bedc9f2c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_lock_black_18dp.png differ
diff --git a/res/drawable-xxhdpi/ic_lock_white_18dp.png b/res/drawable-xxhdpi/ic_lock_white_18dp.png
new file mode 100644
index 0000000000..cc42d63286
Binary files /dev/null and b/res/drawable-xxhdpi/ic_lock_white_18dp.png differ
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 15fb2a6835..89c16dfcb7 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -121,60 +121,64 @@
                           android:paddingTop="0dip"
                           android:layout_gravity="right">
 
-              <ImageView android:id="@+id/delivered_indicator"
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:paddingRight="3dip"
-                         android:src="?conversation_delivered_indicator"
-                         android:visibility="gone"
-                         android:contentDescription="@string/conversation_item_sent__delivered_description"/>
+                <TextView android:id="@+id/group_message_status"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:linksClickable="false"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:layout_gravity="right"
+                          android:textColor="?conversation_sent_text_secondary_color"
+                          android:visibility="gone"
+                          android:layout_marginRight="8dip"
+                          android:paddingTop="1dip"/>
 
-		      <TextView android:id="@+id/group_message_status"
-		                android:layout_width="wrap_content"
-		                android:layout_height="wrap_content"
-		                android:linksClickable="false"
-		                android:textAppearance="?android:attr/textAppearanceSmall"
-		                android:layout_gravity="right"
-		                android:textColor="?conversation_sent_text_secondary_color"
-		                android:visibility="gone"
-		                android:layout_marginRight="8dip"
-		                android:paddingTop="1dip"/>
+                <TextView android:id="@+id/conversation_item_date"
+                          android:autoLink="none"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:minWidth="15sp"
+                          android:linksClickable="false"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:layout_gravity="right"
+                          android:fontFamily="sans-serif-light"
+                          android:textColor="?conversation_sent_text_secondary_color"
+                          android:paddingTop="1dip"
+                          android:paddingBottom="5dp" />
 
-		      <TextView android:id="@+id/conversation_item_date"
-		                android:autoLink="none"
-		                android:layout_width="wrap_content"
-		                android:layout_height="wrap_content"
-		                android:minWidth="15sp"
-		                android:linksClickable="false"
-		                android:textAppearance="?android:attr/textAppearanceSmall"
-		                android:layout_gravity="right"
-                        android:fontFamily="sans-serif-light"
-		                android:textColor="?conversation_sent_text_secondary_color"
-		                android:paddingTop="1dip"
-                        android:paddingBottom="5dp" />
+                <LinearLayout android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:orientation="horizontal"
+                              android:layout_gravity="center_vertical|end"
+                              android:gravity="center_vertical"
+                              android:paddingBottom="3dp"
+                              android:paddingLeft="3dp"
+                              android:paddingStart="3dp">
 
-                <ImageView
-                    android:id="@+id/sms_secure_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|right"
-                    android:src="?menu_lock_icon_small"
-                    android:visibility="gone"
-                    android:paddingLeft="4dp"
-                    android:paddingBottom="3dp"
-                    android:contentDescription="@string/conversation_item__secure_message_description" />
+                    <ImageView android:id="@+id/delivered_indicator"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:src="?conversation_delivered_indicator"
+                               android:visibility="gone"
+                               android:paddingRight="1dp"
+                               android:contentDescription="@string/conversation_item_sent__delivered_description" />
 
+                    <ImageView android:id="@+id/sms_secure_indicator"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:src="?menu_lock_icon_small"
+                               android:visibility="gone"
+                               android:contentDescription="@string/conversation_item__secure_message_description" />
+
+                </LinearLayout>
             </LinearLayout>
-
         </LinearLayout>
 
         <View android:id="@+id/triangle_tick"
-            android:background="?conversation_item_sent_triangle_background"
-            android:layout_width="12dp"
-            android:layout_height="15dp"
-            android:layout_marginTop="12dp"
-            android:layout_alignParentRight="true"
-            />
+              android:layout_width="12dp"
+              android:layout_height="15dp"
+              android:layout_alignParentRight="true"
+              android:layout_marginTop="12dp"
+              android:background="?conversation_item_sent_triangle_background" />
 
         <TextView android:id="@+id/indicator_text"
             android:layout_width="wrap_content"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index fde251acbb..63d986ee84 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -28,7 +28,7 @@
 
         <item name="conversation_group_member_name">#99000000</item>
         <item name="conversation_sent_text_primary_color">#ffeeeeee</item>
-        <item name="conversation_sent_text_secondary_color">#44000000</item>
+        <item name="conversation_sent_text_secondary_color">#55000000</item>
         <item name="conversation_received_text_primary_color">#ff111111</item>
         <item name="conversation_received_text_secondary_color">#33000000</item>
 
@@ -43,7 +43,7 @@
         <item name="conversation_send_button_push">@drawable/ic_send_push</item>
         <item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item>
         <item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure</item>
-        <item name="conversation_delivered_indicator">@drawable/ic_sms_mms_delivered_light</item>
+        <item name="conversation_delivered_indicator">@drawable/ic_check_black_18dp</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_dark</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_ime_dark</item>
 
@@ -69,7 +69,7 @@
         <item name="menu_call_icon">@drawable/ic_menu_call_holo_light</item>
         <item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_light</item>
         <item name="menu_lock_icon">@drawable/ic_menu_lock_holo_light</item>
-        <item name="menu_lock_icon_small">@drawable/ic_menu_lock_small_holo_light</item>
+        <item name="menu_lock_icon_small">@drawable/ic_lock_black_18dp</item>
         <item name="menu_trash_icon">@drawable/ic_menu_trash_holo_light</item>
         <item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_light</item>
         <item name="menu_split_icon">@drawable/ic_menu_split_holo_light</item>
@@ -134,7 +134,7 @@
         <item name="conversation_send_button_push">@drawable/ic_send_push</item>
         <item name="conversation_send_button_sms_secure">@drawable/ic_send_sms_secure</item>
         <item name="conversation_send_button_sms_insecure">@drawable/ic_send_sms_insecure_dark</item>
-        <item name="conversation_delivered_indicator">@drawable/ic_sms_mms_delivered_dark</item>
+        <item name="conversation_delivered_indicator">@drawable/ic_check_white_18dp</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_light</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_ime_light</item>
 
@@ -145,7 +145,7 @@
         <item name="menu_call_icon">@drawable/ic_menu_call_holo_dark</item>
         <item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_dark</item>
         <item name="menu_lock_icon">@drawable/ic_menu_lock_holo_dark</item>
-        <item name="menu_lock_icon_small">@drawable/ic_menu_lock_small_holo_dark</item>
+        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
         <item name="menu_trash_icon">@drawable/ic_menu_trash_holo_dark</item>
         <item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item>
         <item name="menu_split_icon">@drawable/ic_menu_split_holo_dark</item>