diff --git a/assets/images/icons.svg b/assets/images/icons.svg
index f0dcfe4..bda3176 100644
--- a/assets/images/icons.svg
+++ b/assets/images/icons.svg
@@ -159,6 +159,10 @@
         <!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
         <path d="M204.3 3c11.6-6.4 26.2-2.3 32.6 9.3l31.9 57.4c1.3 2.3 3.6 3.8 6.2 4.1l33.8 3.4c24.1 2.4 46.9 12 65.4 27.6L503.5 213.6c10.1 8.5 11.4 23.7 2.9 33.8s-23.7 11.4-33.8 2.9l-68.2-57.5-82.3 43.9 24.7 18.9c24.9 19 34.6 51.9 24.1 81.4l-28.2 79c-1.4 3.8-3.6 7-6.3 9.6l93.3 35.7c4.6 1.8 9.4 2.6 14.3 2.6H472c13.3 0 24 10.7 24 24s-10.7 24-24 24H443.8c-10.8 0-21.4-2-31.5-5.8L60.1 371.3c-11.5-4.4-22-11.2-30.8-20L7 329c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l22.4 22.4c4 4 8.7 7.1 14 9.1l19.4 7.4c-2.9-11.4 2.9-23.4 14-28.1L192 272l0-68.2c0-21.2 12-40.6 31-50.1L284.4 123l-14.1-1.4c-18.3-1.8-34.5-12.5-43.4-28.5L195 35.7c-6.4-11.6-2.3-26.2 9.3-32.6zm91.8 407.2c-.3-3.4 .1-6.9 1.3-10.3l28.2-79c3.5-9.8 .3-20.8-8-27.1L240 234.4l0 42.9c0 16.1-9.7 30.7-24.6 36.9L134 348.2l162.1 62.1zM259.6 189l20.5 15.7 84.6-45.1-17.2-14.5L259.6 189zM384 48a48 48 0 1 1 96 0 48 48 0 1 1 -96 0z"/>
     </symbol>
+    <symbol id="icon-hourglass" fill="currentColor" stroke="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512">
+        <!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
+        <path d="M24 0C10.7 0 0 10.7 0 24S10.7 48 24 48h8V67c0 40.3 16 79 44.5 107.5L158.1 256 76.5 337.5C48 366 32 404.7 32 445v19H24c-13.3 0-24 10.7-24 24s10.7 24 24 24H360c13.3 0 24-10.7 24-24s-10.7-24-24-24h-8V445c0-40.3-16-79-44.5-107.5L225.9 256l81.5-81.5C336 146 352 107.3 352 67V48h8c13.3 0 24-10.7 24-24s-10.7-24-24-24H24zM192 289.9l81.5 81.5C293 391 304 417.4 304 445v19H80V445c0-27.6 11-54 30.5-73.5L192 289.9zm0-67.9l-81.5-81.5C91 121 80 94.6 80 67V48H304V67c0 27.6-11 54-30.5 73.5L192 222.1z"/>
+    </symbol>
     <!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
     <symbol id="icon-spinner" viewBox="0 0 44 44" xmlns="http://www.w3.org/2000/svg" stroke="currentColor">
         <g fill="none" fill-rule="evenodd" stroke-width="2">
diff --git a/assets/styles/components/button.css b/assets/styles/components/button.css
index 7bdd8a6..6528066 100644
--- a/assets/styles/components/button.css
+++ b/assets/styles/components/button.css
@@ -2,10 +2,14 @@
     @apply inline-flex justify-center rounded-lg text-sm uppercase font-semibold py-2.5 px-4 bg-primary text-white hover:bg-primary/80 shadow-md;
 }
 
+.btn--small {
+    @apply py-1 px-2 rounded-sm;
+}
+
 .btn--secondary {
     @apply bg-secondary text-gray-800 hover:bg-secondary/80;
 }
 
 .btn--active {
     @apply shadow-none;
-}
\ No newline at end of file
+}
diff --git a/src/Controller/Teamer/IndexController.php b/src/Controller/Teamer/IndexController.php
index c72f536..ea718b8 100644
--- a/src/Controller/Teamer/IndexController.php
+++ b/src/Controller/Teamer/IndexController.php
@@ -34,7 +34,7 @@ class IndexController extends AbstractController
 
         $query = $this
             ->assignmentRepository
-            ->getListQuery()
+            ->getListQuery($teamer)
         ;
 
         $pagination = $this->paginator->paginate(
diff --git a/src/Repository/AssignmentRepository.php b/src/Repository/AssignmentRepository.php
index fd26356..5d3660e 100644
--- a/src/Repository/AssignmentRepository.php
+++ b/src/Repository/AssignmentRepository.php
@@ -6,6 +6,7 @@ use App\Entity\Assignment;
 use App\Entity\Teamer;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\Query;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -31,15 +32,19 @@ class AssignmentRepository extends ServiceEntityRepository
             ->select('assignment', 'destination', 'job_profile', 'application', 'disposition')
             ->innerJoin('assignment.destination', 'destination')
             ->innerJoin('assignment.jobProfile', 'job_profile')
-            ->leftJoin('assignment.applications', 'application')
-            ->leftJoin('assignment.dispositions', 'disposition')
         ;
 
         if (null !== $teamer) {
             $qb
-                ->where($qb->expr()->eq('application.teamer', ':teamer'))
+                ->leftJoin('assignment.applications', 'application', Join::WITH, 'application.teamer = :teamer')
+                ->leftJoin('assignment.dispositions', 'disposition', Join::WITH, 'disposition.teamer = :teamer')
                 ->setParameter('teamer', $teamer)
             ;
+        } else {
+            $qb
+                ->leftJoin('assignment.applications', 'application')
+                ->leftJoin('assignment.dispositions', 'disposition')
+            ;
         }
 
         return $qb->getQuery();
@@ -51,7 +56,7 @@ class AssignmentRepository extends ServiceEntityRepository
 
         $qb
             ->select('assignment', 'destination', 'job_profile')
-            ->innerJoin('assignment.teamers', 'teamer', 'WITH', 'teamer = :teamer')
+            ->innerJoin('assignment.teamers', 'teamer', Join::WITH, 'teamer = :teamer')
             ->innerJoin('assignment.destination', 'destination')
             ->innerJoin('assignment.jobProfile', 'job_profile')
             ->leftJoin('assignment.applications', 'application')
diff --git a/templates/teamer/index.html.twig b/templates/teamer/index.html.twig
index 9a95eba..8e8842c 100644
--- a/templates/teamer/index.html.twig
+++ b/templates/teamer/index.html.twig
@@ -65,11 +65,20 @@
                             {{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }}
                         </td>
                         <td>
-                            <div class="flex items-center space-x-1 justify-end">
-                                <a href="{{ path('app_teamer_assignment', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
-                                    {{ icon('info', 'w-5 h-5') }}
-                                </a>
-                            </div>
+                            {% if assignment.applications|length %}
+                                {% set icon = 'hourglass' %}
+                                {% set class = 'bg-yellow-100 text-yellow-800 hover:bg-yellow-50' %}
+                            {% elseif assignment.dispositions|length %}
+                                {% set icon = 'check' %}
+                                {% set class = 'bg-green-100 text-green-700 hover:bg-green-50' %}
+                            {% else %}
+                                {% set icon = 'info' %}
+                                {% set class = 'btn--info' %}
+                            {% endif %}
+                            <a href="{{ path('app_teamer_assignment', { 'uuid': assignment.uuid, 'r': return_url() }) }}"
+                               class="btn btn--small {{ class }}">
+                                {{ icon(icon, 'w-4 h-4') }}
+                            </a>
                         </td>
                     </tr>
                 {% else %}