diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index b15c4f8f9..b13430e41 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -4,12 +4,16 @@ package protect.card_locker;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.ColorUtils;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.widget.TextViewCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.content.res.AppCompatResources;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.util.TypedValue;
@@ -55,6 +59,22 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         Log.d(TAG, "View activity: id=" + loyaltyCardId);
     }
 
+    private Drawable getIcon(int icon, boolean dark)
+    {
+        Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
+        Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
+        if(dark)
+        {
+            DrawableCompat.setTint(wrappedIcon, Color.BLACK);
+        }
+        else
+        {
+            DrawableCompat.setTintList(wrappedIcon, null);
+        }
+
+        return wrappedIcon;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -171,13 +191,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         // If the background is very bright, we should use dark icons
         backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > LUMINANCE_MIDPOINT);
-        if(backgroundNeedsDarkIcons)
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
         {
-            ActionBar actionBar = getSupportActionBar();
-            if(actionBar != null)
-            {
-                actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back_black);
-            }
+            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons));
         }
 
         if(barcodeImage.getHeight() == 0)
@@ -227,11 +244,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             item.setVisible(false);
         }
 
-        if(backgroundNeedsDarkIcons)
-        {
-            menu.findItem(R.id.action_share).setIcon(R.drawable.ic_share_black);
-            menu.findItem(R.id.action_edit).setIcon(R.drawable.ic_mode_edit_black_24dp);
-        }
+        menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
+        menu.findItem(R.id.action_edit).setIcon(getIcon(R.drawable.ic_mode_edit_white_24dp, backgroundNeedsDarkIcons));
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -281,27 +295,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     {
         if(lock)
         {
-            if(backgroundNeedsDarkIcons)
-            {
-                item.setIcon(R.drawable.ic_lock_outline_black_24dp);
-            }
-            else
-            {
-                item.setIcon(R.drawable.ic_lock_outline_white_24dp);
-            }
+
+            item.setIcon(getIcon(R.drawable.ic_lock_outline_white_24dp, backgroundNeedsDarkIcons));
             item.setTitle(R.string.unlockScreen);
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
         }
         else
         {
-            if(backgroundNeedsDarkIcons)
-            {
-                item.setIcon(R.drawable.ic_lock_open_black_24dp);
-            }
-            else
-            {
-                item.setIcon(R.drawable.ic_lock_open_white_24dp);
-            }
+            item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
             item.setTitle(R.string.lockScreen);
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
         }
diff --git a/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml b/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml
deleted file mode 100644
index 98478bec9..000000000
--- a/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml
deleted file mode 100644
index 6481a6ab2..000000000
--- a/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml
deleted file mode 100644
index e79c7fa13..000000000
--- a/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml
deleted file mode 100644
index 0fcc94c3d..000000000
--- a/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_share_black.xml b/app/src/main/res/drawable-anydpi/ic_share_black.xml
deleted file mode 100644
index d6d88a382..000000000
--- a/app/src/main/res/drawable-anydpi/ic_share_black.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_black.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_black.png
deleted file mode 100644
index ebdf58407..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_arrow_back_black.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png
new file mode 100644
index 000000000..f782543d3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 8e6a08971..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 812d91271..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index fdecd8f6c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share_black.png b/app/src/main/res/drawable-hdpi/ic_share_black.png
deleted file mode 100644
index 7bfe54373..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_share_black.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_black.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_black.png
deleted file mode 100644
index 24a492818..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_arrow_back_black.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png
new file mode 100644
index 000000000..222690b0b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 7bef37b2a..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 6bdbeeb4c..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index fd08725aa..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_black.png b/app/src/main/res/drawable-mdpi/ic_share_black.png
deleted file mode 100644
index d03e2495f..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_share_black.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back_black.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back_black.png
deleted file mode 100644
index 77c9552e0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_arrow_back_black.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png
new file mode 100644
index 000000000..c4e8d91ba
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 54fefc3e8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index edff073bc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index 710d6cc0c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_black.png b/app/src/main/res/drawable-xhdpi/ic_share_black.png
deleted file mode 100644
index eedcacb55..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_share_black.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png
deleted file mode 100644
index d7c6207da..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
new file mode 100644
index 000000000..575d5075c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 4a74b1b31..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 1bb240a5e..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index c36f260fa..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_black.png b/app/src/main/res/drawable-xxhdpi/ic_share_black.png
deleted file mode 100644
index 2bc718cec..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_black.png and /dev/null differ