diff --git a/ayanova/src/views/customer-notify-subscription.vue b/ayanova/src/views/customer-notify-subscription.vue
index f28dfd40..cc626598 100644
--- a/ayanova/src/views/customer-notify-subscription.vue
+++ b/ayanova/src/views/customer-notify-subscription.vue
@@ -267,7 +267,7 @@
                     <v-select
                       v-if="showWorkOrderTokenSelector"
                       v-model="woToken"
-                      prepend-icon="$ayiAt"
+                      prepend-icon="$ayiPlus"
                       :items="selectLists.workOrderTemplateTokens"
                       item-text="name"
                       item-value="id"
@@ -1067,7 +1067,13 @@ async function fetchTranslatedText() {
     "WorkOrder",
     "Quote",
     "WhoWillBeNotified",
-    "EmailTemplate"
+    "EmailTemplate",
+    "Customer",
+    "WorkOrderCustomerContactName",
+    "WorkOrderCustomerReferenceNumber",
+    "WorkOrderSummary",
+    "WorkOrderSerialNumber",
+    "Name"
   ]);
 }
 
@@ -1148,15 +1154,17 @@ CSR:
 [Client.Label.Name] - Client name,[ClientServiceRequest.Label.Title] - Title
 
 */
+  const wo = vm.$ay.t("WorkOrder") + " ";
+  const cust = vm.$ay.t("Customer") + " ";
   vm.selectLists.workOrderTemplateTokens.push(
     ...[
-      { name: vm.$ay.t("Customer"), id: "{{Customer}}" },
+      { name: cust + vm.$ay.t("Name"), id: "{{Customer}}" },
       {
         name: vm.$ay.t("WorkOrderStatus"),
         id: "{{WorkOrderStatus}}"
       },
       {
-        name: vm.$ay.t("WorkOrderCustomerContactName"),
+        name: wo + vm.$ay.t("WorkOrderCustomerContactName"),
         id: "{{WorkOrderCustomerContactName}}"
       },
       {
@@ -1164,11 +1172,11 @@ CSR:
         id: "{{WorkOrderCustomerReferenceNumber}}"
       },
       {
-        name: vm.$ay.t("WorkOrderSummary"),
+        name: wo + vm.$ay.t("WorkOrderSummary"),
         id: "{{WorkOrderSummary}}"
       },
       {
-        name: vm.$ay.t("WorkOrderSerialNumber"),
+        name: wo + vm.$ay.t("WorkOrderSerialNumber"),
         id: "{{WorkOrderSerialNumber}}"
       }
     ]