diff --git a/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco
index 4008197d7..a364ad026 100644
--- a/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/user_list.jst.eco
@@ -140,7 +140,7 @@
   </div>
 
   <div class="table-overview">
-    <table class="table table-hover">
+    <table class="user-list table table-hover">
       <thead>
         <tr>
           <th>Login</th>
@@ -149,7 +149,7 @@
 
           <th>Lastname</th>
 
-          <th>Switch to</th>
+          <th></th>
         </tr>
       </thead>
 
@@ -162,7 +162,7 @@
           <td><span>Niklas</span></td>
 
           <td class="no-padding">
-            <div class="btn btn--primary btn--table"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
+            <div class="btn btn--primary btn--table switchView"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
           </td>
         </tr>
 
@@ -174,7 +174,7 @@
           <td><span>Huber2</span></td>
 
           <td class="no-padding">
-            <div class="btn btn--primary btn--table"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
+            <div class="btn btn--primary btn--table switchView"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
           </td>
         </tr>
 
@@ -186,7 +186,7 @@
           <td><span>Braun</span></td>
 
           <td class="no-padding">
-            <div class="btn btn--primary btn--table"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
+            <div class="btn btn--primary btn--table switchView"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
           </td>
         </tr>
 
@@ -198,7 +198,7 @@
           <td><span>Blanko</span></td>
 
           <td class="no-padding">
-            <div class="btn btn--primary btn--table"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
+            <div class="btn btn--primary btn--table switchView"><svg class="icon icon-switchView"><use xlink:href="#icon-switchView" /></svg> Aus Benutzeransicht anzeigen</div>
           </td>
         </tr>
       </tbody>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index a331eca2f..8c701e644 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -284,7 +284,7 @@ span[data-tooltip]:hover:before {
     padding: 4px 9px;
     font-weight: 300;
     border: none;
-    margin: 6px 6px 0;
+    margin: 5px 6px 0;
     
     .icon {
       vertical-align: middle;
@@ -4067,6 +4067,16 @@ footer {
   display: block;
 }
 
+.user-list {
+  tr:hover .switchView {
+    visibility: visible;
+  }
+  
+  .switchView {
+    visibility: hidden;
+  }
+}
+
 .switchBackToUser {
   display: flex;
   align-items: center;