diff --git a/app/views/legislation/annotations/_slim_version_chooser.html.erb b/app/views/legislation/annotations/_slim_version_chooser.html.erb
index 2f2203374..a3288597e 100644
--- a/app/views/legislation/annotations/_slim_version_chooser.html.erb
+++ b/app/views/legislation/annotations/_slim_version_chooser.html.erb
@@ -15,9 +15,10 @@
   </div>
   <aside class="small-12 medium-3 column">
     <div class="sidebar-divider"></div>
-    <h2>Compartir</h2>
-    <div class="social-share-full">
-      <%= render '/legislation/shared/share_buttons', title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title) %>
-    </div>
+    <h2><%= t('legislation.shared.share') %></h2>
+      <%= render '/legislation/shared/share_buttons',
+                 title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title),
+                 url: legislation_process_draft_version_path(process, draft_version)
+      %>
   </aside>
 </div>
diff --git a/app/views/legislation/annotations/show.html.erb b/app/views/legislation/annotations/show.html.erb
index 46c728a16..a299d160e 100644
--- a/app/views/legislation/annotations/show.html.erb
+++ b/app/views/legislation/annotations/show.html.erb
@@ -32,10 +32,11 @@
 
           <aside class="small-12 medium-3 column">
             <div class="sidebar-divider"></div>
-            <h2>Compartir</h2>
-            <div class="social-share-full">
-              <%= render '/legislation/shared/share_buttons', title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title) %>
-            </div>
+            <h2><%= t('legislation.shared.share') %></h2>
+            <%= render '/legislation/shared/share_buttons',
+                       title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title),
+                       url: legislation_process_draft_version_annotations_path(@process, @draft_version)
+            %>
           </aside>
         </div>
 
diff --git a/app/views/legislation/questions/show.html.erb b/app/views/legislation/questions/show.html.erb
index 9a290e364..ab1443628 100644
--- a/app/views/legislation/questions/show.html.erb
+++ b/app/views/legislation/questions/show.html.erb
@@ -38,9 +38,7 @@
     <aside class="small-12 medium-3 column">
       <div id="social-share" class="sidebar-divider"></div>
       <h3><%= t('.share') %></h3>
-      <div class="social-share-full">
-        <%= render '/legislation/shared/share_buttons', title: @question.title %>
-      </div>
+      <%= render '/legislation/shared/share_buttons', title: @question.title, url: legislation_process_question_url(@question.process, @question) %>
     </aside>
   </div>
 
diff --git a/app/views/legislation/shared/_share_buttons.html.erb b/app/views/legislation/shared/_share_buttons.html.erb
index acc86f4ea..0486b9d2d 100644
--- a/app/views/legislation/shared/_share_buttons.html.erb
+++ b/app/views/legislation/shared/_share_buttons.html.erb
@@ -1,5 +1,9 @@
-<div class="social-share-button" data-title="<%= title.truncate(115) %>" data-img="" data-url="" data-desc="" data-via="">
-  <a rel="nofollow " data-site="twitter" class="ssb-icon ssb-twitter" onclick="return SocialShareButton.share(this);" title="<%= t('legislation.shared.share_twitter') %>" href="#"><span class="sr-only">twitter</span></a>
-  <a rel="nofollow " data-site="facebook" class="ssb-icon ssb-facebook" onclick="return SocialShareButton.share(this);" title="<%= t('legislation.shared.share_facebook') %>" href="#"><span class="sr-only">facebook</span></a>
-  <a rel="nofollow " data-site="google_plus" class="ssb-icon ssb-google_plus" onclick="return SocialShareButton.share(this);" title="<%= t('legislation.shared.share_gplus') %>" href="#"><span class="sr-only">google_plus</span></a>
+<div class="social-share-full">
+  <%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}") %>
+  <% if browser.device.mobile? %>
+    <a href="whatsapp://send?text=<%= title %> <%= url %>" data-action="share/whatsapp/share">
+      <span class="icon-whatsapp whatsapp"></span>
+      <span class="sr-only"><%= t("social.whatsapp") %></span>
+    </a>
+  <% end %>
 </div>
diff --git a/config/locales/legislation.en.yml b/config/locales/legislation.en.yml
index 0a780e684..c60160591 100644
--- a/config/locales/legislation.en.yml
+++ b/config/locales/legislation.en.yml
@@ -108,7 +108,5 @@ en:
         verify_account: verify your account
         debate_phase_not_open: Debate phase has finished and answers are not accepted anymore
     shared:
-      share_twitter: Share on Twitter
-      share_facebook: Share on Facebook
-      share_gplus: Share on Google+
+      share: Share
       share_comment: Comment on %{version_name} from process draft %{process_name}
diff --git a/config/locales/legislation.es.yml b/config/locales/legislation.es.yml
index b35833644..a81f4a31d 100644
--- a/config/locales/legislation.es.yml
+++ b/config/locales/legislation.es.yml
@@ -108,7 +108,5 @@ es:
         verify_account: verifica tu cuenta
         debate_phase_not_open: La fase de debate previo ya ha finalizado y en este momento no se aceptan respuestas
     shared:
-      share_twitter: Compartir en Twitter
-      share_facebook: Compartir en Facebook
-      share_gplus: Compartir en Google+
+      share: Compartir
       share_comment: Comentario sobre la %{version_name} del borrador del proceso %{process_name}