diff --git a/app/views/aspects/_no_contacts_message.haml b/app/views/aspects/_no_contacts_message.haml
index dfb7506cf..d93b985e0 100644
--- a/app/views/aspects/_no_contacts_message.haml
+++ b/app/views/aspects/_no_contacts_message.haml
@@ -9,6 +9,6 @@
     %h4= link_to t('.invite'), "#invite_user_pane", :class => "invite_user_button", :class => "invite_user_button", :title => t('.invite')
   - else
     %h3=t('.nobody_in_aspect', :aspect_name => aspect.name)
-    %h4= link_to t('.add_contact_to', :aspect_name => aspect.name), "#add_request_pane", :class => "add_request_button"
+    %h4= link_to t('.add_contact_to', :aspect_name => aspect.name), "#manage_aspect_contacts_pane", :class => "manage_aspect_contacts_button"
     %h4= link_to t('.invite', :aspect_name => aspect.name), "#invite_user_pane", :class => "invite_user_button", :class => "invite_user_button", :title => t('.invite')
 
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index b7c1fbbf4..96b14fe86 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -2,12 +2,12 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= form_for Comment.new, :remote => true do |comment|
+= form_for Comment.new, :html => {:id => "new_comment_on_#{post.id}" }, :remote => true do |comment|
   %p
     = label_tag "comment_text_on_#{post.id}", t('.comment')
     = comment.text_area :text, :rows => 1, :id => "comment_text_on_#{post.id}", :class => "comment_box"
 
-  = comment.hidden_field :post_id, :value => post.id
+  = comment.hidden_field :post_id, :id => "post_id_on_#{post.id}", :value => post.id
 
   %p{:style => "text-align:right;"}
-    = comment.submit t('.comment'), :class => "comment_submit button"
+    = comment.submit t('.comment'), :id => "comment_submit_#{post.id}", :class => "comment_submit button"
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 277996c5f..efa152a89 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -19,6 +19,9 @@
 
     %link{:rel => 'shortcut icon', :href => '/favicon.ico'}
     %link{:rel => 'apple-touch-icon', :href => '/apple-touch-icon.png'}
+
+    / Social Media Icons are by Paul Robert Lloyd @ http://paulrobertlloyd.com/2009/06/social_media_icons
+
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
     = stylesheet_link_tag "blueprint/print", :media => 'print'
     = include_stylesheets :default, :media => 'all'
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index bfaadd585..3e2fd0025 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -41,6 +41,12 @@
           %p.checkbox_select
             = status.check_box( :public, {}, true, false )
             = status.label :public, t('.make_public')
+            = image_tag("social_media_logos/feed-16x16.png")
+            - if current_user.services
+              - for service in current_user.services      
+                = image_tag("social_media_logos/#{service.provider}-24x24.png")
+
+
           = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;"
 
           .fancybox_content
diff --git a/app/views/users/getting_started.html.haml b/app/views/users/getting_started.html.haml
index d1be8a46f..424e7f867 100644
--- a/app/views/users/getting_started.html.haml
+++ b/app/views/users/getting_started.html.haml
@@ -61,5 +61,6 @@
     - if @step > 1
       = link_to t('back'), getting_started_path(:step => @step-1), :class => "button", :id => "previous_step"
 
-.bottom_notification
-  = link_to "#{t('.skip')} →", '#', :id => "getting_started_skip"
+- if @user.getting_started
+  .bottom_notification
+    = link_to "#{t('.skip')} →", '#', :id => "getting_started_skip"
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 893653095..b2f6d5846 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -1,6 +1,4 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
+# Znaki przystankowe mogą być do kitu.
 
 pl:
   errors:
@@ -19,6 +17,13 @@ pl:
       timeout: 'Twoja sesja wygasła, zaloguj się ponownie by kontynuować.'
       inactive: 'Twoje konto nie zostało jeszcze aktywowane.'
     sessions:
+      new:
+        login: 'Login'
+        username: 'Nazwa użytkownika'
+        password: 'Hasło'
+        sign_in: 'Zaloguj się'
+        have_a_problem: "Jakiś kłopot? Znajdź odpowiedź tu"
+        remember_me: "Zapamiętaj sesję"
       signed_in: 'Zalogowano pomyślnie.'
       signed_out: 'Wylogowano.'
     passwords:
@@ -34,7 +39,34 @@ pl:
     unlocks:
       send_instructions: 'W ciągu kilku minut otrzymasz email z instrukcjami odblokowania konta.'
       unlocked: 'Twoje konto zostało odblokowane, jesteś zalogowany.'
-    mailer:
-      confirmation_instructions: 'Instrukcje aktywacji'
-      reset_password_instructions: 'Instrukcje zmiany hasła'
-      unlock_instructions: 'Instrukcje odblokowania'
+    mailer:    
+      welcome: "Witaj %{email}!"
+      hello: "Cześć %{email}!"
+      confirmation_instructions:
+        subject: 'Instrukcje aktywacji'
+        you_can_confirm: "Możesz aktywować swoje konto klikając na poniższy link:"
+        confirm: "Aktywuj moje konto"
+      reset_password_instructions:
+        subject: 'Instrukcje zmiany hasła'
+        someone_requested: "Odebraliśmy zgłoszenie zmiany hasła, jeśli chcesz to zrobić kliknij na poniższy link:"
+        change: "Zmień moje hasło"
+        wont_change: "Twoje hasło zostanie zmienione dopiero gdy klikniesz na link i podasz nowe hasło."
+        ignore: "Jeśli nie chcesz zresetować hasła, zignoruj ten email."
+      unlock_instructions:
+        subject: 'Instrukcje odblokowania'
+        account_locked: "Twoje konto zostało zablokowane, ponieważ przekroczono limit nieudanych logowań."
+        click_to_unlock: "Kliknij na poniższy link, aby odblokować konto:"
+        unlock: "Odblokuj moje konto"
+      invitation:
+        subject: "Masz zaproszenie do Diaspory!"
+        has_invited_you: "%{name} zaprosił(a) Cię do Diaspory!"
+        have_invited_you: "%{names} zaprosili Cie do Diaspory"
+        accept_at: ", at %{url}, możesz zaakceptować zaproszenie klikając na poniższy link:"
+        accept: "Zaakceptuj zaproszenie"
+        ignore: "Jeśli nie chcesz zaakceptować zaproszenia, zignoruj ten email."
+        no_account_till: "Twoje konto nie zostanie założone dopuki nie klikniesz na link powyżej i nie zarejestrujesz sie.
+    shared:
+      links:
+        sign_in: 'Zaloguj się'
+        sign_up: 'Zarejestruj się'
+        forgot_your_password: 'Nie pamiętasz hasła?'
diff --git a/features/signs_up.feature b/features/signs_up.feature
index a213c258d..6ea364578 100644
--- a/features/signs_up.feature
+++ b/features/signs_up.feature
@@ -29,11 +29,17 @@ Feature: new user registration
 
     When I follow "Save and continue"
     Then I should see "You're all set up, O!"
+    And I should not see "skip getting started"
 
     When I follow "Continue on to your everyone page, an overview of all of your aspects."
     Then I should be on the aspects page
     And I should see "bring them to Diaspora!"
 
+  Scenario: new user skips the setup wizard and returns to the setup wizard
+    When I follow "skip getting started"
+    And I go to the getting started page
+    Then I should not see "skip getting started"
+  
   Scenario: new user skips the setup wizard
     When I follow "skip getting started"
     And I wait for the aspects page to load
diff --git a/public/images/social_media_logos/email-16x16.png b/public/images/social_media_logos/email-16x16.png
new file mode 100644
index 000000000..8cd731610
Binary files /dev/null and b/public/images/social_media_logos/email-16x16.png differ
diff --git a/public/images/social_media_logos/email-24x24.png b/public/images/social_media_logos/email-24x24.png
new file mode 100644
index 000000000..b52e19ed4
Binary files /dev/null and b/public/images/social_media_logos/email-24x24.png differ
diff --git a/public/images/social_media_logos/email-32x32.png b/public/images/social_media_logos/email-32x32.png
new file mode 100644
index 000000000..8172cc530
Binary files /dev/null and b/public/images/social_media_logos/email-32x32.png differ
diff --git a/public/images/social_media_logos/email-48x48.png b/public/images/social_media_logos/email-48x48.png
new file mode 100644
index 000000000..a14a01ba5
Binary files /dev/null and b/public/images/social_media_logos/email-48x48.png differ
diff --git a/public/images/social_media_logos/facebook-16x16.png b/public/images/social_media_logos/facebook-16x16.png
new file mode 100644
index 000000000..7ae54147a
Binary files /dev/null and b/public/images/social_media_logos/facebook-16x16.png differ
diff --git a/public/images/social_media_logos/facebook-24x24.png b/public/images/social_media_logos/facebook-24x24.png
new file mode 100644
index 000000000..27b9a6102
Binary files /dev/null and b/public/images/social_media_logos/facebook-24x24.png differ
diff --git a/public/images/social_media_logos/facebook-32x32.png b/public/images/social_media_logos/facebook-32x32.png
new file mode 100644
index 000000000..360df4478
Binary files /dev/null and b/public/images/social_media_logos/facebook-32x32.png differ
diff --git a/public/images/social_media_logos/facebook-48x48.png b/public/images/social_media_logos/facebook-48x48.png
new file mode 100644
index 000000000..848b0d248
Binary files /dev/null and b/public/images/social_media_logos/facebook-48x48.png differ
diff --git a/public/images/social_media_logos/feed-16x16.png b/public/images/social_media_logos/feed-16x16.png
new file mode 100644
index 000000000..5e34c13ad
Binary files /dev/null and b/public/images/social_media_logos/feed-16x16.png differ
diff --git a/public/images/social_media_logos/feed-24x24.png b/public/images/social_media_logos/feed-24x24.png
new file mode 100644
index 000000000..9a621cf9f
Binary files /dev/null and b/public/images/social_media_logos/feed-24x24.png differ
diff --git a/public/images/social_media_logos/feed-32x32.png b/public/images/social_media_logos/feed-32x32.png
new file mode 100644
index 000000000..04a1f090b
Binary files /dev/null and b/public/images/social_media_logos/feed-32x32.png differ
diff --git a/public/images/social_media_logos/feed-48x48.png b/public/images/social_media_logos/feed-48x48.png
new file mode 100644
index 000000000..67d7b95cf
Binary files /dev/null and b/public/images/social_media_logos/feed-48x48.png differ
diff --git a/public/images/social_media_logos/twitter-16x16.png b/public/images/social_media_logos/twitter-16x16.png
new file mode 100644
index 000000000..43aa4fb97
Binary files /dev/null and b/public/images/social_media_logos/twitter-16x16.png differ
diff --git a/public/images/social_media_logos/twitter-24x24.png b/public/images/social_media_logos/twitter-24x24.png
new file mode 100644
index 000000000..e849b1702
Binary files /dev/null and b/public/images/social_media_logos/twitter-24x24.png differ
diff --git a/public/images/social_media_logos/twitter-32x32.png b/public/images/social_media_logos/twitter-32x32.png
new file mode 100644
index 000000000..6ebd1a98e
Binary files /dev/null and b/public/images/social_media_logos/twitter-32x32.png differ
diff --git a/public/images/social_media_logos/twitter-48x48.png b/public/images/social_media_logos/twitter-48x48.png
new file mode 100644
index 000000000..c1145e772
Binary files /dev/null and b/public/images/social_media_logos/twitter-48x48.png differ
diff --git a/public/images/social_media_logos/website-16x16.png b/public/images/social_media_logos/website-16x16.png
new file mode 100644
index 000000000..76a9be1b1
Binary files /dev/null and b/public/images/social_media_logos/website-16x16.png differ
diff --git a/public/images/social_media_logos/website-24x24.png b/public/images/social_media_logos/website-24x24.png
new file mode 100644
index 000000000..05062e6bf
Binary files /dev/null and b/public/images/social_media_logos/website-24x24.png differ
diff --git a/public/images/social_media_logos/website-32x32.png b/public/images/social_media_logos/website-32x32.png
new file mode 100644
index 000000000..c655f9b41
Binary files /dev/null and b/public/images/social_media_logos/website-32x32.png differ
diff --git a/public/images/social_media_logos/website-48x48.png b/public/images/social_media_logos/website-48x48.png
new file mode 100644
index 000000000..0d33b7adf
Binary files /dev/null and b/public/images/social_media_logos/website-48x48.png differ
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index b371219dd..d07ae5851 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -693,6 +693,9 @@ form p.checkbox_select
   label
     :left 20px
     :top 0
+  img
+    :position relative
+    :left 90px
 
 label
   :font
diff --git a/spec/models/invitation_spec.rb b/spec/models/invitation_spec.rb
index cb79ec08d..9a273e0f4 100644
--- a/spec/models/invitation_spec.rb
+++ b/spec/models/invitation_spec.rb
@@ -122,6 +122,12 @@ describe Invitation do
         Invitation.create_invitee(:email => @email)
         Devise.mailer.deliveries.first.body.raw_source.match(/have invited you to join/i).should be_false
       end
+      it 'creates an invitation' do
+        pending "Invitations should be more flexible, allowing custom messages to be passed in without an inviter."
+        lambda {
+          Invitation.create_invitee(:email => @email)
+        }.should change(Invitation, :count).by(1)
+      end
     end
   end