diff --git a/CHANGELOG.md b/CHANGELOG.md
index c93c89f5d..f3a47fe55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased - 125
+
+- Deal more gracefully with missing header colours
+
 ## v2.24.0 - 124 (2023-06-10)
 
 - Support selecting exactly which details to view in card overview
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
index d1da27ef8..c9ff04afb 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -213,7 +213,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
         inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
         Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
-        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);
+        inputHolder.setIconBackgroundColor(Utils.getHeaderColor(mContext, loyaltyCard));
 
         inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index c30d632ac..825aae2c0 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -853,10 +853,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             }
         }
 
-        // Generate random header color
         if (tempLoyaltyCard.headerColor == null) {
-            // Select a random color to start out with.
-            updateTempState(LoyaltyCardField.headerColor, Utils.getRandomHeaderColor(this));
+            // If name is set, pick colour relevant for name. Otherwise pick randomly
+            updateTempState(LoyaltyCardField.headerColor, tempLoyaltyCard.store.isEmpty() ? Utils.getRandomHeaderColor(this) : Utils.getHeaderColor(this, tempLoyaltyCard));
         }
 
         // Update from intent
@@ -928,7 +927,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     protected void setColorFromIcon() {
         Object icon = thumbnail.getTag();
         if (icon != null && (icon instanceof Bitmap)) {
-            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);
+            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, Utils.getHeaderColor(this, tempLoyaltyCard));
 
             updateTempState(LoyaltyCardField.headerColor, headerColor);
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 51efb6678..4327f4022 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -613,12 +613,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             dialog.show();
         });
 
-        int backgroundHeaderColor;
-        if (loyaltyCard.headerColor != null) {
-            backgroundHeaderColor = loyaltyCard.headerColor;
-        } else {
-            backgroundHeaderColor = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
-        }
+        int backgroundHeaderColor = Utils.getHeaderColor(this, loyaltyCard);
 
         // Also apply colours to UI elements
         int darkenedColor = ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.1f);
diff --git a/app/src/main/java/protect/card_locker/ShortcutHelper.java b/app/src/main/java/protect/card_locker/ShortcutHelper.java
index e974421a9..071a6802b 100644
--- a/app/src/main/java/protect/card_locker/ShortcutHelper.java
+++ b/app/src/main/java/protect/card_locker/ShortcutHelper.java
@@ -33,7 +33,6 @@ class ShortcutHelper {
     private static final int ADAPTIVE_BITMAP_SIZE = 108 * ADAPTIVE_BITMAP_SCALE;
     private static final int ADAPTIVE_BITMAP_VISIBLE_SIZE = 72 * ADAPTIVE_BITMAP_SCALE;
     private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
-    private static final int PADDING_COLOR = Color.argb(255, 255, 255, 255);
     private static final int PADDING_COLOR_OVERLAY = Color.argb(127, 0, 0, 0);
 
     /**
@@ -145,7 +144,7 @@ class ShortcutHelper {
         if (iconBitmap == null) {
             iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
         } else {
-            iconBitmap = createAdaptiveBitmap(iconBitmap, loyaltyCard.headerColor == null ? PADDING_COLOR : loyaltyCard.headerColor);
+            iconBitmap = createAdaptiveBitmap(iconBitmap, Utils.getHeaderColor(context, loyaltyCard));
         }
 
         IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);
diff --git a/app/src/main/java/protect/card_locker/Utils.java b/app/src/main/java/protect/card_locker/Utils.java
index c8cc89a06..d98439e66 100644
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -603,7 +603,7 @@ public class Utils {
         } else {
             textWhenNoImage.setVisibility(View.VISIBLE);
 
-            int headerColor = loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
+            int headerColor = getHeaderColor(context, loyaltyCard);
 
             backgroundOrIcon.setImageBitmap(null);
             backgroundOrIcon.setBackgroundColor(headerColor);
@@ -626,4 +626,8 @@ public class Utils {
             return false;
         }
     }
+
+    public static int getHeaderColor(Context context, LoyaltyCard loyaltyCard) {
+        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
+    }
 }