diff --git a/app/assets/images/default-avatar.png b/app/assets/images/default-avatar.png
new file mode 100644
index 0000000000..993f02cc2b
Binary files /dev/null and b/app/assets/images/default-avatar.png differ
diff --git a/app/assets/stylesheets/content/_user_avatars.md b/app/assets/stylesheets/content/_user_avatars.md
new file mode 100644
index 0000000000..2c2d53deb6
--- /dev/null
+++ b/app/assets/stylesheets/content/_user_avatars.md
@@ -0,0 +1,17 @@
+# User Avatars
+
+```
+
+Default:<br />
+<img class="avatar" src="/assets/default-avatar.png" />
+<br /><br />
+Default Mini:<br />
+<img class="avatar-mini" src="/assets/default-avatar.png" />
+<br /><br />
+Gravatar:<br />
+<img src="http://gravatar.com/avatar/cb4f282fed12016bd18a879c1f27ff97" class="avatar" />
+<br /><br />
+Gravatar Mini:<br />
+<img src="http://gravatar.com/avatar/cb4f282fed12016bd18a879c1f27ff97" class="avatar-mini" />
+
+```
diff --git a/app/assets/stylesheets/content/_user_avatars.sass b/app/assets/stylesheets/content/_user_avatars.sass
new file mode 100644
index 0000000000..9834cecf22
--- /dev/null
+++ b/app/assets/stylesheets/content/_user_avatars.sass
@@ -0,0 +1,7 @@
+.avatar, .gravatar
+  border-radius: $user_avatar_border_radius
+  width: $user_avatar_width
+
+.avatar-mini
+  border-radius: $user_avatar_mini_border_radius
+  width: $user_avatar_mini_width
diff --git a/app/assets/stylesheets/default.css.sass b/app/assets/stylesheets/default.css.sass
index 33142634d4..85b3eb86e5 100644
--- a/app/assets/stylesheets/default.css.sass
+++ b/app/assets/stylesheets/default.css.sass
@@ -67,6 +67,7 @@
 @import content/tabular
 @import content/headings
 @import content/timelines
+@import content/user_avatars
 @import content/preview
 @import content/modal
 @import content/grid_table
diff --git a/app/assets/stylesheets/default/main.css.erb b/app/assets/stylesheets/default/main.css.erb
index f753c19acb..3c1fcc9d65 100644
--- a/app/assets/stylesheets/default/main.css.erb
+++ b/app/assets/stylesheets/default/main.css.erb
@@ -159,11 +159,11 @@ table.attributes td { vertical-align: top; }
 td.center, th.center {text-align: center;}
 
 #watchers ul {margin: 0;  padding: 0;}
-#watchers li {list-style-type: none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;float: left;}
+#watchers li {list-style-type: none;margin: 0px 10px 0px 0px; padding: 0px 0px 0px 0px;float: left;}
 #watchers select {width: 200px; display: block;float: left;margin-right: 10px;}
 #watchers a.delete {opacity: 0.4;}
 #watchers a.delete:hover {opacity: 1;}
-#watchers img.gravatar {vertical-align: middle;margin: 0 4px 2px 0;}
+#watchers img.gravatar {vertical-align: middle;margin: 0 10px 0px 0;}
 
 .highlight { background-color: #FCFD8D;}
 .highlight.token-1 { background-color: #faa;}
diff --git a/app/assets/stylesheets/default_simple.css.sass b/app/assets/stylesheets/default_simple.css.sass
index a9e655f891..b637d7bfa5 100644
--- a/app/assets/stylesheets/default_simple.css.sass
+++ b/app/assets/stylesheets/default_simple.css.sass
@@ -67,6 +67,7 @@
 @import content/tabular
 @import content/headings
 @import content/timelines
+@import content/user_avatars
 @import content/preview
 @import content/modal
 @import content/grid_table
diff --git a/app/assets/stylesheets/global/_variables.sass b/app/assets/stylesheets/global/_variables.sass
index 13f69563a5..140a02b74e 100644
--- a/app/assets/stylesheets/global/_variables.sass
+++ b/app/assets/stylesheets/global/_variables.sass
@@ -181,3 +181,8 @@ $wiki_toc_ul_font_size:                         0.8em !default
 $journal_attribute_font_size:                   11px !default
 
 $repository_entry_filename_margin_left:         24px !default
+
+$user_avatar_border_radius:                     50px !default
+$user_avatar_width:                             36px !default
+$user_avatar_mini_border_radius:                50px !default
+$user_avatar_mini_width:                        20px !default
diff --git a/app/assets/stylesheets/layout/_split_view.sass b/app/assets/stylesheets/layout/_split_view.sass
index 2b003b2f0d..7495e26c3a 100644
--- a/app/assets/stylesheets/layout/_split_view.sass
+++ b/app/assets/stylesheets/layout/_split_view.sass
@@ -104,14 +104,14 @@ div
       list-style-type: none
       li
         clear: both
-        padding-bottom: 10px
+        height: 36px
+        margin-bottom: 10px
+        
     .user-field-user-link
       float: left
     .detail-panel-watchers-delete-watcher-icon
       padding: 0 8px
       color: $button_font_color
-    .avatar
-      padding-bottom: 10px
     fieldset
       border: 0
     #detail-panel-watchers-add-watcher