diff --git a/web/siteplan/src/components/FeatureService.vue b/web/siteplan/src/components/FeatureService.vue
index 4d7e657b5f..4c5f1a3aa0 100644
--- a/web/siteplan/src/components/FeatureService.vue
+++ b/web/siteplan/src/components/FeatureService.vue
@@ -114,7 +114,6 @@ export default class FeatureService extends Vue {
   unsubscribe: SubscribeOptions | undefined
   map: Map = store.state.map
   model: SiteplanModel | null = null
-  developmentOptions = false
   svgService: SvgService = new SvgService(axios)
   listFeature: ILageplanFeature[] = []
   inLODView = false
@@ -122,7 +121,6 @@ export default class FeatureService extends Vue {
 
   mounted (): void {
     this.createLayers()
-    this.developmentOptions = Configuration.developmentMode()
     this.loadModel()
     store.subscribe((m, s) => {
       if (m.type === 'setSheetCutCRS') {
@@ -232,38 +230,30 @@ export default class FeatureService extends Vue {
             .flat()
             .map(feature => featureClass.setFeatureColor(feature))
         case TableType.DIFF:{
-          if (Configuration.developmentMode()) {
-            // Temporary demo: Only show red/yellow in development mode
-            const compareState = featureClass.compareChangedState(
-              model.changedInitialState,
-              model.changedFinalState
-            )
-            return [
-              featureClass
-                .getFeatures(model.commonState)
-                .map(feature => featureClass.setFeatureColor(feature)),
-              compareState,
-              featureClass
-                .getFeatures(model.finalState)
-                .map(feature =>
-                  featureClass.setFeatureColor(
-                    feature,
-                    SiteplanColorValue.COLOR_ADDED
-                  )),
-              featureClass
-                .getFeatures(model.initialState)
-                .map(feature =>
-                  featureClass.setFeatureColor(
-                    feature,
-                    SiteplanColorValue.COLOR_REMOVED
-                  ))
-            ].flat()
-          }
-
-          return [model.commonState, model.finalState, model.changedInitialState]
-            .map(state => featureClass.getFeatures(state))
-            .flat()
-            .map(feature => featureClass.setFeatureColor(feature))
+          const compareState = featureClass.compareChangedState(
+            model.changedInitialState,
+            model.changedFinalState
+          )
+          return [
+            featureClass
+              .getFeatures(model.commonState)
+              .map(feature => featureClass.setFeatureColor(feature)),
+            compareState,
+            featureClass
+              .getFeatures(model.finalState)
+              .map(feature =>
+                featureClass.setFeatureColor(
+                  feature,
+                  SiteplanColorValue.COLOR_ADDED
+                )),
+            featureClass
+              .getFeatures(model.initialState)
+              .map(feature =>
+                featureClass.setFeatureColor(
+                  feature,
+                  SiteplanColorValue.COLOR_REMOVED
+                ))
+          ].flat()
         }
       }
     } catch (e) {
diff --git a/web/siteplan/src/feature/LageplanFeature.ts b/web/siteplan/src/feature/LageplanFeature.ts
index d7e1be4af0..875cb84409 100644
--- a/web/siteplan/src/feature/LageplanFeature.ts
+++ b/web/siteplan/src/feature/LageplanFeature.ts
@@ -320,6 +320,12 @@ export default abstract class LageplanFeature<T extends SiteplanObject> implemen
     return final
   }
 
+  resetFeatureColor (feature: Feature<Geometry>): Feature<Geometry> {
+    const object = getFeatureData(feature) as SiteplanObject
+    object.objectColors = []
+    return feature
+  }
+
   // Default implementation
   setFeatureColor (feature: Feature<Geometry>, color?: number[], partID?: string): Feature<Geometry> {
     this.setObjectColor(
@@ -356,6 +362,12 @@ export default abstract class LageplanFeature<T extends SiteplanObject> implemen
     const objColor = { id, color }
     if (!object.objectColors) {
       object.objectColors = [objColor]
+      return
+    }
+
+    const existingObjectColor = object.objectColors.find(objectColor => objectColor.id === id)
+    if (existingObjectColor) {
+      existingObjectColor.color = color
     } else {
       object.objectColors.push(objColor)
     }
diff --git a/web/siteplan/src/feature/SignalFeature.ts b/web/siteplan/src/feature/SignalFeature.ts
index 478f49d055..8e4bbc1dfa 100644
--- a/web/siteplan/src/feature/SignalFeature.ts
+++ b/web/siteplan/src/feature/SignalFeature.ts
@@ -90,24 +90,32 @@ export default class SignalFeature extends LageplanFeature<SignalMount> {
   }
 
   setFeatureColor (feature: Feature<Geometry>, color?: number[], partID?: string): Feature<Geometry> {
-    if (color) {
+    if (!color && !partID) {
+      this.resetFeatureColor(feature)
+    } else if (partID) {
       super.setFeatureColor(feature, color, partID)
     } else {
       Object.values(SignalPart).forEach(part => {
-        this.setFeatureRegionColor(feature, part)
+        this.setFeatureRegionColor(feature, part, color)
       })
     }
 
     return feature
   }
 
-  protected setFeatureRegionColor (feature: Feature<Geometry>, objectPart?: string | undefined): Feature<Geometry> {
+  protected setFeatureRegionColor (
+    feature: Feature<Geometry>,
+    objectPart?: string | undefined,
+    color?: number[]
+  ): Feature<Geometry> {
     const signalModel = getFeatureData(feature) as SignalMount
     // IMPROVE: Because at the moment Signal Additive doesn't have GUID,
     // you can't set region color for this.
     switch (objectPart) {
+      case SignalPart.Label:
+      case SignalPart.RouteMarker:
       case SignalPart.Mast: {
-        this.setObjectColor(signalModel, objectPart, this.getRegionColor(feature))
+        this.setObjectColor(signalModel, objectPart, color ?? this.getRegionColor(feature))
         break
       }
       case SignalPart.Schirm: {
@@ -115,11 +123,11 @@ export default class SignalFeature extends LageplanFeature<SignalMount> {
           this.setObjectColor(
             signalModel,
             objectPart,
-            this.getRegionColor(feature, signalModel.attachedSignals[0].guid)
+            color ?? this.getRegionColor(feature, signalModel.attachedSignals[0].guid)
           )
         } else {
           signalModel.attachedSignals.forEach(signal => {
-            const regionColor = this.getRegionColor(feature, signal.guid)
+            const regionColor = color ?? this.getRegionColor(feature, signal.guid)
             this.setObjectColor(signalModel, `${objectPart}_${signal.guid}`, regionColor)
           })
         }
diff --git a/web/siteplan/src/feature/SignalRouteMarkerFeature.ts b/web/siteplan/src/feature/SignalRouteMarkerFeature.ts
index 6d1e729586..87da259109 100644
--- a/web/siteplan/src/feature/SignalRouteMarkerFeature.ts
+++ b/web/siteplan/src/feature/SignalRouteMarkerFeature.ts
@@ -53,7 +53,7 @@ export default class SignalRouteMarkerFeature extends LageplanFeature<SignalMoun
     const lineCoordinates = this.getLocationLineCoors(signalPos)
     const lineFeature = createFeature(
       FeatureType.SignalRouteMarker,
-      signalMount.attachedSignals[0],
+      signalMount,
       new LineString([lineCoordinates[0], lineCoordinates[1]])
     )
     lineFeature.setStyle((_, resolution) => {
@@ -71,7 +71,7 @@ export default class SignalRouteMarkerFeature extends LageplanFeature<SignalMoun
     // Add km text
     const textFeature = createFeature(
       FeatureType.SignalRouteMarker,
-      signalMount.attachedSignals[0],
+      signalMount,
       new Point([signalPos.x, signalPos.y])
     )
 
@@ -88,7 +88,7 @@ export default class SignalRouteMarkerFeature extends LageplanFeature<SignalMoun
       updateLabelOrientation(label, labelRotation + 90, this.map)
       updateLabelColor(label, getColor(signalMount, SignalPart.RouteMarker))
       const style = this.svgService.getFeatureStyle(
-        signalMount.attachedSignals[0],
+        signalMount,
         FeatureType.SignalRouteMarker,
         label
       )
diff --git a/web/siteplan/src/model/Signal.ts b/web/siteplan/src/model/Signal.ts
index 1477e51b38..bbfbfb7a91 100644
--- a/web/siteplan/src/model/Signal.ts
+++ b/web/siteplan/src/model/Signal.ts
@@ -6,11 +6,11 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  */
-import { defaultSignalScreenObj, SignalScreen } from './SignalScreen'
+import { checkInstance } from '@/util/ObjectExtension'
 import { Label } from './Label'
-import { defaultRouteLocationObj, RouteObject } from './RouteObject'
 import { defaultPositionObj, Position } from './Position'
-import { checkInstance } from '@/util/ObjectExtension'
+import { defaultRouteLocationObj, RouteObject } from './RouteObject'
+import { defaultSignalScreenObj, SignalScreen } from './SignalScreen'
 
 export enum SignalRole
 {
@@ -60,7 +60,8 @@ export enum SignalPart {
     Schirm = 'schirm',
     Mast = 'mast',
     Additive = 'additive',
-    RouteMarker = 'marker'
+    RouteMarker = 'marker',
+    Label = 'label'
 }
 
 export interface Signal extends RouteObject
diff --git a/web/siteplan/src/service/SvgColorService.ts b/web/siteplan/src/service/SvgColorService.ts
index 2d005fe9e6..b620c66ad1 100644
--- a/web/siteplan/src/service/SvgColorService.ts
+++ b/web/siteplan/src/service/SvgColorService.ts
@@ -52,11 +52,6 @@ export default class SvgColorService {
   }
 
   private static shouldApplyColor (svg: Element, obj: ObjectColor) {
-    if (obj.id === 'label') {
-      this.applyColorByIds(svg, 'label', obj.color)
-      return false
-    }
-
     return svg.querySelector('#' + obj.id) !== null
   }
 
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDraw.ts b/web/siteplan/src/util/SVG/Draw/SvgDraw.ts
index 2df7399bf9..88fec2cf93 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDraw.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDraw.ts
@@ -9,6 +9,7 @@
 
 import { Label } from '@/model/Label'
 import { KMMarker } from '@/model/Route'
+import { SignalPart } from '@/model/Signal'
 import { ISvgElement, SvgElement } from '@/model/SvgElement'
 import '@/util/ElementExtensions'
 import { fromCenterPointAndMasure } from '@/util/ExtentExtension'
@@ -247,7 +248,7 @@ export default class SvgDraw {
   static getRouteMarker (label: Label): ISvgElement {
     const svg = SvgDraw.createSvgWithHead(this.SVG_KMMARKER_DRAWAREA_X, this.SVG_KMMARKER_DRAWAREA_Y)
     // Add the label
-    svg.appendChild(SvgDraw.drawLabelAt(
+    const labelSvg = SvgDraw.drawLabelAt(
       label,
       this.SVG_KMMARKER_DRAWAREA_CENTER_X - 60,
       this.SVG_KMMARKER_DRAWAREA_CENTER_Y + 8,
@@ -256,7 +257,9 @@ export default class SvgDraw {
       13,
       90,
       true
-    ))
+    )
+    labelSvg.setAttribute('id', SignalPart.RouteMarker)
+    svg.appendChild(labelSvg)
     return new SvgElement('RouteMarker', svg, [], null, [])
   }