diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index 25a73e112..280edfc6c 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -95,19 +95,14 @@ export default {
         },
 
         tintSelectionOptions() {
-            let tintOptions = [];
-
-            Object.keys(this.featureListData).forEach((tintOption) => {
-                tintOptions.push({
+            const tintOptions = Object.keys(this.featureListData).map((tintOption) => {
+                const buttonImage = this.getTintSourceImage(this.glassLocation, tintOption);
+                return {
                     value: tintOption,
                     buttonLabel: tintOption,
-                    buttonImage: require(`@/assets/img/tints/${this.getTintSourceImage(
-                        this.glassLocation,
-                        tintOption
-                    )}`),
-                });
+                    buttonImage: buttonImage ? require(`@/assets/img/tints/${buttonImage}`) : null,
+                };
             });
-
             return tintOptions;
         },
 
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 902baa1e1..ffdf4efc0 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -10,6 +10,7 @@
             class="d-flex w-100 align-items-center px-2 h-100 list-card-content button-content rounded-3"
             :class="labelClasses">
             <img
+                v-if="buttonImage"
                 :id="buttonImageId"
                 :class="!isWide ? 'order-1' : 'ms-auto order-3'"
                 :src="buttonImage"