diff --git a/include/staff/templates/tickets.tmpl.php b/include/staff/templates/tickets.tmpl.php
index a9310ed5b493d87cf1275f42eeb7235980d7f3bd..450b8272815a734b6a4e0d8c26264cd085192268 100644
--- a/include/staff/templates/tickets.tmpl.php
+++ b/include/staff/templates/tickets.tmpl.php
@@ -26,9 +26,19 @@ if (!$thisstaff->getRole()->hasPerm(SearchBackend::PERM_EVERYTHING)) {
 }
 
 $tickets->annotate(array(
-    'collab_count' => SqlAggregate::COUNT('thread__collaborators'),
-    'attachment_count' => SqlAggregate::COUNT('thread__entries__attachments'),
-    'thread_count' => SqlAggregate::COUNT('thread__entries'),
+    'collab_count' => SqlAggregate::COUNT('thread__collaborators', true),
+    'attachment_count' => SqlAggregate::COUNT(SqlCase::N()
+       ->when(new SqlField('thread__entries__attachments__inline'), null)
+       ->otherwise(new SqlField('thread__entries__attachments')),
+        true
+    ),
+    'thread_count' => SqlAggregate::COUNT(SqlCase::N()
+        ->when(
+            new Q(array('thread__entries__flags__hasbit'=>ThreadEntry::FLAG_HIDDEN)),
+            null)
+        ->otherwise(new SqlField('thread__entries__id')),
+       true
+    ),
 ));
 
 $tickets->values('staff_id', 'staff__firstname', 'staff__lastname', 'team__name', 'team_id', 'lock__lock_id', 'lock__staff_id', 'isoverdue', 'status_id', 'status__name', 'status__state', 'number', 'cdata__subject', 'ticket_id', 'source', 'dept_id', 'dept__name', 'user_id', 'user__default_email__address', 'user__name', 'lastupdate');
@@ -134,14 +144,18 @@ if ($results) { ?>
                 style="max-width: 230px;"
                 href="tickets.php?id=<?php echo $T['ticket_id']; ?>"><?php echo $subject; ?></a>
                  <?php
+                    if ($T['attachment_count'])
+                        echo '<i class="small icon-paperclip icon-flip-horizontal" data-toggle="tooltip" title="'
+                            .$T['attachment_count'].'"></i>';
                     if ($threadcount > 1) { ?>
                             <span class="pull-right faded-more"><i class="icon-comments-alt"></i>
                             <small><?php echo $threadcount; ?></small></span>
 <?php               }
                     if ($T['attachments'])
                         echo '<i class="small icon-paperclip icon-flip-horizontal"></i>';
-                    if ($T['collaborators'])
-                        echo '<i class="icon-group faded-more"></i>';
+                    if ($T['collab_count'])
+                        echo '<span class="faded-more" data-toggle="tooltip" title="'
+                            .$T['collab_count'].'"><i class="icon-group"></i></span>';
                 ?>
             </span></td>
             <?php
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 8bc4d42bc76f8c969bb75543950bb13f41c562a9..1ccde42fb872a04386738fa00a2be0ca5831b60a 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -57,7 +57,7 @@ div#header a {
 }
 .faded-more {
     color: #aaa;
-    color: rgba(0,0,0,0.4);
+    color: rgba(0,0,0,0.35);
 }
 
 .small[class^="icon-"],