diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index f25d5a543..422bf1cbf 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -82,7 +82,7 @@ class PeopleController < ApplicationController
           @aspects_with_person = @contact.aspects
           @aspect_ids = @aspects_with_person.map(&:id)
           @contacts_of_contact_count = @contact.contacts.count
-          @contacts_of_contact = @contact.contacts.limit(36)
+          @contacts_of_contact = @contact.contacts.limit(8)
 
         else
           @contact ||= Contact.new
diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml
index 7041487d0..63b5fec14 100644
--- a/app/views/aspects/_aspect_listings.haml
+++ b/app/views/aspects/_aspect_listings.haml
@@ -4,7 +4,7 @@
 
 %ul#aspect_nav.left_nav
   %li.all_aspects{:class => ("active" if params["set"] != "all" && params["set"] != "only_sharing")}
-    %a{:href => controller_index_path, :class => ("sub_selected" if params["a_id"])}
+    %a.aspect_selector{:href => controller_index_path, :class => ("sub_selected" if params["a_id"])}
       .contact_count
         = my_contacts_count
       = t('contacts.index.my_contacts')
@@ -12,24 +12,26 @@
     %ul.sub_nav
       - for aspect in all_aspects
         %li{:class => ("active" if params["a_id"].to_i == aspect.id)}
+          .edit
+            = link_to image_tag("icons/pencil.svg", :height => 12), edit_aspect_path(aspect), :rel => "facebox"
 
-          %a{aspect_listing_link_opts(aspect)}
-
+          %a.aspect_selector{aspect_listing_link_opts(aspect)}
             .contact_count
               = aspect.contacts.size
             = aspect
+
       %li
         = link_to "+ Add an aspect", "#add_aspect_pane", :class => "new_aspect", :rel => "facebox"
         
   %li.all_contacts{:class => ("active" if params["set"] == "all" || params["set"] == "only_sharing")}
-    %a{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")}
+    %a.aspect_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")}
       .contact_count
         = all_contacts_count
       = t('contacts.index.all_contacts')
 
     %ul.sub_nav
       %li{:class => ("active" if params["set"] == "only_sharing")}
-        %a{:href => contacts_path(:set => "only_sharing")}
+        %a.aspect_selector{:href => contacts_path(:set => "only_sharing")}
           .contact_count
             = only_sharing_count
           = t('contacts.index.only_sharing_with_me')
diff --git a/app/views/aspects/_selected_contacts.html.haml b/app/views/aspects/_selected_contacts.html.haml
index 54eb6ac87..5cc025c92 100644
--- a/app/views/aspects/_selected_contacts.html.haml
+++ b/app/views/aspects/_selected_contacts.html.haml
@@ -7,8 +7,3 @@
     - for contact in contacts
       = person_image_link contact.person
 
-    #edit_this_aspect
-      = link_to "View all contacts", contacts_path
-    - for aspect in @aspects
-      = link_to "Edit #{aspect.name}", edit_aspect_path(aspect), :rel => 'facebox'
-      %br
diff --git a/app/views/aspects/index.js.erb b/app/views/aspects/index.js.erb
index 0938a3236..3ff24df6e 100644
--- a/app/views/aspects/index.js.erb
+++ b/app/views/aspects/index.js.erb
@@ -1,3 +1,3 @@
 $('#aspect_stream_container').html("<%= escape_javascript(render('aspects/aspect_stream', :aspect => @aspect, :aspect_ids => @aspect_ids, :posts => @posts)) %>");
 $('#selected_aspect_contacts').html("<%= escape_javascript(render('aspects/selected_contacts', :count => @selected_contacts_count, :contacts => @selected_contacts)) %>");
-$('a[rel*=facebox]').facebox();
+$('#aspect_stream_container a[rel*=facebox]').facebox();
diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml
index 4e8a9cedd..f1789fdda 100644
--- a/app/views/contacts/index.html.haml
+++ b/app/views/contacts/index.html.haml
@@ -18,10 +18,9 @@
 
 .span-18.last
   #people_stream.stream.contacts
-    #aspect_controls
-      = link_to "Edit #{@aspect_.name}", edit_aspect_path(@aspect_), :rel => "facebox"
-
-      - if @aspect_
+    - if @aspect_
+      #aspect_controls
+        = link_to "Edit #{@aspect_.name}", edit_aspect_path(@aspect_), :rel => "facebox"
         = link_to "start a conversation", new_conversation_path(:aspect_id => @aspect_.id, :name => @aspect_.name), :class => "button conversation_button", :rel => "facebox"
 
     - if @contacts.size > 0
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 1f49f5fb0..ad573cea7 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -13,13 +13,13 @@
   = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :contact => @contact }
 
   - if user_signed_in? && @contact.persisted? && @contacts_of_contact.count > 0
-    .span-8.last#contacts_of_contact
+    .span-5.last#contacts_of_contact
       .section.contact_pictures
         %h4
           = t('contacts', :count => @contacts_of_contact_count)
         - for person in @contacts_of_contact
           = person_image_link person
-      - if @contacts_of_contact.count > 25
+      - if @contacts_of_contact.count > 8
         %p.see_all= link_to t('.see_all'), person_contacts_path(@person)
 
 .span-15.last
diff --git a/public/images/icons/doc_edit.png b/public/images/icons/doc_edit.png
deleted file mode 100644
index 17071ef87..000000000
Binary files a/public/images/icons/doc_edit.png and /dev/null differ
diff --git a/public/images/icons/happy_smiley.png b/public/images/icons/happy_smiley.png
deleted file mode 100644
index 675e39ce6..000000000
Binary files a/public/images/icons/happy_smiley.png and /dev/null differ
diff --git a/public/images/icons/mail.png b/public/images/icons/mail.png
deleted file mode 100644
index 32c943a2f..000000000
Binary files a/public/images/icons/mail.png and /dev/null differ
diff --git a/public/images/icons/mail_grey.png b/public/images/icons/mail_grey.png
deleted file mode 100644
index 07403d3da..000000000
Binary files a/public/images/icons/mail_grey.png and /dev/null differ
diff --git a/public/images/icons/monotone_chat_talk.png b/public/images/icons/monotone_chat_talk.png
deleted file mode 100644
index ccfae8620..000000000
Binary files a/public/images/icons/monotone_chat_talk.png and /dev/null differ
diff --git a/public/images/icons/monotone_flag.png b/public/images/icons/monotone_flag.png
deleted file mode 100644
index fbfeb559d..000000000
Binary files a/public/images/icons/monotone_flag.png and /dev/null differ
diff --git a/public/images/icons/pencil.svg b/public/images/icons/pencil.svg
new file mode 100755
index 000000000..1a277dd50
--- /dev/null
+++ b/public/images/icons/pencil.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<path d="M4.744,4.743c-6.325,6.325-6.325,16.578,0,22.903L27.646,4.743C21.322-1.582,11.068-1.582,4.744,4.743z"/>
+<path d="M60.893,83.794L100,100L83.795,60.893l-49.881-49.88L11.012,33.914L60.893,83.794z M66.105,73.646
+	c2.082-2.084,6.023-1.517,6.893-0.647c-0.868-0.868-1.436-4.812,0.646-6.894s6.242-2.822,6.242-2.822l9.312,22.47l-3.446,3.446
+	l-22.47-9.311C63.282,79.889,64.023,75.729,66.105,73.646z"/>
+</svg>
diff --git a/public/images/icons/photos.png b/public/images/icons/photos.png
deleted file mode 100644
index bc0d50f69..000000000
Binary files a/public/images/icons/photos.png and /dev/null differ
diff --git a/public/images/icons/sad_smiley.png b/public/images/icons/sad_smiley.png
deleted file mode 100644
index c825f7ab6..000000000
Binary files a/public/images/icons/sad_smiley.png and /dev/null differ
diff --git a/public/images/icons/spechbubble_2.png b/public/images/icons/spechbubble_2.png
deleted file mode 100644
index f6053cafe..000000000
Binary files a/public/images/icons/spechbubble_2.png and /dev/null differ
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 0cbf2f5cf..1bd28ec29 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -889,6 +889,7 @@ label
 
   form
     textarea
+      :resize none
       :width 455px
       :margin 0
 
@@ -2682,6 +2683,10 @@ h1.tag
   .see_all
     :text-align center
 
+  .avatar
+    :height 45px
+    :width 45px
+
 .date
   :background
     :color #e6e6e6
@@ -2857,7 +2862,7 @@ ul.left_nav
     :position relative
     :width 100%
 
-  a
+  a.aspect_selector
     :display block
     :width 100%
     :padding 3px 7px
@@ -2881,9 +2886,16 @@ ul.left_nav
           :weight 700
         :color #666
 
+  .contact_count,
+  .edit
+    :float right
+
+  .edit
+    :margin-top 4px
+    :display none
+
   .contact_count
     @include border-radius(4px)
-    :float right
     :margin-top 1px
     :color #999
     :background
@@ -2896,7 +2908,9 @@ ul.left_nav
   ul.sub_nav
     :padding 0
     :margin 0
-    a
+    li
+      :width 155px
+    a.aspect_selector
       :padding
         :left 15px
       :width 182px
@@ -2909,11 +2923,15 @@ ul.left_nav
     :display none !important
 
   .left_nav
-    a
+    a.aspect_selector
       :width 150px
     ul.sub_nav
-      a
+      :width 140px
+      a.aspect_selector
         :width 140px
+      li:hover
+        .edit
+          :display inline-block
 
 .stream_container
   h3
@@ -3004,13 +3022,6 @@ ul.left_nav
     :margin
       :bottom -2px
 
-#edit_this_aspect
-  :text-align center
-  :margin
-    :top 5px
-  :padding 3px
-  :border 1px dotted #ccc
-
 .bottom_submit_section
   :display block
   :position relative