diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 93873d456..e776eafb8 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -401,6 +401,7 @@
             ["zip", preorder.adb_plz],
             ["city", preorder.adb_ort],
             ["type", preorder.type_label],
+            ["typestyle", "color: #000; background-color: " + icon_color],
             ["adrcd", preorder.adrcd],
             ["extref", preorder.extref ? preorder.extref : ""],
             ["gps", (preorder.gps_lat && preorder.gps_long) ? preorder.gps_lat + ", " + preorder.gps_long : ""],
diff --git a/Layout/default/Preorder/include/preorder_popup.php b/Layout/default/Preorder/include/preorder_popup.php
index 116978bf8..e32a66709 100644
--- a/Layout/default/Preorder/include/preorder_popup.php
+++ b/Layout/default/Preorder/include/preorder_popup.php
@@ -10,23 +10,23 @@ ob_start();
 
 <table class="table table-sm table-striped">
   <tr>
-    <th class="font-weight-bold">GWR Adrcd:</th>
-    <td>{{ADRCD}}</td>
-  </tr><tr>
-    <th class="font-weight-bold">Extref:</th>
-    <td>{{EXTREF}}</td>
+    <th class="font-weight-bold">Bestelltyp:</th>
+    <td style="{{TYPESTYLE}}">{{TYPE}}</td>
   </tr><tr>
     <th class="font-weight-bold">Gebäudetyp:</th>
     <td>{{CONNECTIONTYPE}}</td>
-  </tr><tr>
-    <th class="font-weight-bold">Bestelltyp:</th>
-    <td>{{TYPE}}</td>
   </tr><tr>
     <th class="font-weight-bold">Anschlüsse:</th>
     <td>{{COUNT}}</td>
   </tr><tr>
     <th class="font-weight-bold">GPS:</th>
     <td><a href="https://maps.google.com/maps?t=k&q=loc:{{GPS}}" target="_blank">{{GPS}}</a></td>
+  </tr><tr>
+    <th class="font-weight-bold">GWR Adrcd:</th>
+    <td>{{ADRCD}}</td>
+  </tr><tr>
+    <th class="font-weight-bold">Extref:</th>
+    <td>{{EXTREF}}</td>
   </tr><tr>
     <th class="font-weight-bold">Kontakt:</th>
     <td>{{CONTACT}}</td>