diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 0cbe1d20e..4e894c1f5 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -925,7 +925,11 @@ ul.projects div.description ul li {list-style-type:initial;}
   background-image: none;
   padding-left: 0;
 }
-#projects-index ul.projects div.root svg {
+#projects-index ul.projects .icon-bookmarked-project svg,
+#projects-index ul.projects .my-project svg {
+  margin-left: 4px;
+}
+#projects-index ul.projects div.root .icon-bookmarked-project svg, #projects-index ul.projects div.root .my-project svg {
   stroke-width: 2;
   margin-bottom: 10px;
 }
@@ -936,13 +940,15 @@ ul.projects div.description ul li {list-style-type:initial;}
   background-image: none;
   padding-left: 0;
 }
-#projects-index a.project ~ svg, table.projects tr.project td.name svg {
-  margin-left: 4px;
-}
 #projects-index div.wiki p {
   margin-top: 0px;
 }
 
+table.projects td.name .icon-bookmarked-project svg,
+table.projects td.name .my-project svg {
+  margin-left: 4px;
+}
+
 #notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;}
 
 ul.subprojects {list-style: none; display: inline-block; padding: 0; margin: 0;}
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 01a5452f7..bae1c4e3a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -80,8 +80,8 @@ module ProjectsHelper
       classes += %w(icon icon-bookmarked-project) if bookmarked_project_ids.include?(project.id)
 
       s = link_to_project(project, {}, :class => classes.uniq.join(' '))
-      s << sprite_icon('user', l(:label_my_projects), icon_only: true) if User.current.member_of?(project)
-      s << sprite_icon('bookmarked', l(:label_my_bookmarks), icon_only: true) if bookmarked_project_ids.include?(project.id)
+      s << tag.span(sprite_icon('user', l(:label_my_projects), icon_only: true), class: 'icon-only icon-user my-project') if User.current.member_of?(project)
+      s << tag.span(sprite_icon('bookmarked', l(:label_my_bookmarks), icon_only: true), class: 'icon-only icon-bookmarked-project') if bookmarked_project_ids.include?(project.id)
       if project.description.present?
         s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description')
       end