diff --git a/res/layout/activity_contact_name_edit.xml b/res/layout/activity_contact_name_edit.xml
index 42785c8e41..fbf809d333 100644
--- a/res/layout/activity_contact_name_edit.xml
+++ b/res/layout/activity_contact_name_edit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,8 +13,8 @@
         android:layout_height="?attr/actionBarSize"
         android:theme="?attr/actionBarStyle"
         android:minHeight="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"/>
+        android:elevation="4dp"
+        app:navigationIcon="@drawable/ic_check_24" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
index 11a85d46f4..38a26129b1 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
@@ -75,7 +75,6 @@ public class ContactNameEditActivity extends PassphraseRequiredActionBarActivity
     setSupportActionBar(toolbar);
 
     toolbar.setTitle("");
-    toolbar.setNavigationIcon(R.drawable.ic_check_white_24dp);
     toolbar.setNavigationOnClickListener(v -> {
       Intent resultIntent = new Intent();
       resultIntent.putExtra(KEY_NAME, viewModel.getName());