diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index e9a9f1057..9152955dc 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -253,6 +253,10 @@ a {
   max-width: none;
 }
 
+.button.float-right ~ .button.float-right {
+  margin: 0 $line-height/2;
+}
+
 // 02. Header
 // ----------
 
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 2153b23e5..7bb2a92a6 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -12,6 +12,11 @@
       <div class="small-12 medium-9 column">
         <%= render "shared/back_link" %>
 
+        <% if author_of?(@proposal, current_user) %>
+          <%= link_to t("proposals.show.send_notification"), new_proposal_notification_path(proposal_id: @proposal.id),
+                      class: 'button hollow float-right' %>
+        <% end %>
+
         <% if current_user && @proposal.editable_by?(current_user) %>
           <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow float-right' do %>
             <%= t("proposals.show.edit_proposal_link") %>
diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb
index a56b096f6..f50045635 100644
--- a/app/views/users/_proposals.html.erb
+++ b/app/views/users/_proposals.html.erb
@@ -9,7 +9,7 @@
 
       <% if author? %>
         <td class="text-center">
-          <%= link_to t("users.proposals.send_message"), new_proposal_notification_path(proposal_id: proposal.id),
+          <%= link_to t("users.proposals.send_notification"), new_proposal_notification_path(proposal_id: proposal.id),
             class: 'button hollow' %>
         </td>
       <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1002042d7..78ac956a7 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -365,6 +365,7 @@ en:
       retired_warning_link_to_explanation: Read the explanation before voting for it.
       retired: Proposal retired by the author
       share: Share
+      send_notification: Send notification
     update:
       form:
         submit_button: Save changes
@@ -535,7 +536,7 @@ en:
       private_activity: This user decided to keep the activity list private
       send_private_message: "Send private message"
     proposals:
-      send_message: "Send message"
+      send_notification: "Send notification"
       retire: "Retire"
       retired: "Retired"
   votes:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 30d573c37..219a07dee 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -364,6 +364,7 @@ es:
       retired_warning: "El autor de esta propuesta considera que ya no debe seguir recogiendo apoyos."
       retired_warning_link_to_explanation: Revisa su explicación antes de apoyarla.
       retired: Propuesta retirada por el autor
+      send_notification: Enviar notificación
       share: Compartir
     update:
       form:
@@ -535,7 +536,7 @@ es:
       private_activity: Este usuario ha decidido mantener en privado su lista de actividades
       send_private_message: "Enviar un mensaje privado"
     proposals:
-      send_message: "Enviar mensaje"
+      send_notification: "Enviar notificación"
       retire: "Retirar"
       retired: "Retirada"
   votes: