diff --git a/Layout/default/AddressDB/View.php b/Layout/default/AddressDB/View.php
index e3490844c..33814c0ea 100644
--- a/Layout/default/AddressDB/View.php
+++ b/Layout/default/AddressDB/View.php
@@ -180,7 +180,16 @@
                 <?php foreach($address->wohneinheiten as $unit): ?>
                   <tr>
                     <td>
-                      <a href="#" data-home-id="<?=$unit->id?>" data-home-contact title="Kontakte bearbeiten"><i class="fas fa-users-cog text-primary"></i></a>
+                      <?php
+                        $contacts = $unit->contact ? json_decode($unit->contact, true) : [];
+                        $contactCount = is_array($contacts) ? count($contacts) : 0;
+                      ?>
+                      <a href="#" data-home-id="<?=$unit->id?>" data-home-contact title="Kontakte bearbeiten<?=$contactCount ? ' (' . $contactCount . ')' : ''?>" style="position: relative; display: inline-block;">
+                        <i class="fas fa-users-cog <?=$contactCount ? 'text-success' : 'text-muted'?>"></i>
+                        <?php if($contactCount): ?>
+                          <span style="position: absolute; top: -8px; right: -8px; background: #28a745; color: white; border-radius: 50%; width: 16px; height: 16px; font-size: 10px; display: flex; align-items: center; justify-content: center; font-weight: bold; padding: 0; box-sizing: border-box;"><?=$contactCount?></span>
+                        <?php endif; ?>
+                      </a>
                       <a href="<?=self::getUrl("ADBWohneinheit", "edit", ["id" => $unit->id])?>"><i class="fas fa-edit"></i></a>
                     </td>
                     <td><?=$unit->id?></td>
diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 10367c511..aa3488ba6 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -1083,7 +1083,16 @@ $pagination_entity_name = "Vorbestellungen";
                                     <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                                         <div class="preorder-campaign-table-actions">
                                             <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
-                                                <a href="#" data-home-id="<?=$preorder->adb_wohneinheit_id?>" data-home-contact title="Kontakte bearbeiten"><i class="fas fa-users-cog text-primary"></i></a>
+                                                <?php
+                                                  $contacts = ($preorder->adb_wohneinheit_id && $preorder->adb_wohneinheit && $preorder->adb_wohneinheit->contact) ? json_decode($preorder->adb_wohneinheit->contact, true) : [];
+                                                  $contactCount = is_array($contacts) ? count($contacts) : 0;
+                                                ?>
+                                                <a href="#" data-home-id="<?=$preorder->adb_wohneinheit_id?>" data-home-contact title="Kontakte bearbeiten<?=$contactCount ? ' (' . $contactCount . ')' : ''?>" style="position: relative; display: inline-block;">
+                                                    <i class="fas fa-users-cog <?=$contactCount ? 'text-success' : 'text-muted'?>"></i>
+                                                    <?php if($contactCount): ?>
+                                                      <span style="position: absolute; top: -8px; right: -8px; background: #28a745; color: white; border-radius: 50%; width: 16px; height: 16px; font-size: 10px; display: flex; align-items: center; justify-content: center; font-weight: bold; padding: 0; box-sizing: border-box;"><?=$contactCount?></span>
+                                                    <?php endif; ?>
+                                                </a>
                                                 <a href="<?=self::getUrl("Preorder", "edit", ["id" => $preorder->id])?>"><i class="far fa-edit"  title="Vorbestellung Bearbeiten"></i></a>
                                             <?php endif; ?>
                                             <?php if($me->isAdmin()): ?>