diff --git a/apps/client/src/features/rundown/event-block/EventBlockInner.tsx b/apps/client/src/features/rundown/event-block/EventBlockInner.tsx
index 6e17f7ded..cbf443a46 100644
--- a/apps/client/src/features/rundown/event-block/EventBlockInner.tsx
+++ b/apps/client/src/features/rundown/event-block/EventBlockInner.tsx
@@ -1,8 +1,8 @@
 import { memo, useEffect, useState } from 'react';
 import { Tooltip } from '@chakra-ui/react';
-import { BiArrowToBottom } from '@react-icons/all-files/bi/BiArrowToBottom';
 import { IoArrowDown } from '@react-icons/all-files/io5/IoArrowDown';
 import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+import { IoFlag } from '@react-icons/all-files/io5/IoFlag';
 import { IoPeople } from '@react-icons/all-files/io5/IoPeople';
 import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
 import { IoPlayForward } from '@react-icons/all-files/io5/IoPlayForward';
@@ -173,7 +173,7 @@ function TimerIcon(props: { type: TimerType; className: string }) {
     return <IoTime className={className} />;
   }
   if (type === TimerType.TimeToEnd) {
-    return <BiArrowToBottom className={className} />;
+    return <IoFlag className={className} />
   }
   return <IoArrowDown className={className} />;
 }
diff --git a/apps/server/src/services/rundown-service/rundownCache.ts b/apps/server/src/services/rundown-service/rundownCache.ts
index 2169af053..6d42244fc 100644
--- a/apps/server/src/services/rundown-service/rundownCache.ts
+++ b/apps/server/src/services/rundown-service/rundownCache.ts
@@ -404,12 +404,13 @@ export const editCustomField = async (label: string, newField: Partial<CustomFie
     throw new Error('Change of field type is not allowed');
   }
 
+  persistedCustomFields[newField.label] = { ...existingField, ...newField };
+
   if (existingField.label !== newField.label) {
+    delete persistedCustomFields[existingField.label];
     customFieldChangelog[label] = newField.label;
   }
 
-  persistedCustomFields[label] = { ...existingField, ...newField };
-
   scheduleCustomFieldPersist(persistedCustomFields);
   invalidateIfUsed(label);