diff --git a/Lora-Map/resources/icons/marker/Marker.svg b/Lora-Map/resources/icons/marker/Marker.svg
index 1e8d0a3..def7e6f 100644
--- a/Lora-Map/resources/icons/marker/Marker.svg
+++ b/Lora-Map/resources/icons/marker/Marker.svg
@@ -27,43 +27,47 @@
   <g inkscape:groupmode="layer" id="marker-icon" inkscape:label="Icon">
     <g id="person" transform="translate(42.5 45) scale(0.8)">
       <defs id="people-def">
-          <style type="text/css">
-              #person-layer-org g {
-              display: none;
-              }
-              #person-layer-funct g {
-              display: none;
-              }
-              #person-layer-rang g {
-              display: none;
-              }
-              #person-layer-typ g {
-              display: none;
-              }
+        <style type="text/css">
+          #person-layer-org g {
+            display: none;
+          }
+          #person-layer-funct g {
+            display: none;
+          }
+          #person-layer-rang g {
+            display: none;
+          }
+          #person-layer-typ g {
+            display: none;
+          }
 
-              #person-layer-org rect {
-              stroke: black;
-              stroke-width: 3px;
-              }
+          #person-layer-org rect {
+            stroke: black;
+            stroke-width: 3px;
+          }
 
-              #person-layer-funct path {
-              stroke: #000000;
-              stroke-width: 3px;
-              fill: #000000;
-              }
+          #person-layer-funct path {
+            stroke: #000000;
+            stroke-width: 3px;
+            fill: #000000;
+          }
 
-              #person-layer-rang circle {
-              fill: #000000;
-              }
+          #person-layer-rang circle {
+            fill: #000000;
+          }
 
-              #person-layer-typ tspan {
-              font-size: 20px;
-              font-family: DIN1451;
-              text-align: center;
-              text-anchor: middle;
-              fill: #000000;
-              }
-          </style>
+          #person-layer-typ tspan {
+            font-size: 20px;
+            font-family: DIN1451;
+            text-align: center;
+            text-anchor: middle;
+            fill: #000000;
+          }
+          #person-layer-typ line {
+            stroke-width: 3px;
+            stroke: black;
+          }
+        </style>
       </defs>
       <g inkscape:groupmode="layer" id="person-layer-org" inkscape:label="Organisation">
         <g inkscape:groupmode="layer" id="person-layer-org-thw" inkscape:label="THW">
@@ -113,6 +117,19 @@
       </g>
       <g inkscape:groupmode="layer" id="person-layer-typ" inkscape:label="Typ">
         <text><tspan y="42" x="0" id="person-layer-typ-text"></tspan></text>
+        <g id="person-layer-typ-loesch">
+          <line x1="-35" y1="35.5" x2="35" y2="35.5" />
+          <line x1="17.5" y1="35.5" x2="25" y2="26" />
+          <line x1="17.5" y1="35.5" x2="25" y2="44" />
+        </g>
+        <g id="person-layer-typ-sani">
+          <line x1="0" y1="0" x2="0" y2="70" />
+          <line x1="-35" y1="35.5" x2="35" y2="35.5" />
+        </g>
+        <g id="person-layer-typ-betreu">
+          <line x1="-17" y1="53" x2="0" y2="35.5" />
+          <line x1="17" y1="53" x2="0" y2="35.5" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/Lora-Map/resources/icons/marker/Person.svg b/Lora-Map/resources/icons/marker/Person.svg
index 42aff07..ee14d4c 100644
--- a/Lora-Map/resources/icons/marker/Person.svg
+++ b/Lora-Map/resources/icons/marker/Person.svg
@@ -13,137 +13,115 @@
    width="74.953316mm"
    height="84.703323mm"
    viewBox="-37.5 -12 74.953316 84.703323">
-  <g id="person">
-    <defs>
-      <style type="text/css">
-        <![CDATA[
-        #person-layer-org g {
-          display: none;
-        }
-        #person-layer-funct g {
-          display: none;
-        }
-        #person-layer-rang g {
-          display: none;
-        }
-        #person-layer-typ g {
-          display: none;
-        }
-        
-        #person-layer-org rect {
-          width: 50px;
-          height: 50px;
-          y: 0px;
-          x: 0px;
-          stroke: black;
-          stroke-width: 3px;
-          transform: rotate(45);
-        }
-        
-        #person-layer-funct path {
-          stroke: #000000;
-          stroke-width: 3px;
-          fill: #000000;
-        }
-        
-        #person-layer-rang circle {
-          r: 3px;
-          fill: #000000;
-        }
-        
-        #person-layer-typ tspan {
-          x: 0px;
-          y: 42px;
-          font-size:20px;
-          font-family:'DIN 1451 Mittelschrift';
-          text-align:center;
-          text-anchor:middle;
-          fill:#ffffff;
-        }
-      ]]>
-      </style>
-      <style>
-        <![CDATA[
-        #person-layer-org #person-layer-org-thw {
-          display: inline;
-        }
-        #person-layer-funct #person-layer-funct-fueh {
-          display: inline;
-        }
-        #person-layer-rang #person-layer-rang-trupp {
-          display: inline;
-        }
-        #person-layer-typ #person-layer-typ-b1 {
-          display: inline;
-        }
-      ]]>
-      </style>
-    </defs>
-    <g inkscape:groupmode="layer" id="person-layer-org" inkscape:label="Organisation">
-      <g inkscape:groupmode="layer" id="person-layer-org-thw" inkscape:label="THW">
-        <rect style="fill: #0d468b;" />
-      </g>
-      <g inkscape:groupmode="layer" id="person-layer-org-fw" inkscape:label="Feuerwehr">
-        <rect style="fill: #b41302;" />
-      </g>
-      <g inkscape:groupmode="layer" id="person-layer-org-hilo" inkscape:label="Hilo">
-        <rect style="fill: #ffffff;" />
-      </g>
-      <g inkscape:groupmode="layer" id="person-layer-org-pol" inkscape:label="Polizei">
-        <rect style="fill: #2a8626;" />
-      </g>
-      <g inkscape:groupmode="layer" id="person-layer-org-fueh" inkscape:label="Führung">
-        <rect style="fill: #ffdf00;" />
-      </g>
-      <g inkscape:groupmode="layer" id="person-layer-org-sonst" inkscape:label="Sonstig">
-        <rect style="fill: #ffa13e;" />
-      </g>
-    </g>
-    <g inkscape:groupmode="layer" id="person-layer-funct" inkscape:label="Funktion">
-      <g inkscape:groupmode="layer" id="person-layer-funct-sonder" inkscape:label="Sonder">
-        <path d="M -10,10 H 10" />
-      </g>
-      <g inkscape:groupmode="layer" id="person-layer-funct-fueh" inkscape:label="Führungskraft">
-        <path d="M -10,10 H 10 L 0,0 Z" />
-      </g>
-    </g>
-    <g inkscape:groupmode="layer" id="person-layer-rang" inkscape:label="Rang">
-      <g inkscape:groupmode="layer" id="person-layer-rang-trupp" inkscape:label="Truppführer">
-        <circle cx="0" cy="-8" />
-      </g>
-      <g inkscape:groupmode="layer" id="person-layer-rang-grupp" inkscape:label="Gruppenführer">
-        <g style="display: inline;">
-          <circle cx="-4.5" cy="-8" />
-          <circle cx="4.5" cy="-8" />
-        </g>
-      </g>
-      <g inkscape:groupmode="layer" id="person-layer-rang-zug" inkscape:label="Zugführer">
-        <g style="display: inline;">
-          <circle cx="-9" cy="-8" />
-          <circle cx="0" cy="-8" />
-          <circle cx="9" cy="-8" />
-        </g>
-      </g>
-    </g>
-    <g inkscape:groupmode="layer" id="person-layer-typ" inkscape:label="Typ">
-    <g inkscape:groupmode="layer" id="person-layer-typ-b1" inkscape:label="B1">
-      <text><tspan>B1</tspan></text>
-    </g>
-    <g inkscape:groupmode="layer" id="person-layer-typ-b2" inkscape:label="B2">
-      <text><tspan>B2</tspan></text>
-    </g>
-    <g inkscape:groupmode="layer" id="person-layer-typ-b" inkscape:label="B">
-      <text><tspan>B</tspan></text>
-    </g>
-    <g inkscape:groupmode="layer" id="person-layer-typ-tz-1" inkscape:label="TZ-1">
-      <text><tspan>TZ-1</tspan></text>
-    </g>
-    <g inkscape:groupmode="layer" id="person-layer-typ-tz-2" inkscape:label="TZ-2">
-      <text><tspan>TZ-2</tspan></text>
-    </g>
-    <g inkscape:groupmode="layer" id="person-layer-typ-tz" inkscape:label="TZ">
-      <text><tspan>TZ</tspan></text>
-    </g>
-  </g>
+  <g id="person">
+    <defs id="people-def">
+      <style type="text/css">
+        #person-layer-org g {
+        display: none;
+        }
+        #person-layer-funct g {
+        display: none;
+        }
+        #person-layer-rang g {
+        display: none;
+        }
+        #person-layer-typ g {
+        display: none;
+        }
+
+        #person-layer-org rect {
+        stroke: black;
+        stroke-width: 3px;
+        }
+
+        #person-layer-funct path {
+        stroke: #000000;
+        stroke-width: 3px;
+        fill: #000000;
+        }
+
+        #person-layer-rang circle {
+        fill: #000000;
+        }
+
+        #person-layer-typ tspan {
+        font-size: 20px;
+        font-family: DIN1451;
+        text-align: center;
+        text-anchor: middle;
+        fill: #000000;
+        }
+        #person-layer-typ line {
+        stroke-width: 3px;
+        stroke: black;
+        }
+      </style>
+      <style type="text/css">
+        #person-layer-org #person-layer-org-thw {display:inline;}
+        #person-layer-typ #person-layer-typ-loesch {display:inline;}
+      </style>
+    </defs>
+    <g inkscape:groupmode="layer" id="person-layer-org" inkscape:label="Organisation">
+      <g inkscape:groupmode="layer" id="person-layer-org-thw" inkscape:label="THW">
+        <rect style="fill: #0069b4;" height="50" width="50" transform="rotate(45)" />
+      </g>
+      <g inkscape:groupmode="layer" id="person-layer-org-fw" inkscape:label="Feuerwehr">
+        <rect style="fill: #e30613;" height="50" width="50" transform="rotate(45)" />
+      </g>
+      <g inkscape:groupmode="layer" id="person-layer-org-hilo" inkscape:label="Hilo">
+        <rect style="fill: #ffffff;" height="50" width="50" transform="rotate(45)" />
+      </g>
+      <g inkscape:groupmode="layer" id="person-layer-org-pol" inkscape:label="Polizei">
+        <rect style="fill: #13a538;" height="50" width="50" transform="rotate(45)" />
+      </g>
+      <g inkscape:groupmode="layer" id="person-layer-org-fueh" inkscape:label="Führung">
+        <rect style="fill: #ffed00;" height="50" width="50" transform="rotate(45)" />
+      </g>
+      <g inkscape:groupmode="layer" id="person-layer-org-sonst" inkscape:label="Sonstig">
+        <rect style="fill: #ec6725;" height="50" width="50" transform="rotate(45)" />
+      </g>
+    </g>
+    <g inkscape:groupmode="layer" id="person-layer-funct" inkscape:label="Funktion">
+      <g inkscape:groupmode="layer" id="person-layer-funct-sonder" inkscape:label="Sonder">
+        <path d="M -10,10 H 10" />
+      </g>
+      <g inkscape:groupmode="layer" id="person-layer-funct-fueh" inkscape:label="Führungskraft">
+        <path d="M -10,10 H 10 L 0,0 Z" />
+      </g>
+    </g>
+    <g inkscape:groupmode="layer" id="person-layer-rang" inkscape:label="Rang">
+      <g inkscape:groupmode="layer" id="person-layer-rang-trupp" inkscape:label="Truppführer">
+        <circle cx="0" cy="-8" r="3" />
+      </g>
+      <g inkscape:groupmode="layer" id="person-layer-rang-grupp" inkscape:label="Gruppenführer">
+        <g style="display: inline;">
+          <circle cx="-4.5" cy="-8" r="3" />
+          <circle cx="4.5" cy="-8" r="3" />
+        </g>
+      </g>
+      <g inkscape:groupmode="layer" id="person-layer-rang-zug" inkscape:label="Zugführer">
+        <g style="display: inline;">
+          <circle cx="-9" cy="-8" r="3" />
+          <circle cx="0" cy="-8" r="3" />
+          <circle cx="9" cy="-8" r="3" />
+        </g>
+      </g>
+    </g>
+    <g inkscape:groupmode="layer" id="person-layer-typ" inkscape:label="Typ">
+      <text><tspan y="42" x="0" id="person-layer-typ-text"></tspan></text>
+      <g id="person-layer-typ-loesch">
+        <line x1="-35" y1="35.5" x2="35" y2="35.5" />
+        <line x1="17.5" y1="35.5" x2="25" y2="26" />
+        <line x1="17.5" y1="35.5" x2="25" y2="44" />
+      </g>
+      <g id="person-layer-typ-sani">
+        <line x1="0" y1="0" x2="0" y2="70" />
+        <line x1="-35" y1="35.5" x2="35" y2="35.5" />
+      </g>
+      <g id="person-layer-typ-betreu">
+        <line x1="-17" y1="53" x2="0" y2="35.5" />
+        <line x1="17" y1="53" x2="0" y2="35.5" />
+      </g>
+    </g>
   </g>
 </svg>