diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 12a3bcdd3..09b91df56 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -563,11 +563,11 @@
                 <td onclick="toggleOrder(<?=$order->id?>)">
                   <?php if(is_array($order->terminations) && count($order->terminations)): ?>
                     <?php if($order->terminations[0]->status->code >= TT_TERMSTATUS_CONNECTED): ?>
-                      <span class="status connected" title="Anschluss connected">CON</span>
+                      <span class="status connected bg-connected" title="Anschluss connected">CON</span>
                     <?php elseif($order->terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?>
-                      <a href="<?=self::getUrl("Linework", "Index", ["filter" => ["code" => $order->terminations[0]->code, "status_id" => ""]])?>" target="_blank"><span class="status building-connected" title="Tiefbau erledigt">B-C</span></a>
+                      <a href="<?=self::getUrl("Linework", "Index", ["filter" => ["code" => $order->terminations[0]->code, "status_id" => ""]])?>" target="_blank"><span class="status building-connected bg-building-connected" title="Tiefbau erledigt">B-C</span></a>
                     <?php else: ?>
-                      <a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $order->terminations[0]->building->code, "status_id" => ""]])?>" target="_blank"><span class="status not-connected" title="Tiefbau ausständig">BNC</span></a>
+                      <a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $order->terminations[0]->building->code, "status_id" => ""]])?>" target="_blank"><span class="status not-connected bg-not-conntected" title="Tiefbau ausständig">BNC</span></a>
                     <?php endif; ?>
                   <?php endif; ?>
                   
@@ -641,12 +641,12 @@
                 </td>
               </tr>
               <tr class="building-list-tr <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-dates-<?=$order->id?>">
-                <td onclick="toggleOrder(<?=$order->id?>)" colspan="2" class="pt-0 text-left text-pink" style="border-top: none;">
+                <td onclick="toggleOrder(<?=$order->id?>)" colspan="2" class="pt-0 text-left" style="border-top: none;">
                   <?php if($order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?>
-                    <?=mfLayout::strtrim($order->terminations[0]->lineworker->getCompanyOrName(), 15)?>
+                    <span class="building-connected" title="<?=$order->terminations[0]->lineworker->getCompanyOrName()?>"><?=mfLayout::strtrim($order->terminations[0]->lineworker->getCompanyOrName(), 15)?></span>
                   <?php endif; ?>
                   <?php if($order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code < TT_BUILDINGSTATUS_CONNECTED): ?>
-                    <?=mfLayout::strtrim($order->terminations[0]->building->pipeworker->getCompanyOrName(), 15)?>
+                    <span class="not-connected" title="<?=$order->terminations[0]->lineworker->getCompanyOrName()?>"><?=mfLayout::strtrim($order->terminations[0]->building->pipeworker->getCompanyOrName(), 15)?></span>
                   <?php endif; ?>
                 </td>
                 <td onclick="toggleOrder(<?=$order->id?>)" colspan="7" class="pt-0" style="border-top: none;">
diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css
index 9eff74e00..6477c6ebe 100644
--- a/public/assets/css/thetool.css
+++ b/public/assets/css/thetool.css
@@ -256,21 +256,27 @@ td.controls {
   border-radius: 8px;
 }
 
-.status.not-connected {
-  background-color: red;
+.not-connected {
   color: red;
 }
+.bg-not-conntected {
+  background-color: red;
+}
 
-.status.building-connected {
-  background-color: orange;
+.building-connected {
   color: orange;
 }
-
-.status.connected {
-  background-color: limegreen;
-  color: limegreen;
+.bg-building-connected {
+  background-color: orange;
 }
 
+
+.connected {
+  color: limegreen;
+}
+.bg-connected {
+  background-color: limegreen;
+}
 .invalid {
   border-color: red !important;
 }