diff --git a/app/assets/images/fb-logo-blue.png b/app/assets/images/fb-logo-blue.png
new file mode 100644
index 00000000..86f565a1
Binary files /dev/null and b/app/assets/images/fb-logo-blue.png differ
diff --git a/app/assets/images/flickr.png b/app/assets/images/flickr.png
new file mode 100644
index 00000000..3a76415b
Binary files /dev/null and b/app/assets/images/flickr.png differ
diff --git a/app/assets/images/google-logo.png b/app/assets/images/google-logo.png
new file mode 100644
index 00000000..ccd1d4a2
Binary files /dev/null and b/app/assets/images/google-logo.png differ
diff --git a/app/assets/images/instagram.png b/app/assets/images/instagram.png
new file mode 100644
index 00000000..992f8dd3
Binary files /dev/null and b/app/assets/images/instagram.png differ
diff --git a/app/assets/images/slideshare.png b/app/assets/images/slideshare.png
new file mode 100644
index 00000000..d730f0ae
Binary files /dev/null and b/app/assets/images/slideshare.png differ
diff --git a/app/assets/images/speakerdeck.png b/app/assets/images/speakerdeck.png
new file mode 100644
index 00000000..895ad79b
Binary files /dev/null and b/app/assets/images/speakerdeck.png differ
diff --git a/app/assets/images/twitter-logo-blue.png b/app/assets/images/twitter-logo-blue.png
new file mode 100644
index 00000000..a1435701
Binary files /dev/null and b/app/assets/images/twitter-logo-blue.png differ
diff --git a/app/assets/images/vimeo-logo-dark.png b/app/assets/images/vimeo-logo-dark.png
new file mode 100644
index 00000000..c8952544
Binary files /dev/null and b/app/assets/images/vimeo-logo-dark.png differ
diff --git a/app/assets/images/youtube-color-logo.png b/app/assets/images/youtube-color-logo.png
new file mode 100644
index 00000000..b29e7789
Binary files /dev/null and b/app/assets/images/youtube-color-logo.png differ
diff --git a/app/views/conference/_social_media.html.haml b/app/views/conference/_social_media.html.haml
new file mode 100644
index 00000000..df37162b
--- /dev/null
+++ b/app/views/conference/_social_media.html.haml
@@ -0,0 +1,35 @@
+= content_for :splash_nav do
+  %li
+    %a{ href: '#social-media' } Social Media
+
+%div.container#social-media.text-center
+  %div.row
+    - if !@conference.facebook_url.blank?
+      %div.col-md-3
+        = link_to image_tag('fb-logo-blue.png', class: 'img-responsive'),
+         "#{ @conference.facebook_url }"
+    - if !@conference.twitter_url.blank?
+      %div.col-md-3
+        = link_to image_tag('twitter-logo-blue.png', class: 'img-responsive'), "#{ @conference.twitter_url }"
+    - if !@conference.media_type.blank? && !@conference.media_id.blank?
+      %div.col-md-3
+        -if @conference.media_type == 'YouTube'
+          = link_to image_tag('youtube-color-logo.png', class: 'img-responsive'),
+           "http://youtu.be/#{ @conference.media_id}"
+        -if @conference.media_type == 'SlideShare'
+          = link_to image_tag('slideshare.png', class: 'img-responsive'), "#{ @conference.media_id}"
+        -if @conference.media_type == 'Instagram'
+          = link_to image_tag('instagram.png', class: 'img-responsive'),
+           "http://instagram.com/p/#{ @conference.media_id}"
+        -if @conference.media_type == 'Vimeo'
+          = link_to image_tag('vimeo-logo-dark.png', class: 'img-responsive'),
+           "http://vimeo.com/#{ @conference.media_id}"
+        -if @conference.media_type == 'Speakerdeck'
+          = link_to image_tag('speakerdeck.png', class: 'img-responsive'),"#{ @conference.media_id}"
+        -if @conference.media_type == 'Flickr'
+          = link_to image_tag('flickr.png', class: 'img-responsive'),
+           "https://flic.kr/p/#{ @conference.media_id}"
+    - if !@conference.google_url.blank?
+      %div.col-md-3
+        = link_to image_tag('google-logo.png', class: 'img-responsive'),
+         "#{ @conference.google_url }"
diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml
index d0ae1e61..8a844c77 100644
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@@ -9,4 +9,5 @@
     = render 'call_for_papers'
 %div#sponsors
   = render 'sponsor'
-
+%div#social-media
+  = render 'social_media'
diff --git a/spec/views/conference/show.html.haml_spec.rb b/spec/views/conference/show.html.haml_spec.rb
index 95940230..1a59afdf 100644
--- a/spec/views/conference/show.html.haml_spec.rb
+++ b/spec/views/conference/show.html.haml_spec.rb
@@ -6,7 +6,11 @@ describe 'conference/show.html.haml' do
                                       registration_end_date: Date.tomorrow,
                                       description: 'Lorem Ipsum',
                                       sponsor_description: 'Lorem Ipsum Dolor',
-                                      sponsor_email: 'example@example.com')
+                                      sponsor_email: 'example@example.com',
+                                      facebook_url: 'http://www.fbexample.com',
+                                      google_url: 'http://www.google-example.com',
+                                      media_type: 'YouTube',
+                                      media_id: 'rtyutut')
     @conference.call_for_papers = create(:call_for_papers, conference: @conference)
     @conference.sponsorship_levels << create(:sponsorship_level, conference: @conference)
     @sponsorship_level = @conference.sponsorship_levels.first
@@ -39,5 +43,11 @@ describe 'conference/show.html.haml' do
     expect(rendered).to include('http://www.example.com')
     expect(rendered).to include('Lorem Ipsum Dolor')
     expect(rendered).to include('rails.jpg')
+
+  it 'renders social media partial' do
+    expect(view).to render_template('conference/_social_media')
+    expect(rendered).to include('http://www.fbexample.com')
+    expect(rendered).to include('http://www.google-example.com')
+    expect(rendered).to include('http://youtu.be/rtyutut')
   end
 end