diff --git a/app/assets/javascripts/app/views/popover/ticket.jst.eco b/app/assets/javascripts/app/views/popover/ticket.jst.eco
index b743b0f10..e7a5808b3 100644
--- a/app/assets/javascripts/app/views/popover/ticket.jst.eco
+++ b/app/assets/javascripts/app/views/popover/ticket.jst.eco
@@ -1,13 +1,20 @@
 <div>
-  <div class="<%- @ticket.icon() %>" title="<%- @ticket.iconTitle() %>"></div>
+  <span class="<%- @ticket.icon() %>" title="<%- @ticket.iconTitle() %>"></span> <span class="<%- @ticket.iconTextClass() %>"><%- @ticket.iconTitle() %></span>
 </div>
 <hr>
-<h3>Personen</h3>
+<h3><%- @P('Agent') %></h3>
 <div class="person">
-  <%- @P( @ticket.owner ) %>
+  <%= @ticket.owner.displayName() %>
+  <% if @ticket.owner.organization_id: %>
+    <span class="organization"><%= @ticket.owner.organization.displayName() %></span>
+  <% end %>
 </div>
+<h3><%- @P('Customer') %></h3>
 <div class="person">
-  <%- @P( @ticket.customer ) %>
+  <%= @ticket.customer.displayName() %>
+  <% if @ticket.customer.organization_id: %>
+    <span class="organization"><%= @ticket.customer.organization.displayName() %></span>
+  <% end %>
 </div>
 <hr>
 <div class="horizontal two-columns">
@@ -15,10 +22,6 @@
     <h3>#</h3>
     <div class="u-textTruncate"><%- @P( @ticket.number ) %></div>
   </div>
-  <div class="column">
-    <h3><%- @T( 'State' ) %></h3>
-    <div class="u-textTruncate"><%- @P( @ticket.state.name ) %></div>
-  </div>
   <div class="column">
     <h3><%- @T( 'Priority' ) %></h3>
     <div class="u-textTruncate"><%- @T( @ticket.priority.name ) %></div>