diff --git a/app/assets/stylesheets/content/_work_packages.sass b/app/assets/stylesheets/content/_work_packages.sass
index d790e88746..04211a9ee1 100644
--- a/app/assets/stylesheets/content/_work_packages.sass
+++ b/app/assets/stylesheets/content/_work_packages.sass
@@ -177,17 +177,23 @@ i
   &.icon-right
     vertical-align: -2px
     padding: 0 0px 0 4px
+
+accessible-by-keyboard
   &.star
-    font-size: 17px
-    padding: 0 2px 0 0px
-    vertical-align: -3px
-    color: #ccc
-    margin: 0 0 0 -2px
-    cursor: pointer
-    &:hover, &.active
-      color: #f8d033
-    &.active:hover
+    margin-right: -1em
+    a:hover
+      text-decoration: none
+    .star
+      font-size: 17px
+      padding: 0 2px 0 0px
+      vertical-align: -3px
       color: #ccc
+      margin: 0 0 0 -2px
+      cursor: pointer
+      &:hover, &.active
+        color: #f8d033
+      &.active:hover
+        color: #ccc
 
 #tabs
   position: relative
diff --git a/public/templates/work_packages.list.details.html b/public/templates/work_packages.list.details.html
index 927908961a..03b1fa9e49 100644
--- a/public/templates/work_packages.list.details.html
+++ b/public/templates/work_packages.list.details.html
@@ -35,7 +35,7 @@
   <h2 title="{{ workPackage.props.subject }}" ng-bind="workPackage.props.subject"></h2>
 
   <span class="subtitle">
-    <accessible-by-keyboard ng-if="toggleWatchLink" execute="toggleWatch()">
+    <accessible-by-keyboard ng-if="toggleWatchLink" execute="toggleWatch()" class="star">
       <icon-wrapper icon-name="{{ 'star1' + (isWatched ? ' active' : '') }}"
                     icon-title="{{ isWatched ? I18n.t('js.label_unwatch_work_package') : I18n.t('js.label_watch_work_package') }}"
                     css-class="star">