diff --git a/java/bundles/org.eclipse.set.feature.siteplan/src/org/eclipse/set/feature/siteplan/transform/SignalTransformator.xtend b/java/bundles/org.eclipse.set.feature.siteplan/src/org/eclipse/set/feature/siteplan/transform/SignalTransformator.xtend
index 7717e573fd..2cf4d4f254 100644
--- a/java/bundles/org.eclipse.set.feature.siteplan/src/org/eclipse/set/feature/siteplan/transform/SignalTransformator.xtend
+++ b/java/bundles/org.eclipse.set.feature.siteplan/src/org/eclipse/set/feature/siteplan/transform/SignalTransformator.xtend
@@ -232,6 +232,20 @@ class SignalTransformator extends BaseTransformator<Signal> {
 		}
 	}
 
+	/**
+	 * Original Definition:
+	 * - if there are only Sonderkonstruktionen as mounts, return SONDERKONSTRUKTION
+	 * - if there is one mount != Sonderkonstruktion, return that mounts BefestigungsArt.
+	 * - if there is more then one mount != Sonderkonstruktion, take the mount with the lowest GUID:
+ 	 *		- then: if mount is mast and there are more then 1 signals attached to this assembly, return MehrereMasten
+	 * - if there are no mounts:
+	 * 		- take the signal with the lowest guid, and take the befestigungsArt from the signalReal
+	 * 		- if signal/signalReal/signalReal.signalBefestigungsart null: return null
+	 * 
+	 * New Definition:
+	 *  (ASSUMPTION: no Arbeitsbuehne without a Bridge / Ausleger (see changes in mapToSiteplanMountType))
+	 * - if any specific mount is an SignalAuslegerLinks, return SignalAuslegerLinks.
+	 */
 	def SignalMountType getMountType(SignalInfo info) {
 		var mounts = info.mounts.sortBy[identitaet.wert].map [
 			signalBefestigungAllg.befestigungArt.wert
@@ -243,7 +257,27 @@ class SignalTransformator extends BaseTransformator<Signal> {
 				it != SignalMountType.SONDERKONSTRUKTION
 			]
 
-			if (specificMounts.length != 0) {
+			if (specificMounts.length == 1) {
+				return specificMounts.head;
+			}
+
+			if (specificMounts.length > 1) {
+				// there might be many different combinations, obviously.
+				// I attempt to keep behaviour as before (even if not correct) and only change behaviour for SignalAusleger
+				// SignalAusleger -> ... anything  		=> should be SignalAusleger
+				// Fundament -> SignalAusleger 			=> should be SignalAusleger
+				// Fundament -> Mast
+				// new logic for any assembly containing a SignalAusleger. Same for all other cases
+				if (specificMounts.exists [
+					it === SignalMountType.SIGNALAUSLEGER
+				]) {
+					return SignalMountType.SIGNALAUSLEGER;
+				}
+				if (specificMounts.
+					exists[it === SignalMountType.SIGNALBRUECKE]) {
+					return SignalMountType.SIGNALBRUECKE;
+				}
+
 				var mount = specificMounts.head
 				// If multiple signals are attached to a MAST, convert into MEHRERE_MASTEN  
 				if (mount === SignalMountType.MAST && info.signals.length > 1) {
@@ -268,6 +302,7 @@ class SignalTransformator extends BaseTransformator<Signal> {
 			case ENUM_BEFESTIGUNG_ART_ANDERE_SONDERKONSTRUKTION,
 			case ENUM_BEFESTIGUNG_ART_BAHNSTEIG,
 			case ENUM_BEFESTIGUNG_ART_FUNDAMENT,
+			case ENUM_BEFESTIGUNG_ART_ARBEITSBUEHNE,
 			case ENUM_BEFESTIGUNG_ART_KONSTRUKTIONSTEIL:
 				return SignalMountType.SONDERKONSTRUKTION
 			case ENUM_BEFESTIGUNG_ART_PRELLBOCK:
@@ -282,7 +317,6 @@ class SignalTransformator extends BaseTransformator<Signal> {
 			case ENUM_BEFESTIGUNG_ART_PFOSTEN_NIEDRIG:
 				return SignalMountType.PFOSTEN
 			case ENUM_BEFESTIGUNG_ART_SONSTIGE,
-			case ENUM_BEFESTIGUNG_ART_ARBEITSBUEHNE,
 			case ENUM_BEFESTIGUNG_ART_PFAHL,
 			case ENUM_BEFESTIGUNG_ART_OL_KETTENWERK,
 			case ENUM_BEFESTIGUNG_ART_OL_MAST,
@@ -295,7 +329,7 @@ class SignalTransformator extends BaseTransformator<Signal> {
 			case ENUM_BEFESTIGUNG_ART_SONDERANORDNUNG_MAST_NIEDRIG:
 				return SignalMountType.MAST
 			case ENUM_BEFESTIGUNG_ART_SIGNALAUSLEGER:
-				return SignalMountType.SIGNALAUSLEGER_LINKS
+				return SignalMountType.SIGNALAUSLEGER
 			case ENUM_BEFESTIGUNG_ART_SIGNALBRUECKE:
 				return SignalMountType.SIGNALBRUECKE
 		}
@@ -311,7 +345,7 @@ class SignalTransformator extends BaseTransformator<Signal> {
 			case ENUM_SIGNAL_BEFESTIGUNGSART_MAST:
 				return SignalMountType.MAST
 			case ENUM_SIGNAL_BEFESTIGUNGSART_SIGNALAUSLEGER:
-				return SignalMountType.SIGNALAUSLEGER_LINKS
+				return SignalMountType.SIGNALAUSLEGER
 			case ENUM_SIGNAL_BEFESTIGUNGSART_SIGNALBRUECKE:
 				return SignalMountType.SIGNALBRUECKE
 		}
diff --git a/java/bundles/org.eclipse.set.model.siteplan/model/siteplan.ecore b/java/bundles/org.eclipse.set.model.siteplan/model/siteplan.ecore
index e049617c29..b22f6252bc 100644
--- a/java/bundles/org.eclipse.set.model.siteplan/model/siteplan.ecore
+++ b/java/bundles/org.eclipse.set.model.siteplan/model/siteplan.ecore
@@ -115,8 +115,7 @@
     <eLiterals name="PfostenNiedrig" value="6" literal="PfostenNiedrig"/>
     <eLiterals name="Deckenkonstruktion" value="7" literal="Deckenkonstruktion"/>
     <eLiterals name="Wandkonstruktion" value="8" literal="Wandkonstruktion"/>
-    <eLiterals name="SignalauslegerLinks" value="9" literal="SignalauslegerLinks"/>
-    <eLiterals name="SignalauslegerMitte" value="10" literal="SignalauslegerMitte"/>
+    <eLiterals name="Signalausleger" value="9" literal="Signalausleger"/>
     <eLiterals name="Signalbruecke" value="11" literal="Signalbruecke"/>
     <eLiterals name="Sonderkonstruktion" value="12" literal="Sonderkonstruktion"/>
   </eClassifiers>
diff --git a/java/bundles/org.eclipse.set.model.siteplan/model/siteplan.genmodel b/java/bundles/org.eclipse.set.model.siteplan/model/siteplan.genmodel
index f67ca40af6..2dcee90994 100644
--- a/java/bundles/org.eclipse.set.model.siteplan/model/siteplan.genmodel
+++ b/java/bundles/org.eclipse.set.model.siteplan/model/siteplan.genmodel
@@ -22,8 +22,7 @@
       <genEnumLiterals ecoreEnumLiteral="siteplan.ecore#//SignalMountType/PfostenNiedrig"/>
       <genEnumLiterals ecoreEnumLiteral="siteplan.ecore#//SignalMountType/Deckenkonstruktion"/>
       <genEnumLiterals ecoreEnumLiteral="siteplan.ecore#//SignalMountType/Wandkonstruktion"/>
-      <genEnumLiterals ecoreEnumLiteral="siteplan.ecore#//SignalMountType/SignalauslegerLinks"/>
-      <genEnumLiterals ecoreEnumLiteral="siteplan.ecore#//SignalMountType/SignalauslegerMitte"/>
+      <genEnumLiterals ecoreEnumLiteral="siteplan.ecore#//SignalMountType/Signalausleger"/>
       <genEnumLiterals ecoreEnumLiteral="siteplan.ecore#//SignalMountType/Signalbruecke"/>
       <genEnumLiterals ecoreEnumLiteral="siteplan.ecore#//SignalMountType/Sonderkonstruktion"/>
     </genEnums>
diff --git a/java/bundles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/SignalMountType.java b/java/bundles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/SignalMountType.java
index 711aba5220..c3a6cdcaad 100644
--- a/java/bundles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/SignalMountType.java
+++ b/java/bundles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/SignalMountType.java
@@ -122,17 +122,7 @@ public enum SignalMountType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	SIGNALAUSLEGER_LINKS(9, "SignalauslegerLinks", "SignalauslegerLinks"),
-
-	/**
-	 * The '<em><b>Signalausleger Mitte</b></em>' literal object. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #SIGNALAUSLEGER_MITTE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SIGNALAUSLEGER_MITTE(10, "SignalauslegerMitte", "SignalauslegerMitte"),
+	SIGNALAUSLEGER(9, "Signalausleger", "Signalausleger"),
 
 	/**
 	 * The '<em><b>Signalbruecke</b></em>' literal object. <!-- begin-user-doc
@@ -262,18 +252,7 @@ public enum SignalMountType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int SIGNALAUSLEGER_LINKS_VALUE = 9;
-
-	/**
-	 * The '<em><b>Signalausleger Mitte</b></em>' literal value. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #SIGNALAUSLEGER_MITTE
-	 * @model name="SignalauslegerMitte"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SIGNALAUSLEGER_MITTE_VALUE = 10;
+	public static final int SIGNALAUSLEGER_VALUE = 9;
 
 	/**
 	 * The '<em><b>Signalbruecke</b></em>' literal value. <!-- begin-user-doc
@@ -306,8 +285,7 @@ public enum SignalMountType implements Enumerator {
 	private static final SignalMountType[] VALUES_ARRAY = new SignalMountType[] {
 			MAST, MEHRERE_MASTEN, PFOSTEN, SCHIENENFUSS, GLEISABSCHLUSS,
 			MAST_NIEDRIG, PFOSTEN_NIEDRIG, DECKENKONSTRUKTION, WANDKONSTRUKTION,
-			SIGNALAUSLEGER_LINKS, SIGNALAUSLEGER_MITTE, SIGNALBRUECKE,
-			SONDERKONSTRUKTION, };
+			SIGNALAUSLEGER, SIGNALBRUECKE, SONDERKONSTRUKTION, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Signal Mount Type</b></em>'
@@ -385,10 +363,8 @@ public static SignalMountType get(int value) {
 				return DECKENKONSTRUKTION;
 			case WANDKONSTRUKTION_VALUE:
 				return WANDKONSTRUKTION;
-			case SIGNALAUSLEGER_LINKS_VALUE:
-				return SIGNALAUSLEGER_LINKS;
-			case SIGNALAUSLEGER_MITTE_VALUE:
-				return SIGNALAUSLEGER_MITTE;
+			case SIGNALAUSLEGER_VALUE:
+				return SIGNALAUSLEGER;
 			case SIGNALBRUECKE_VALUE:
 				return SIGNALBRUECKE;
 			case SONDERKONSTRUKTION_VALUE:
diff --git a/java/bundles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/impl/SiteplanPackageImpl.java b/java/bundles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/impl/SiteplanPackageImpl.java
index 0104cddc45..3a6cf7f555 100644
--- a/java/bundles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/impl/SiteplanPackageImpl.java
+++ b/java/bundles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/impl/SiteplanPackageImpl.java
@@ -3512,10 +3512,7 @@ public void initializePackageContents() {
 		addEEnumLiteral(signalMountTypeEEnum,
 				SignalMountType.DECKENKONSTRUKTION);
 		addEEnumLiteral(signalMountTypeEEnum, SignalMountType.WANDKONSTRUKTION);
-		addEEnumLiteral(signalMountTypeEEnum,
-				SignalMountType.SIGNALAUSLEGER_LINKS);
-		addEEnumLiteral(signalMountTypeEEnum,
-				SignalMountType.SIGNALAUSLEGER_MITTE);
+		addEEnumLiteral(signalMountTypeEEnum, SignalMountType.SIGNALAUSLEGER);
 		addEEnumLiteral(signalMountTypeEEnum, SignalMountType.SIGNALBRUECKE);
 		addEEnumLiteral(signalMountTypeEEnum,
 				SignalMountType.SONDERKONSTRUKTION);
diff --git a/web/siteplan/public/SvgKatalog/HV-System.svg b/web/siteplan/public/SvgKatalog/HV-System.svg
index addd69bc1b..c338862444 100644
--- a/web/siteplan/public/SvgKatalog/HV-System.svg
+++ b/web/siteplan/public/SvgKatalog/HV-System.svg
@@ -33,6 +33,8 @@
         <g class="HvSys" id="Vr1">
             <circle r="10" cx="35" cy="20"/>
             <circle r="10" cx="5" cy="40"/>
+            <toolbox:anchor id="mastAnkerTop" x="20" y="40" />
+            <toolbox:anchor id="mastAnkerBottom" x="20" y="20"/>
             <toolbox:rectbound x="-5" y="-10" width="50" height="40" />
         </g>
 
diff --git a/web/siteplan/src/components/SVG/SignalBruecke.vue b/web/siteplan/src/components/SVG/SignalBruecke.vue
index 703a841cea..a7630ec08c 100644
--- a/web/siteplan/src/components/SVG/SignalBruecke.vue
+++ b/web/siteplan/src/components/SVG/SignalBruecke.vue
@@ -20,7 +20,7 @@
         </option>
       </select>
     </div>
-    <span>{{ draw() }}</span>
+    <div v-html="draw()" />
   </div>
 </template>
 <script lang="ts">
@@ -33,7 +33,7 @@ import {
   HauptVorSignalGroup,
   SignalBrueckeudAusleger
 } from '@/util/SVG/SvgEnum'
-import { Vue, Options } from 'vue-class-component'
+import { Options, Vue } from 'vue-class-component'
 
 @Options({
   props: {
@@ -52,12 +52,11 @@ import { Vue, Options } from 'vue-class-component'
 export default class SignalBruecke extends Vue {
   svgService!: SvgService
   listMast = [
-    SignalMountType.SignalauslegerLinks,
-    SignalMountType.SignalauslegerMitte,
+    SignalMountType.Signalausleger,
     SignalMountType.Signalbruecke
   ]
 
-  selectedMast = SignalMountType.SignalauslegerLinks
+  selectedMast = SignalMountType.Signalausleger
   private randomSelectSchirm (): ISvgElement[] {
     const result = new Array<ISvgElement>()
     const listschirm = this.svgService.getSvgElementInGroup(
@@ -88,7 +87,7 @@ export default class SignalBruecke extends Vue {
         )
       })
     })
-    const result = SvgDrawBridge.draw(bridgeScreen, this.selectedMast)
+    const result = SvgDrawBridge.drawParts('',bridgeScreen, this.selectedMast)
     return result.content.outerHTML
   }
 }
diff --git a/web/siteplan/src/components/SVG/Svg.vue b/web/siteplan/src/components/SVG/Svg.vue
index 4feb467c8d..a715fcf828 100644
--- a/web/siteplan/src/components/SVG/Svg.vue
+++ b/web/siteplan/src/components/SVG/Svg.vue
@@ -27,28 +27,28 @@
       />
     </div>
     <div v-if="mode === 'bruecke'">
-      <SignalBruecker :svg-service="svgService" />
+      <SignalBruecke :svg-service="svgService" />
     </div>
   </div>
 </template>
 <script lang="ts">
+import { ISvgElement } from '@/model/SvgElement'
+import SvgService from '@/service/SvgService'
 import {
   AndereSignalGroup,
   HauptVorSignalGroup,
   SVGMast
 } from '@/util/SVG/SvgEnum'
+import { Options, Vue } from 'vue-class-component'
+import SignalBruecke from './SignalBruecke.vue'
 import SvgKatalog from './SvgKatalog.vue'
 import SvgSingleSignal from './SvgSingleSignal.vue'
-import SvgService from '@/service/SvgService'
-import SignalBruecker from './SignalBruecke.vue'
-import { Options, Vue } from 'vue-class-component'
-import { ISvgElement } from '@/model/SvgElement'
 
 @Options({
   components: {
     SvgKatalog,
     SvgSingleSignal,
-    SignalBruecker
+    SignalBruecke
   },
   created () {
     this.setMode()
diff --git a/web/siteplan/src/model/SignalMount.ts b/web/siteplan/src/model/SignalMount.ts
index 136a482bfa..3fea556e06 100644
--- a/web/siteplan/src/model/SignalMount.ts
+++ b/web/siteplan/src/model/SignalMount.ts
@@ -21,8 +21,7 @@ export enum SignalMountType {
   PfostenNiedrig = 'PfostenNiedrig',
   Deckenkonstruktion = 'Deckenkonstruktion',
   Wandkonstruktion = 'Wandkonstruktion',
-  SignalauslegerLinks = 'SignalauslegerLinks',
-  SignalauslegerMitte = 'SignalauslegerMitte',
+  Signalausleger = 'Signalausleger',
   Sonderkonstruktion = 'Sonderkonstruktion',
   Signalbruecke = 'Signalbruecke',
   // Internally used, not generated by Java:
diff --git a/web/siteplan/src/model/SvgElement.ts b/web/siteplan/src/model/SvgElement.ts
index 23ae9a8e13..4996c45418 100644
--- a/web/siteplan/src/model/SvgElement.ts
+++ b/web/siteplan/src/model/SvgElement.ts
@@ -6,9 +6,9 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  */
-import { MountDirection } from './Signal'
-import { Label } from './Label'
 import { Extent } from 'ol/extent'
+import { Label } from './Label'
+import { MountDirection } from './Signal'
 
 export interface ISvgPoint {
   id: string
@@ -80,38 +80,39 @@ export class ZusatzSignal extends SvgElement {
 }
 export const MAX_BRIDGE_DIRECTION_OFFSET = 15.0
 export class SvgBridgeSignal extends SvgElement {
-  mountOffset: number
+  /** right = positive, left = negative */
+  mountSignedOffset: number
   mountDirection: MountDirection
-  label?: Label
+  label: Label | null
 
   constructor (
     id: string,
     element: Element,
     anchor: ISvgPoint[],
     nullpunkt: ISvgPoint | null,
-    mountOffset: number,
+    mountSignedOffset: number,
     mountDirection: MountDirection,
-    signalLabel: Label | undefined,
+    signalLabel: Label | null,
     boundingBox: Extent[]
   ) {
     super(id, element, anchor, nullpunkt, boundingBox)
-    this.mountOffset = mountOffset
-    this.mountDirection = mountDirection
+    this.mountSignedOffset = mountSignedOffset
     this.label = signalLabel
+    this.mountDirection = mountDirection
   }
 
   static fromSvgElement (
     element: ISvgElement,
-    mountOffset: number,
+    signedOffset: number,
     mountDirection: MountDirection,
-    signalLabel?: Label
+    signalLabel: Label | null
   ): SvgBridgeSignal {
     return new SvgBridgeSignal(
       element.id,
       element.content,
       element.anchor,
       element.nullpunkt,
-      mountOffset,
+      signedOffset,
       mountDirection,
       signalLabel,
       element.boundingBox
diff --git a/web/siteplan/src/service/SvgService.ts b/web/siteplan/src/service/SvgService.ts
index 0bde3948a3..b30d55466d 100644
--- a/web/siteplan/src/service/SvgService.ts
+++ b/web/siteplan/src/service/SvgService.ts
@@ -14,6 +14,7 @@ import { store } from '@/store'
 import Configuration from '@/util/Configuration'
 import { getFirstValue } from '@/util/ObjectExtension'
 import SvgDraw from '@/util/SVG/Draw/SvgDraw'
+import SvgDrawBridge from '@/util/SVG/Draw/SvgDrawBridge'
 import SvgDrawCant from '@/util/SVG/Draw/SvgDrawCant'
 import SvgDrawExternalElementControl from '@/util/SVG/Draw/SvgDrawExternalElementControl'
 import SvgDrawFMAComponent from '@/util/SVG/Draw/SvgDrawFMAComponent'
@@ -52,6 +53,7 @@ export default class SvgService {
   }
 
   public registerDrawFeatureSvg () {
+    this.drawFeatureClass.push(new SvgDrawBridge(this.catalogService))
     this.drawFeatureClass.push(new SvgDrawSignal(this.catalogService))
     this.drawFeatureClass.push(new SvgDrawFMAComponent(this.catalogService))
     this.drawFeatureClass.push(new SvgDrawPZB(this.catalogService))
diff --git a/web/siteplan/src/util/SVG/Draw/AbstractDrawSVG.ts b/web/siteplan/src/util/SVG/Draw/AbstractDrawSVG.ts
index cbd5c5ab78..c62d6dce10 100644
--- a/web/siteplan/src/util/SVG/Draw/AbstractDrawSVG.ts
+++ b/web/siteplan/src/util/SVG/Draw/AbstractDrawSVG.ts
@@ -26,11 +26,13 @@ export default abstract class AbstractDrawSVG {
   }
 
   /**
-   * Create a Svg for a feature
+   * Create a Svg for a feature. Return null, if
+   * this Drawer cannot draw that feature or if it is faulty.
+   * If all DrawSVGs return null, an error is displayed.
    * @param data feature data
    * @param label {@link Label}
    */
-  public abstract drawSVG<T extends object>(data: T, label?: Label): ISvgElement
+  public abstract drawSVG<T extends object>(data: T, label?: Label): ISvgElement | null
 
   public getSvgFromCatalog<T extends object> (data: T): ISvgElement | null {
     return this.catalogService.getObjSvg(data, this.getFeatureType())
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawBridge.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawBridge.ts
index 2911abddbf..d31f23fecb 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawBridge.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawBridge.ts
@@ -7,18 +7,24 @@
  * http://www.eclipse.org/legal/epl-v20.html
  */
 
-import { ISvgElement, SvgBridgeSignal, SvgElement, SvgPoint } from '@/model/SvgElement'
-import { AnchorPoint } from '../SvgEnum'
+import { Label } from '@/model/Label'
+import { Position } from '@/model/Position'
+import { MountDirection, Signal, SignalPart, SignalRole } from '@/model/Signal'
+import { SignalMount, SignalMountType } from '@/model/SignalMount'
+import { ISvgElement, MAX_BRIDGE_DIRECTION_OFFSET, SvgBridgeSignal, SvgElement, SvgPoint } from '@/model/SvgElement'
 import '@/util/ElementExtensions'
-import { MountDirection, SignalPart } from '@/model/Signal'
-import SvgDraw from './SvgDraw'
-import SvgDrawSingleSignal from './SvgDrawSingleSignal'
-import { SignalMountType } from '@/model/SignalMount'
 import { fromCenterPointAndMasure, fromHTMLElement, toHTMLElement } from '@/util/ExtentExtension'
 import { getCenter, getHeight, getWidth, isEmpty } from 'ol/extent'
+import { AnchorPoint } from '../SvgEnum'
+import SvgDraw from './SvgDraw'
+import SvgDrawSignal from './SvgDrawSignal'
+import SvgDrawSingleSignal from './SvgDrawSingleSignal'
+
+const EPS = 0.001
+
 /**
  * Draws a signal bridge or a signal boom
- * @author Stuecker
+ * @author Stuecker, Voigt
  */
 
 export interface SignalBridgePart {
@@ -26,35 +32,103 @@ export interface SignalBridgePart {
   signal: SvgBridgeSignal
 }
 
-export default class SvgDrawBridge {
+export default class SvgDrawBridge extends SvgDrawSignal {
   // Extra width for signal bridges/signal booms after the final signal
   static SVG_BRIDGE_EXTRA_END_WIDTH = 10
   // Extra width for signal bridges/signal booms before the mounting point
   static SVG_BRIDGE_EXTRA_START_WIDTH = 5
 
+  static ATTACHED_SIGNAL_MOUNT_LENGTH = 15
+  static BRIDGE_THICKNESS = 20
+  static HALF_BRIDGE_THICKNESS = SvgDrawBridge.BRIDGE_THICKNESS / 2
+
+  /**
+     * Create a Svg for a feature
+     * @param data feature data
+     * @param label {@link Label}
+     */
+  public drawSVG<T extends object> (data: T, label?: Label): ISvgElement | null {
+    const signalMount = data as SignalMount
+    if (!this.validateSignal(signalMount)) return null
+
+    if (!this.isMultiSignal(signalMount)) return null
+
+    const bridgeParts: SignalBridgePart[] =
+      signalMount.attachedSignals
+        .map(signal => this.drawAttachedSignal(signal, signalMount.position))
+        .filter(e => e !== null)
+
+    return SvgDrawBridge.drawParts(signalMount.guid, bridgeParts, signalMount.mountType)
+  }
+
+  private drawAttachedSignal (signal: Signal, bridgeMountPosition: Position): SignalBridgePart | null {
+    const signalAttachementDirection = Math.abs(
+      bridgeMountPosition.rotation - signal.mountPosition.rotation
+    ) % 360 < MAX_BRIDGE_DIRECTION_OFFSET
+      ? MountDirection.Up
+      : MountDirection.Down
+
+    const right = {
+      x: Math.sin(bridgeMountPosition.rotation),
+      y: Math.cos(bridgeMountPosition.rotation)
+    }
+    const delta = {
+      x: signal.mountPosition.x - bridgeMountPosition.x,
+      y: signal.mountPosition.y - bridgeMountPosition.y
+    }
+
+    const signedLateralOffset =
+      delta.x * right.x +
+      delta.y * right.y
+
+    let svgElement
+    if (signal.role !== SignalRole.None) {
+      for (const catalog of this.catalogService.getSignalSVGCatalog()) {
+        const screen = catalog.getSignalScreen(signal)
+        if (screen !== null) {
+          svgElement = screen
+          break // return the first screen != null
+        }
+      }
+    }
+
+    return {
+      guid: signal.guid,
+      signal: SvgBridgeSignal.fromSvgElement(
+        svgElement ?? SvgDraw.getErrorSVG(),
+        signedLateralOffset,
+        signalAttachementDirection,
+        signal.label ?? null
+      )
+    }
+  }
+
   /**
    * Connect Signals to Signal -bruecke, -ausleger
+   * @param guid GUID of the signalpart
    * @param parts the Signal
    * @param art bruecke or ausleger
    * @returns svg
    */
-  public static draw (guid: string, parts: SignalBridgePart[], signalMountType: SignalMountType): ISvgElement {
+  public static drawParts (guid: string, parts: SignalBridgePart[], signalMountType: SignalMountType): ISvgElement {
     // Calculate the final bridge/boom width by finding the screens
     // with the largest absolute offset from the mount
-    const signalOffsets = parts.map(ele => ele.signal.mountOffset * SvgDraw.SVG_OFFSET_SCALE_METER_TO_PIXEL_FACTOR)
+    const signalOffsets = parts.map(ele =>
+      ele.signal.mountSignedOffset * SvgDraw.SVG_OFFSET_SCALE_METER_TO_PIXEL_FACTOR)
     const maxOffset = Math.max(...signalOffsets, 0)
     const minOffset = Math.min(...signalOffsets, 0)
 
-    const width = SvgDrawBridge.SVG_BRIDGE_EXTRA_END_WIDTH + maxOffset - minOffset
+    const width = maxOffset - minOffset
+
     const svgWidth = width + SvgDrawSingleSignal.SVG_DRAWAREA
 
     const svg = SvgDraw.createSvgWithHead(svgWidth, SvgDrawSingleSignal.SVG_DRAWAREA)
-    const bridge = this.drawBridge(signalMountType, width)
+    const bridge = this.drawBridge(signalMountType, minOffset, maxOffset)
     bridge.setAttribute('class', SignalPart.Mast)
     bridge.setAttribute('id', `${SignalPart.Mast}_${guid}`)
     const g = document.createElement('g')
     g.appendChild(bridge)
-    g.setTranslate(svgWidth / 2 - 5, SvgDrawSingleSignal.SVG_DRAWAREA_CENTER)
+    g.setTranslate(svgWidth / 2, SvgDrawSingleSignal.SVG_DRAWAREA_CENTER)
 
     for (const [, part] of parts.entries()) {
       SvgDrawBridge.addSignal(g, part)
@@ -66,42 +140,71 @@ export default class SvgDrawBridge {
       'SignalBridge',
       svg,
       [],
-      new SvgPoint('nulpunkt', SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH, 0),
+      new SvgPoint('nulpunkt', 0, 0),
       bridgeBBox
     )
   }
 
-  private static drawBridge (signalMountType: SignalMountType, width: number) {
+  /**
+   * draws the line symbolizing the point where the Arm/Bruecke is standing on the ground.
+   * the ends point towards positive & negative y
+   */
+  private static drawBridgeFoundation (x: number, y: number) {
+    const line1 = document.createElement('path')
+    line1.setAttribute('stroke-width', '5')
+    line1.setAttribute('d', `M${x},${y - 10} L${x},${y - 20}`)
+
+    const line2 = document.createElement('path')
+    line2.setAttribute('stroke-width', '5')
+    line2.setAttribute('d', `M${x},${y + 10} L${x},${y + 20}`)
+
+    const group = document.createElement('g')
+    group.append(line1)
+    group.append(line2)
+    return group
+  }
+
+  /**
+   * draws box for arm / bruecke.
+   * @param signalMountType SignalMountType => if bruecke, draw two mounts, otherwise one
+   * @param extentLeft does not include START/END-WIDTH
+   * @param extentRight does not include START/END-WIDTH
+   * @returns SVG
+   */
+  private static drawBridge (signalMountType: SignalMountType, extentLeft:number, extentRight:number) {
+    let leftOverhang = 0
+    let rightOverhang = 0
+
+    if (signalMountType === SignalMountType.Signalbruecke) {
+      leftOverhang = SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH
+      rightOverhang = SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH
+    } else {
+      // condition <=> has signals on the left of the foundation
+      leftOverhang = (extentLeft < -EPS) ?
+        SvgDrawBridge.SVG_BRIDGE_EXTRA_END_WIDTH :
+        SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH
+
+      // condition <=> has signals on the right of the foundation
+      rightOverhang = (extentRight > EPS) ?
+        SvgDrawBridge.SVG_BRIDGE_EXTRA_END_WIDTH :
+        SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH
+    }
+
+    const width = extentRight - extentLeft + rightOverhang + leftOverhang
     const kombination = document.createElement('g')
     const rect = document.createElement('rect')
     rect.setAttribute('width', width.toString())
     rect.setAttribute('height', '20')
-    rect.setAttribute('y', '10')
+    rect.setAttribute('y', '-10')
+    rect.setAttribute('x', (-extentRight - rightOverhang).toString())
     rect.setAttribute('fill', 'white')
     kombination.appendChild(rect)
 
-    const sw = SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH
-    const line1 = document.createElement('path')
-    line1.setAttribute('stroke-width', '5')
-    line1.setAttribute('d', `M${sw},10 L${sw},0`)
-    kombination.appendChild(line1)
-
-    const line2 = document.createElement('path')
-    line2.setAttribute('stroke-width', '5')
-    line2.setAttribute('d', `M${sw},30 L${sw},40`)
-    kombination.appendChild(line2)
+    kombination.appendChild(this.drawBridgeFoundation(0,0))
 
     if (signalMountType === SignalMountType.Signalbruecke) {
-      const x = width - sw
-      const line3 = document.createElement('path')
-      line3.setAttribute('stroke-width', '5')
-      line3.setAttribute('d', `M${x},10 L${x},0`)
-      kombination.appendChild(line3)
-
-      const line4 = document.createElement('path')
-      line4.setAttribute('stroke-width', '5')
-      line4.setAttribute('d', `M${x},30 L${x},40`)
-      kombination.appendChild(line4)
+      const x = width - this.SVG_BRIDGE_EXTRA_START_WIDTH
+      kombination.appendChild(this.drawBridgeFoundation(x,0))
     }
 
     const bbox = fromCenterPointAndMasure([width / 2, 20], width, 40)
@@ -111,22 +214,24 @@ export default class SvgDrawBridge {
   }
 
   private static addSignal (bridge: Element, part: SignalBridgePart) {
-    const signalOffset = part.signal.mountOffset * SvgDraw.SVG_OFFSET_SCALE_METER_TO_PIXEL_FACTOR
     const g = document.createElement('g')
     g.setAttribute('class', SignalPart.Schirm)
     g.setAttribute('id', `${SignalPart.Schirm}_${part.guid}`)
+
     // Draw signal mount
-    const signalMount = this.drawSignalMount(signalOffset, part.signal.mountDirection)
+    const signalMount = this.drawSignalMount(part.signal)
     g.appendChild(signalMount)
+
     // Draw signal screen
-    const signalScreen = this.drawSignalScreen(signalOffset, part.signal)
+    const signalScreen = this.drawSignalScreen(part.signal)
+
     // Add signal label (if present)
     const signalAnchorPointBot = part.signal.anchor.find(ele => ele.id === AnchorPoint.bottom)
     if (part.signal.label != null && signalAnchorPointBot) {
       signalScreen.appendChild(
         SvgDraw.drawLabelAt(
           part.signal.label,
-          10,
+          15,
           signalAnchorPointBot.y,
           false,
           false,
@@ -139,21 +244,26 @@ export default class SvgDrawBridge {
     bridge.appendChild(g)
   }
 
-  private static drawSignalMount (signalOffset: number, mountDirection: MountDirection): Element {
+  private static drawSignalMount (signal: SvgBridgeSignal): Element {
+    const signalOffset = signal.mountSignedOffset * SvgDraw.SVG_OFFSET_SCALE_METER_TO_PIXEL_FACTOR
+    const x = -signalOffset // TODO why so negative?
+
+    const mountDirectionSign = signal.mountDirection === MountDirection.Up ? 1 : -1
+
+    const y = SvgDrawBridge.HALF_BRIDGE_THICKNESS * mountDirectionSign
+    const y_end = y + SvgDrawBridge.ATTACHED_SIGNAL_MOUNT_LENGTH * mountDirectionSign
+
     const mount = document.createElement('path')
-    mount.setAttribute('d', 'M0,10 L0,-5')
-    if (mountDirection === MountDirection.Down) {
-      mount.setTranslate(signalOffset + SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH, 0)
-    } else {
-      mount.setTranslate(signalOffset + SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH, 35)
-    }
+    mount.setAttribute('d', `M${x},${y} L${x},${y_end}`)
 
     const mountBBox = fromCenterPointAndMasure([1.25, 2.5], 2.5, 15)
     mount.appendChild(toHTMLElement(mountBBox))
     return mount
   }
 
-  private static drawSignalScreen (signalOffset: number, signal: SvgBridgeSignal): Element {
+  private static drawSignalScreen (signal: SvgBridgeSignal): Element {
+    const signalOffset = -signal.mountSignedOffset * SvgDraw.SVG_OFFSET_SCALE_METER_TO_PIXEL_FACTOR
+
     const svg = signal.content.cloneNode(true) as Element
     const signalAnchorPointTop = signal.anchor.find(ele => ele.id === AnchorPoint.top)
     const signalAnchorPointBot = signal.anchor.find(ele => ele.id === AnchorPoint.bottom)
@@ -161,9 +271,14 @@ export default class SvgDrawBridge {
       throw new Error('Invalid signal attached to bridge')
     }
 
+    const anchorStart = (signal.mountDirection === MountDirection.Down) ?
+      signalAnchorPointTop : signalAnchorPointBot
+
+    const MAGIC_NUMBER = -50
+    const y = anchorStart.y + MAGIC_NUMBER + this.HALF_BRIDGE_THICKNESS + this.ATTACHED_SIGNAL_MOUNT_LENGTH
+
     if (signal.mountDirection === MountDirection.Down) {
-      const x = signalOffset + signalAnchorPointTop.x + SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH
-      const y = signalAnchorPointTop.y - 5
+      const x = signalOffset + anchorStart.x
       // Flip the signal over, to preserve drawing orientation
       svg.setAttribute('transform', `translate(${x}, ${y}) rotate(180)`)
       signal.boundingBox.forEach(bbox => {
@@ -179,8 +294,7 @@ export default class SvgDrawBridge {
         }
       })
     } else {
-      const x = signalOffset - signalAnchorPointBot.x + SvgDrawBridge.SVG_BRIDGE_EXTRA_START_WIDTH
-      const y = signalAnchorPointBot.y - 5
+      const x = signalOffset - anchorStart.x
       svg.setAttribute('transform', `translate(${x}, ${y})`)
       signal.boundingBox.forEach(bbox => {
         if (!isEmpty(bbox)) {
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawCant.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawCant.ts
index 663daf2bf3..9935543baf 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawCant.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawCant.ts
@@ -21,7 +21,7 @@ export default class SvgDrawCant extends AbstractDrawSVG{
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public drawSVG<T extends object> (data: T, _label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, _label?: Label | undefined): ISvgElement | null {
     const svgImage = this.getSvgFromCatalog(data)
     if (svgImage === null) {
       console.warn('Unsupported object')
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawExternalElementControl.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawExternalElementControl.ts
index a2f94078fa..2b5a52d413 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawExternalElementControl.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawExternalElementControl.ts
@@ -20,7 +20,7 @@ export default class SvgDrawExternalElementControl extends AbstractDrawSVG {
   SVG_DRAWAREA = 500
   LABEL_FONT_SIZE = 16
 
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label): ISvgElement | null {
     const eec = data as ExternalElementControl
     const svg = this.getSvgFromCatalog(eec)
     if (svg === null) {
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawFMAComponent.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawFMAComponent.ts
index 7d5f1e6df7..13a85271e6 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawFMAComponent.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawFMAComponent.ts
@@ -7,13 +7,13 @@
  * http://www.eclipse.org/legal/epl-v20.html
  */
 
-import '@/util/ElementExtensions'
+import { FeatureType } from '@/feature/FeatureInfo'
+import { FMAComponent } from '@/model/FMAComponent'
 import { Label } from '@/model/Label'
 import { ISvgElement, ISvgPoint, SvgElement } from '@/model/SvgElement'
-import SvgDraw from './SvgDraw'
+import '@/util/ElementExtensions'
 import AbstractDrawSVG from '@/util/SVG/Draw/AbstractDrawSVG'
-import { FMAComponent } from '@/model/FMAComponent'
-import { FeatureType } from '@/feature/FeatureInfo'
+import SvgDraw from './SvgDraw'
 
 /**
  * Draw SVGs for FMA Components
@@ -42,7 +42,7 @@ export default class SvgDrawFMAComponent extends AbstractDrawSVG {
   SVG_INVERTED_LABEL_OFFSET_Y = 18
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label): ISvgElement | null {
     const fma = data as FMAComponent
     const svg = this.getSvgFromCatalog(data)
     if (svg === null) {
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawLockKey.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawLockKey.ts
index ca7f96513c..9df8f6ac24 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawLockKey.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawLockKey.ts
@@ -19,7 +19,7 @@ export default class SvgDrawLockKey extends AbstractDrawSVG{
   SVG_DRAWAREA = 500
   LABEL_FONT_SIZE = 14
 
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement | null {
     const lockkey = data as LockKey
     const svg = this.getSvgFromCatalog(data)
     if (svg === null) {
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawOthers.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawOthers.ts
index e709cec042..712f0adf78 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawOthers.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawOthers.ts
@@ -21,7 +21,7 @@ export default class SvgDrawOthers extends AbstractDrawSVG{
     return FeatureType.Unknown
   }
 
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement | null {
     const svgImage = this.getSvgFromCatalog(data)
     if (svgImage === null) {
       console.warn('Unsupported object')
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawPZB.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawPZB.ts
index 0361125915..53b9b9ae86 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawPZB.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawPZB.ts
@@ -11,8 +11,8 @@ import { FeatureType } from '@/feature/FeatureInfo'
 import { Label } from '@/model/Label'
 import { PZB, PZBEffectivity } from '@/model/PZB'
 import { ISvgElement, SvgElement } from '@/model/SvgElement'
-import AbstractDrawSVG from '@/util/SVG/Draw/AbstractDrawSVG'
 import '@/util/ElementExtensions'
+import AbstractDrawSVG from '@/util/SVG/Draw/AbstractDrawSVG'
 import SvgDraw from './SvgDraw'
 
 /**
@@ -36,7 +36,7 @@ export default class SvgDrawPZB extends AbstractDrawSVG {
   // Label font size
   LABEL_FONT_SIZE = 14
 
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement | null {
     const pzb = data as PZB
     const svg = this.getSvgFromCatalog(data)
     if (svg === null) {
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawSignal.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawSignal.ts
index 04c06a8ae3..7fdde25db4 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawSignal.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawSignal.ts
@@ -9,12 +9,10 @@
 
 import { FeatureType } from '@/feature/FeatureInfo'
 import { Label } from '@/model/Label'
-import { MountDirection, SignalRole } from '@/model/Signal'
+import { SignalRole } from '@/model/Signal'
 import { SignalMount, SignalMountType } from '@/model/SignalMount'
-import { ISvgElement, MAX_BRIDGE_DIRECTION_OFFSET, SvgBridgeSignal, ZusatzSignal } from '@/model/SvgElement'
-import { distance } from '@/util/Math'
+import { ISvgElement, ZusatzSignal } from '@/model/SvgElement'
 import SvgDraw from '@/util/SVG/Draw/SvgDraw'
-import SvgDrawBridge, { SignalBridgePart } from '@/util/SVG/Draw/SvgDrawBridge'
 import SvgDrawSingleSignal from '@/util/SVG/Draw/SvgDrawSingleSignal'
 import AbstractDrawSVG from './AbstractDrawSVG'
 
@@ -25,23 +23,19 @@ import AbstractDrawSVG from './AbstractDrawSVG'
  */
 export default class SvgDrawSignal extends AbstractDrawSVG {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement | null {
     const signalMount = data as SignalMount
-    const isValidate = this.validateSignal(signalMount)
-    if (!isValidate) {
-      return SvgDraw.getErrorSVG()
-    }
 
-    if (this.isMultiSignal(signalMount)) {
-      return this.getMultiSignalScreen(signalMount)
-    }
+    // return null => draw error, if all other drawers also return null.
+    if (!this.validateSignal(signalMount)) return null
+
+    if (this.isMultiSignal(signalMount)) return null
 
     const signal = signalMount.attachedSignals[0]
-    const mount = this.catalogService.getSignalMountSVGCatalog()
+    const mount : ISvgElement | null = this.catalogService.getSignalMountSVGCatalog()
       .getSignalMountSVG(this.getMountType(signalMount))
-    if (mount === null) {
-      return SvgDraw.getErrorSVG()
-    }
+
+    if (mount === null) return null
 
     const extra = this.getDirectionScreens(signalMount).map(screen => {
       const directionBoard = this.catalogService.getDirectionBoardSVGCatalog()
@@ -98,36 +92,8 @@ export default class SvgDrawSignal extends AbstractDrawSVG {
     return true
   }
 
-  private getMultiSignalScreen (signalMount: SignalMount) {
-    const bridgeParts: SignalBridgePart[] = []
-    signalMount.attachedSignals.forEach(signal => {
-      for (const catalog of this.catalogService.getSignalSVGCatalog()) {
-        const screen = signal.role === SignalRole.None
-          ? SvgDraw.getErrorSVG()
-          : catalog.getSignalScreen(signal)
-        if (screen !== null) {
-          const offset = distance(
-            [signalMount.position.x, signalMount.position.y],
-            [signal.mountPosition.x, signal.mountPosition.y]
-          )
-          const direction = Math.abs(
-            signalMount.position.rotation - signal.mountPosition.rotation
-          ) < MAX_BRIDGE_DIRECTION_OFFSET
-            ? MountDirection.Up
-            : MountDirection.Down
-          bridgeParts.push({
-            guid: signal.guid,
-            signal: SvgBridgeSignal.fromSvgElement(screen, offset, direction, signal.label ?? null)
-          })
-        }
-      }
-    })
-    return SvgDrawBridge.draw(signalMount.guid, bridgeParts, signalMount.mountType)
-  }
-
   public isMultiSignal (signalMount: SignalMount): boolean {
-    return signalMount.mountType === SignalMountType.SignalauslegerLinks ||
-      signalMount.mountType === SignalMountType.SignalauslegerMitte ||
+    return signalMount.mountType === SignalMountType.Signalausleger ||
       signalMount.mountType === SignalMountType.Signalbruecke
   }
 
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawTrackClose.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawTrackClose.ts
index d67e62e8b1..e237a8fd7d 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawTrackClose.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawTrackClose.ts
@@ -25,7 +25,7 @@ export default class SvgDrawTrackClose extends AbstractDrawSVG {
   SVG_LABEL_OFFSET_X = 20
   LABEL_FONT_SIZE = 14
 
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement | null {
     const trackclose = data as TrackClose
     const svg = this.getSvgFromCatalog(data)
     if (svg === null) {
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawTrackSwitch.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawTrackSwitch.ts
index bc2688e4c4..ec87d7bde8 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawTrackSwitch.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawTrackSwitch.ts
@@ -45,7 +45,7 @@ export default class SvgDrawTrackSwitch extends AbstractDrawSVG {
   LABEL_FONT_SIZE = 25
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement | null {
     const drawData = data as {featureData: TrackSwitchFeatureData, drawPart: TrackSwitchPart,}
     switch (drawData.drawPart) {
       case TrackSwitchPart.Main:
diff --git a/web/siteplan/src/util/SVG/Draw/SvgDrawTracklock.ts b/web/siteplan/src/util/SVG/Draw/SvgDrawTracklock.ts
index 1d34240250..01713bb83d 100644
--- a/web/siteplan/src/util/SVG/Draw/SvgDrawTracklock.ts
+++ b/web/siteplan/src/util/SVG/Draw/SvgDrawTracklock.ts
@@ -37,7 +37,7 @@ export default class SvgDrawTracklock extends AbstractDrawSVG {
   SVG_LABEL_OFFSET_Y = -60
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement {
+  public drawSVG<T extends object> (data: T, label?: Label | undefined): ISvgElement | null {
     const tracklock = data as TrackLock
     const svg = this.getSvgFromCatalog(data)
     if (svg === null) {
diff --git a/web/siteplan/src/util/SVG/SVGCatalog/SignalSVGCatalog.ts b/web/siteplan/src/util/SVG/SVGCatalog/SignalSVGCatalog.ts
index 4c50f9d5c2..e9dd47274e 100644
--- a/web/siteplan/src/util/SVG/SVGCatalog/SignalSVGCatalog.ts
+++ b/web/siteplan/src/util/SVG/SVGCatalog/SignalSVGCatalog.ts
@@ -11,6 +11,9 @@ import { Signal } from '@/model/Signal'
 import { ISvgElement } from '@/model/SvgElement'
 import AbstractSVGCatalog from './AbstractSVGCatalog'
 
+const notDrawnScreens: string[] = ['Zs1','Zs8']
+const onlyDrawnAlleinstehend: string[] = ['Ne14', 'Zs2', 'Zs3', 'Zs3v', 'Zs6']
+
 export default abstract class SignalSVGCatalog extends AbstractSVGCatalog {
   /**
      * Find Screen of the Signal
@@ -18,7 +21,14 @@ export default abstract class SignalSVGCatalog extends AbstractSVGCatalog {
      * @returns first screen of this signal
      */
   public getSignalScreen (signal: Signal): ISvgElement | null {
-    for (const screen of signal.screen) {
+    let drawnSignals = signal.screen.filter(s => !notDrawnScreens.includes(s.screen))
+
+    if (drawnSignals.length > 1) {
+      // don't draw alleinstehende screens
+      drawnSignals = drawnSignals.filter(s => !onlyDrawnAlleinstehend.includes(s.screen))
+    }
+
+    for (const screen of drawnSignals) {
       const result = this.getSVGFromCatalog(screen.screen)
       if (result !== null) {
         return result
diff --git a/web/siteplan/src/util/SVG/SVGCatalog/Signals/AdditiveSignalScreen.ts b/web/siteplan/src/util/SVG/SVGCatalog/Signals/AdditiveSignalScreen.ts
index 99907f4b1a..acdebad9ca 100644
--- a/web/siteplan/src/util/SVG/SVGCatalog/Signals/AdditiveSignalScreen.ts
+++ b/web/siteplan/src/util/SVG/SVGCatalog/Signals/AdditiveSignalScreen.ts
@@ -13,7 +13,7 @@ import { AndereSignalGroup } from '../../SvgEnum'
 import SignalSVGCatalog from '../SignalSVGCatalog'
 
 export default class AdditiveSignalScreen extends SignalSVGCatalog {
-  private readonly alleinstehendeScreens = ['Zs2', 'Zs2v', 'Zs3', 'Zs3v', 'Zs6', 'Zp9', 'Zp9Ls', 'Zp10', 'Zp10Ls']
+  private readonly alleinstehendeScreens = ['Zs2', 'Zs2v', 'Zs3', 'Zs3v', 'Zs6', 'Zp9', 'Zp9Ls', 'Zp10', 'Zp10Ls', 'Ne2']
 
   public getSignalScreen (signal: Signal): ISvgElement | null {
     return this.getStandingAloneAdditiveSignal(signal)