diff --git a/app/views/documents/_document.html.erb b/app/views/documents/_document.html.erb
index 4ea3e51b6..7c6017637 100644
--- a/app/views/documents/_document.html.erb
+++ b/app/views/documents/_document.html.erb
@@ -1,11 +1,11 @@
 <tr id="<%= dom_id(document)%>">
-  <td> <%= document.title %></td>
+  <td><%= document.title %></td>
   <td class="text-center">
-    <%= link_to "Download", document.attachment.url, class: 'button hollow' %>
+    <%= link_to t('documents.buttons.download_document'), document.attachment.url, class: 'button hollow' %>
   </td>
   <td class="text-center">
     <% if can? :destroy, Document %>
-      <%= link_to "Destroy",
+      <%= link_to t('documents.buttons.destroy_document'),
                     document_path(document, from: request.url), method: :delete,
                     data: { confirm: "¿Está segurto de que desea eliminar el documento?. Esta acción no se puede deshacer." },
                     class: 'button hollow alert' %>
diff --git a/app/views/documents/new.html.erb b/app/views/documents/new.html.erb
index d0463c104..cf5c9fbab 100644
--- a/app/views/documents/new.html.erb
+++ b/app/views/documents/new.html.erb
@@ -1,8 +1,7 @@
-<div class="document-form <%= document_documentable_class(@document) %> row">
+<div class="document-form <%= @document.documentable.class.name.parameterize('_') %> row">
 
   <div class="small-12 medium-9 column">
-    <%= back_link_to params[:from] %>
-
+    <%= render "shared/back_link" %>
     <h1><%= t("documents.new.title") %></h1>
     <%= render "documents/form", form_url: documents_url %>
   </div>
@@ -16,5 +15,4 @@
       <li><%= t("documents.recommendation_three_html") %></li>
     </ul>
   </div>
-
 </div>
diff --git a/config/locales/en/documents.yml b/config/locales/en/documents.yml
index f54473c3a..b4a614516 100644
--- a/config/locales/en/documents.yml
+++ b/config/locales/en/documents.yml
@@ -20,3 +20,7 @@ en:
       destroy:
         notice: Document was deleted successfully.
         alert: Cannot destroy document.
+    buttons:
+      download_document: Download PDF
+      destroy_document: Destroy
+      link_document: Link
diff --git a/config/locales/es/documents.yml b/config/locales/es/documents.yml
index 0ae231a5c..e237dee21 100644
--- a/config/locales/es/documents.yml
+++ b/config/locales/es/documents.yml
@@ -19,4 +19,8 @@ es:
         alert: "El documento no se ha podido crear. Revise los errores del formulario."
       destroy:
         notice: "El documento se ha eliminado correctamente."
-        alert: "El documento no se ha podido eliminar."
\ No newline at end of file
+        alert: "El documento no se ha podido eliminar."
+    buttons:
+      download_document: Descargar PDF
+      destroy_document: Eliminar
+      link_document: Enlace