diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 7e2a1fffd..7d8f05d87 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -34,6 +34,18 @@ module AvatarsHelper
     avatar(user, options).to_s.html_safe
   end
 
+  def member_avatar(member, options={})
+    return '' unless member
+    options.merge!(:title => l(:label_member) + ": " + member.name)
+    if member.is_a?(User)
+      avatar(member, options).to_s.html_safe
+    elsif member.is_a?(Group)
+      image_tag('group.png', options).to_s.html_safe
+    else
+      ''
+    end
+  end
+
   # Returns the avatar image tag for the given +user+ if avatars are enabled
   # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
   def avatar(user, options = { })
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index 6dab1c294..4e98ef4a2 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -19,7 +19,9 @@
   <% members.each do |member| %>
   <% next if member.new_record? %>
   <tr id="member-<%= member.id %>" class="member">
-  <td class="name icon icon-<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+  <td class="name">
+    <%= member_avatar(member.principal, :size => "14") %> <div><%= link_to_user member.principal %></div>
+  </td>
   <td class="roles">
     <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
     <div id="member-<%= member.id %>-form"></div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f9ec3f086..c8f336fd9 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -315,6 +315,8 @@ table.files tbody th {text-align:left;}
 table.files tr.file td.filename { text-align: left; padding-left: 24px; }
 table.files tr.file td.digest { font-size: 80%; }
 
+table.members td.name img { position: absolute; }
+table.members td.name div { padding-left: 20px; }
 table.members td.roles, table.memberships td.roles { width: 45%; }
 
 table.messages td.last_message {text-align:left;}