diff --git a/res/drawable-hdpi/msg_encr_in.png b/res/drawable-hdpi/msg_encr_in.png
new file mode 100644
index 000000000..bd7f46f85
Binary files /dev/null and b/res/drawable-hdpi/msg_encr_in.png differ
diff --git a/res/drawable-hdpi/msg_encr_media.png b/res/drawable-hdpi/msg_encr_media.png
new file mode 100644
index 000000000..4ceae2095
Binary files /dev/null and b/res/drawable-hdpi/msg_encr_media.png differ
diff --git a/res/drawable-hdpi/msg_encr_out.png b/res/drawable-hdpi/msg_encr_out.png
new file mode 100644
index 000000000..af0aeee91
Binary files /dev/null and b/res/drawable-hdpi/msg_encr_out.png differ
diff --git a/res/drawable-mdpi/msg_encr_in.png b/res/drawable-mdpi/msg_encr_in.png
new file mode 100644
index 000000000..d289ed786
Binary files /dev/null and b/res/drawable-mdpi/msg_encr_in.png differ
diff --git a/res/drawable-mdpi/msg_encr_media.png b/res/drawable-mdpi/msg_encr_media.png
new file mode 100644
index 000000000..4b2e7f173
Binary files /dev/null and b/res/drawable-mdpi/msg_encr_media.png differ
diff --git a/res/drawable-mdpi/msg_encr_out.png b/res/drawable-mdpi/msg_encr_out.png
new file mode 100644
index 000000000..760538192
Binary files /dev/null and b/res/drawable-mdpi/msg_encr_out.png differ
diff --git a/res/drawable-xhdpi/msg_encr_in.png b/res/drawable-xhdpi/msg_encr_in.png
new file mode 100644
index 000000000..1ac435012
Binary files /dev/null and b/res/drawable-xhdpi/msg_encr_in.png differ
diff --git a/res/drawable-xhdpi/msg_encr_media.png b/res/drawable-xhdpi/msg_encr_media.png
new file mode 100644
index 000000000..8d7ae2328
Binary files /dev/null and b/res/drawable-xhdpi/msg_encr_media.png differ
diff --git a/res/drawable-xhdpi/msg_encr_out.png b/res/drawable-xhdpi/msg_encr_out.png
new file mode 100644
index 000000000..2e94856eb
Binary files /dev/null and b/res/drawable-xhdpi/msg_encr_out.png differ
diff --git a/res/drawable-xxhdpi/msg_encr_in.png b/res/drawable-xxhdpi/msg_encr_in.png
new file mode 100644
index 000000000..5b8fc8c63
Binary files /dev/null and b/res/drawable-xxhdpi/msg_encr_in.png differ
diff --git a/res/drawable-xxhdpi/msg_encr_media.png b/res/drawable-xxhdpi/msg_encr_media.png
new file mode 100644
index 000000000..b2484cbde
Binary files /dev/null and b/res/drawable-xxhdpi/msg_encr_media.png differ
diff --git a/res/drawable-xxhdpi/msg_encr_out.png b/res/drawable-xxhdpi/msg_encr_out.png
new file mode 100644
index 000000000..758198e40
Binary files /dev/null and b/res/drawable-xxhdpi/msg_encr_out.png differ
diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml
index 1c73ff18c..53ef8ce9e 100644
--- a/res/layout/conversation_item_footer.xml
+++ b/res/layout/conversation_item_footer.xml
@@ -57,10 +57,10 @@
         tools:text="to SIM1" />
 
     <ImageView
-        android:id="@+id/footer_insecure_indicator"
+        android:id="@+id/footer_secure_indicator"
         android:layout_width="12dp"
         android:layout_height="11dp"
-        android:src="@drawable/ic_unlocked_white_18dp"
+        android:src="@drawable/msg_encr_out"
         android:visibility="gone"
         android:layout_gravity="center_vertical|end"
         android:contentDescription="@string/conversation_item__secure_message_description"
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index f307b535d..a0a7888be 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -18,7 +18,6 @@ import com.b44t.messenger.DcMsg;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.util.DateUtils;
@@ -33,7 +32,7 @@ public class ConversationItemFooter extends LinearLayout {
   private TextView            dateView;
   private TextView            simView;
   private ExpirationTimerView timerView;
-  private ImageView           insecureIndicatorView;
+  private ImageView           secureIndicatorView;
   private DeliveryStatusView  deliveryStatusView;
 
   public ConversationItemFooter(Context context) {
@@ -57,7 +56,7 @@ public class ConversationItemFooter extends LinearLayout {
     dateView              = findViewById(R.id.footer_date);
     simView               = findViewById(R.id.footer_sim_info);
     timerView             = findViewById(R.id.footer_expiration_timer);
-    insecureIndicatorView = findViewById(R.id.footer_insecure_indicator);
+    secureIndicatorView   = findViewById(R.id.footer_secure_indicator);
     deliveryStatusView    = findViewById(R.id.footer_delivery_status);
 
     if (attrs != null) {
@@ -78,7 +77,7 @@ public class ConversationItemFooter extends LinearLayout {
     presentDate(messageRecord, locale);
     presentSimInfo(messageRecord);
     presentTimer(messageRecord);
-    presentInsecureIndicator(messageRecord);
+    presentSecureIndicator(messageRecord);
     presentDeliveryStatus(messageRecord);
   }
 
@@ -89,7 +88,7 @@ public class ConversationItemFooter extends LinearLayout {
 
   public void setIconColor(int color) {
     timerView.setColorFilter(color);
-    insecureIndicatorView.setColorFilter(color);
+    secureIndicatorView.setColorFilter(color);
     deliveryStatusView.setTint(color);
   }
 
@@ -158,8 +157,8 @@ public class ConversationItemFooter extends LinearLayout {
     }
   }
 
-  private void presentInsecureIndicator(@NonNull DcMsg messageRecord) {
-    insecureIndicatorView.setVisibility(messageRecord.isSecure() ? View.GONE : View.VISIBLE);
+  private void presentSecureIndicator(@NonNull DcMsg messageRecord) {
+    secureIndicatorView.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
   }
 
   private void presentDeliveryStatus(@NonNull DcMsg messageRecord) {
diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
index f68b3bbc7..abae115f0 100644
--- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
+++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
@@ -63,6 +63,7 @@ public class ApplicationDcContext extends DcContext {
 
         File dbfile = new File(context.getFilesDir(), "messenger.db");
         open(dbfile.getAbsolutePath());
+        setConfig("e2ee_enabled", "1");
 
         try {
             PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);