diff --git a/res/drawable-hdpi/ic_unlocked_white_18dp.png b/res/drawable-hdpi/ic_unlocked_white_18dp.png
new file mode 100644
index 0000000000..b1168e31dd
Binary files /dev/null and b/res/drawable-hdpi/ic_unlocked_white_18dp.png differ
diff --git a/res/drawable-mdpi/ic_unlocked_white_18dp.png b/res/drawable-mdpi/ic_unlocked_white_18dp.png
new file mode 100644
index 0000000000..3638a79920
Binary files /dev/null and b/res/drawable-mdpi/ic_unlocked_white_18dp.png differ
diff --git a/res/drawable-xhdpi/ic_unlocked_white_18dp.png b/res/drawable-xhdpi/ic_unlocked_white_18dp.png
new file mode 100644
index 0000000000..1d470e8f19
Binary files /dev/null and b/res/drawable-xhdpi/ic_unlocked_white_18dp.png differ
diff --git a/res/drawable-xxhdpi/ic_unlocked_white_18dp.png b/res/drawable-xxhdpi/ic_unlocked_white_18dp.png
new file mode 100644
index 0000000000..6b933b1b93
Binary files /dev/null and b/res/drawable-xxhdpi/ic_unlocked_white_18dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_unlocked_white_18dp.png b/res/drawable-xxxhdpi/ic_unlocked_white_18dp.png
new file mode 100644
index 0000000000..220934afd0
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_unlocked_white_18dp.png differ
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 491e69ca21..385bcbb31b 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -113,15 +113,16 @@
                           android:orientation="horizontal"
                           android:gravity="left">
 
-                <ImageView android:id="@+id/secure_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
+                <ImageView android:id="@+id/insecure_indicator"
+                           android:layout_width="12dp"
+                           android:layout_height="11dp"
                            android:layout_gravity="center_vertical"
-                           android:paddingRight="2dp"
-                           android:paddingEnd="4dp"
-                           android:src="?menu_lock_icon_small"
+                           android:layout_marginRight="3dp"
+                           android:layout_marginEnd="3dp"
+                           android:src="@drawable/ic_unlocked_white_18dp"
                            android:contentDescription="@string/conversation_item__secure_message_description"
                            android:visibility="gone"
+                           android:alpha=".65"
                            android:tint="?conversation_item_received_text_secondary_color"
                            android:tintMode="multiply"
                            tools:visibility="visible"/>
@@ -135,8 +136,10 @@
                         app:offset="0"
                         android:layout_gravity="center_vertical|end"
                         android:alpha=".65"
-                        android:layout_width="10dp"
+                        android:layout_width="8dp"
                         android:layout_height="11dp"
+                        android:layout_marginRight="3dp"
+                        android:layout_marginEnd="3dp"
                         android:visibility="gone"
                         tools:visibility="visible"/>
 
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 38c4df8a59..3d0d76aeb9 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -76,9 +76,9 @@
                           android:layout_gravity="right">
 
                 <View android:id="@+id/group_sender_holder"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone"/>
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:visibility="gone"/>
 
                 <TextView android:id="@+id/group_message_sender"
                           android:layout_width="wrap_content"
@@ -89,7 +89,7 @@
                           android:textColor="?conversation_item_sent_text_secondary_color"
                           android:visibility="gone"
                           android:layout_marginRight="8dip"
-                          android:paddingTop="1dip" />
+                          android:paddingTop="1dip"/>
 
                 <TextView android:id="@+id/group_message_sender_profile"
                           android:layout_width="wrap_content"
@@ -100,7 +100,7 @@
                           android:textColor="?conversation_item_sent_text_secondary_color"
                           android:visibility="gone"
                           android:layout_marginRight="8dip"
-                          android:paddingTop="1dip" />
+                          android:paddingTop="1dip"/>
 
 
                 <TextView android:id="@+id/conversation_item_date"
@@ -116,7 +116,7 @@
                           android:textSize="@dimen/conversation_item_date_text_size"
                           android:paddingTop="1dip"
                           android:paddingBottom="2dp"
-                          tools:text="30 mins" />
+                          tools:text="30 mins"/>
 
                 <TextView android:id="@+id/sim_info"
                           android:autoLink="none"
@@ -154,19 +154,22 @@
                         android:layout_gravity="center_vertical|end"
                         android:alpha=".6"
                         android:layout_marginLeft="3dp"
-                        android:layout_width="10dp"
+                        android:layout_marginStart="3dp"
+                        android:layout_width="7dp"
                         android:layout_height="11dp"
                         android:visibility="gone"
                         tools:visibility="visible"/>
 
-                <ImageView android:id="@+id/secure_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:src="?menu_lock_icon_small"
+                <ImageView android:id="@+id/insecure_indicator"
+                           android:layout_width="12dp"
+                           android:layout_height="11dp"
+                           android:src="@drawable/ic_unlocked_white_18dp"
                            android:visibility="gone"
                            android:layout_gravity="center_vertical|end"
-                           android:paddingLeft="2dp"
-                           android:tint="?conversation_item_sent_text_secondary_color"
+                           android:alpha=".6"
+                           android:tint="@color/black"
+                           android:layout_marginLeft="3dp"
+                           android:layout_marginStart="3dp"
                            android:tintMode="multiply"
                            android:contentDescription="@string/conversation_item__secure_message_description"
                            tools:visibility="visible"/>
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 899699a48f..f858c9d6ba 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -117,7 +117,7 @@ public class ConversationItem extends LinearLayout
   private TextView           groupSender;
   private TextView           groupSenderProfileName;
   private View               groupSenderHolder;
-  private ImageView          secureImage;
+  private ImageView          insecureImage;
   private AvatarImageView    contactPhoto;
   private DeliveryStatusView deliveryStatusIndicator;
   private AlertView          alertView;
@@ -162,7 +162,7 @@ public class ConversationItem extends LinearLayout
     this.indicatorText           = (TextView)           findViewById(R.id.indicator_text);
     this.groupSender             = (TextView)           findViewById(R.id.group_message_sender);
     this.groupSenderProfileName  = (TextView)           findViewById(R.id.group_message_sender_profile);
-    this.secureImage             = (ImageView)          findViewById(R.id.secure_indicator);
+    this.insecureImage           = (ImageView)          findViewById(R.id.insecure_indicator);
     this.deliveryStatusIndicator = (DeliveryStatusView) findViewById(R.id.delivery_status);
     this.alertView               = (AlertView)          findViewById(R.id.indicators_parent);
     this.contactPhoto            = (AvatarImageView)    findViewById(R.id.contact_photo);
@@ -432,7 +432,7 @@ public class ConversationItem extends LinearLayout
   private void setStatusIcons(MessageRecord messageRecord) {
     indicatorText.setVisibility(View.GONE);
 
-    secureImage.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
+    insecureImage.setVisibility(messageRecord.isSecure() ? View.GONE : View.VISIBLE);
     bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0);
     dateText.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getTimestamp()));